Skip to content

Commit 7855eb7

Browse files
committedDec 6, 2024·
UI works. Overview.
1 parent a3fe561 commit 7855eb7

File tree

1 file changed

+169
-204
lines changed

1 file changed

+169
-204
lines changed
 

‎res/main/ui/utils/referencer.xml

+169-204
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<!-- Row 1 -->
121121
<hbox spacing="4" expand="true">
122122
<!-- Spectrum -->
123-
<group ui:inject="GraphGroup" ipadding="0" text="referencer.tab.spectrum" expand="true">
123+
<group ui:inject="GraphGroup" ipadding="0" text="lists.referencer.tab.spectrum" expand="true">
124124
<graph width.min="200" height.min="200" expand="true" fill="true">
125125
<origin hpos="-1" vpos="-1" visibility="false"/>
126126

@@ -208,17 +208,17 @@
208208
<text x="10000" text="graph.values.x_k" text:value="10"/>
209209
<text x="20000" text="graph.values.x_k" text:value="20"/>
210210
</ui:with>
211-
<ui:for id="t" first="-60" last="12" step="12">
212-
<text x="10" y="${t} db" text="${t}" halign="1" valign="1"/>
213-
</ui:for>
214211
<text x="10" y="1" ox="0" oy="2" text="graph.units.db" halign="1" valign="-1"/>
212+
<ui:for id="t" first="-60" last="0" step="12">
213+
<text x="10" y="${t} db" text="${t}" halign="1" valign="1" priority="0"/>
214+
</ui:for>
215215
</graph>
216216
</group>
217217

218218
<!-- Loudness -->
219-
<group ui:inject="GraphGroup" ipadding="0" text="referencer.tab.loud" vexpand="true" hexpand="false">
219+
<group ui:inject="GraphGroup" ipadding="0" text="lists.referencer.tab.loudness" vexpand="true" hexpand="false">
220220
<grid rows="2" cols="6" expand="true">
221-
<ui:with bg.color="bg_schema">
221+
<ui:with bg.color="bg_schema" pad.t="2">
222222
<label text="labels.referencer.peak" vreduce="true"/>
223223
<label text="labels.referencer.true_peak" vreduce="true"/>
224224
<label text="labels.referencer.rms" vreduce="true"/>
@@ -254,9 +254,8 @@
254254
</group>
255255

256256
<ui:if test="ex :in_r">
257-
258257
<!-- Correllation -->
259-
<group ui:inject="GraphGroup" ipadding="0" text="labels.chan.correlation" expand="true">
258+
<group ui:inject="GraphGroup" ipadding="0" text="lists.referencer.tab.correlation" expand="true">
260259
<hbox expand="true">
261260
<graph width.min="200" height.min="200" expand="true" fill="true">
262261
<origin hpos="-1" vpos="0" visibility="false"/>
@@ -269,11 +268,9 @@
269268
<marker v="${:f * 100}"/>
270269
</ui:for>
271270
<marker v="20000"/>
272-
<ui:for id="c" first="0" count="2">
273-
<ui:for id="i" first="1" count="4">
274-
<marker v="${0.1 * (:c*5 + :i)}" ox="1" oy="0"/>
275-
<marker v="${-0.1 * (:c*5 + :i)}" ox="1" oy="0"/>
276-
</ui:for>
271+
<ui:for id="i" first="2" count="4" step="2">
272+
<marker v="${0.1 * (0+ :i)}" ox="1" oy="0"/>
273+
<marker v="${-0.1 * (0 + :i)}" ox="1" oy="0"/>
277274
</ui:for>
278275
</ui:with>
279276

@@ -282,9 +279,6 @@
282279
<marker v="100"/>
283280
<marker v="1000"/>
284281
<marker v="10000"/>
285-
286-
<marker v="-0.5" ox="1" oy="0"/>
287-
<marker v="0.5" ox="1" oy="0"/>
288282
</ui:with>
289283

290284
<!-- Meshes -->
@@ -322,11 +316,11 @@
322316
<text x="10000" text="graph.values.x_k" text:value="10"/>
323317
<text x="20000" text="graph.values.x_k" text:value="20"/>
324318
</ui:with>
325-
<ui:for id="c" first="1" last="9">
326-
<text x="10" y="${0.1 * :c}" text="0.${c}" halign="1" valign="1" pgroup="0" priority="10"/>
319+
<ui:for id="c" first="2" last="8" step="2">
320+
<text x="10" y="${0.1 * :c}" text="0.${c}" halign="1" valign="1" pgroup="0" priority="0"/>
327321
</ui:for>
328-
<ui:for id="c" first="1" last="9">
329-
<text x="10" y="${-0.1 * :c}" text="-0.${c}" halign="1" valign="1" pgroup="0" priority="10"/>
322+
<ui:for id="c" first="2" last="8" step="2">
323+
<text x="10" y="${-0.1 * :c}" text="-0.${c}" halign="1" valign="1" pgroup="0" priority="0"/>
330324
</ui:for>
331325
<text x="10" y="0" text="0" halign="1" valign="1" cgroup="0" priority="0"/>
332326
</graph>
@@ -336,232 +330,203 @@
336330
</ui:with>
337331
</hbox>
338332
</group>
339-
340333
</ui:if>
341334
</hbox>
342335

343336
<!-- Row 2 -->
344337
<hbox spacing="4" expand="true">
345338

346339
<!-- Waveform -->
347-
<group ui:inject="GraphGroup" ipadding="0" text="referencer.tab.waveform" expand="true">
348-
<graph width.min="300" height.min="200" expand="true" fill="true">
349-
<origin hpos="1" vpos="0" visible="false"/>
340+
<group ui:inject="GraphGroup" ipadding="0" text="lists.referencer.tab.waveform" expand="true">
341+
<vbox>
342+
<graph width.min="300" height.min="200" expand="true" fill="true">
343+
<origin hpos="1" vpos="0" visible="false"/>
350344

351-
<!-- Main grid -->
352-
<ui:for id="i" first="1" last="5">
353-
<marker ox="1" oy="0" v="${:i / 6.0}" color="${(:i eq 3) ? 'graph_prim' : 'graph_alt_1'}"/>
354-
<marker ox="1" oy="0" v="${:i / -6.0}" color="${(:i eq 3) ? 'graph_prim' : 'graph_alt_1'}"/>
355-
</ui:for>
356-
<ui:for id="i" first="1" last="9">
357-
<marker ox="2" oy="1" v="${:i * 0.1}" color="${(:i % 2 == 0) ? 'graph_prim' : 'graph_alt_1'}"/>
358-
</ui:for>
359-
360-
<!-- Meshes -->
361-
<ui:if test="ex :in_r">
362-
<ui:with id="wfmesh" width="2" xi="0" fill="true" fill.color.a="0.9">
363-
<mesh ui:id="waveform_ref_m" yi="7" color="reference_ref_1" fill.color="reference_ref_1" visibility=":refvis"/>
364-
<mesh ui:id="waveform_mix_m" yi="3" color="reference_mix_1" fill.color="reference_mix_1" visibility=":mixvis"/>
365-
</ui:with>
366-
</ui:if>
367-
<ui:if test="!ex :in_r">
368-
<ui:with id="wfmesh" width="2" xi="0" fill="true" fill.color.a="0.9">
369-
<mesh ui:id="waveform_ref" yi="2" color="reference_mix_1" fill.color="reference_mix_1" visibility=":refvis"/>
370-
<mesh ui:id="waveform_mix" yi="1" color="reference_ref_1" fill.color="reference_ref_1" visibility=":mixvis"/>
371-
</ui:with>
372-
</ui:if>
345+
<!-- Main grid -->
346+
<ui:for id="i" first="1" last="6">
347+
<marker ox="1" oy="0" v="${:i / 6.0}" color="${(:i eq 3) ? 'graph_prim' : 'graph_alt_1'}"/>
348+
<marker ox="1" oy="0" v="${:i / -6.0}" color="${(:i eq 3) ? 'graph_prim' : 'graph_alt_1'}"/>
349+
</ui:for>
350+
<ui:for id="i" first="1" last="9">
351+
<marker ox="2" oy="1" v="${:i * 0.1}" color="${(:i % 2 == 0) ? 'graph_prim' : 'graph_alt_1'}"/>
352+
</ui:for>
373353

374-
<!-- Axis -->
375-
<axis min="0" max=":wflen" angle="1.0" log="false" color="graph_prim" visible="true"/>
376-
<axis min="-1" max="1" angle="0.5" log="false" color="graph_prim" visible="false"/>
377-
<axis min="0" max="1" angle="1.0" log="false" color="graph_prim" visible="false"/>
354+
<!-- Meshes -->
355+
<ui:if test="ex :in_r">
356+
<ui:with id="wfmesh" width="1" xi="0" fill="true" fill.color.a="0.9">
357+
<mesh yi="7" color="reference_ref_1" fill.color="reference_ref_1" visibility=":refvis"/>
358+
<mesh yi="3" color="reference_mix_1" fill.color="reference_mix_1" visibility=":mixvis"/>
359+
</ui:with>
360+
</ui:if>
361+
<ui:if test="!ex :in_r">
362+
<ui:with id="wfmesh" width="1" xi="0" fill="true" fill.color.a="0.9">
363+
<mesh yi="2" color="reference_mix_1" fill.color="reference_mix_1" visibility=":refvis"/>
364+
<mesh yi="1" color="reference_ref_1" fill.color="reference_ref_1" visibility=":mixvis"/>
365+
</ui:with>
366+
</ui:if>
378367

379-
<!-- Text -->
380-
<ui:with x="1" ox="2" oy="1" visibility=":wflog" halign="1" valign="1" pgroup="0" priority="10">
381-
<text y="1" text="graph.values.x:db:f" text.eval="true" text:value=":wfscmax" valign="-1" priority="0"/>
382-
<text y="0" text="graph.values.x::2f" text.eval="true" text:value=":wfscmin" priority="0"/>
368+
<!-- Axis -->
369+
<axis min="0" max=":wflen" angle="1.0" log="false" color="graph_prim" visible="true"/>
370+
<axis min="-1.2" max="1.2" angle="0.5" log="false" color="graph_prim" visible="false"/>
371+
<axis min="0" max="1" angle="1.0" log="false" color="graph_prim" visible="false"/>
383372

384-
<ui:for id="i" first="1" last="5">
385-
<text y="${:i / 6.0}" text="graph.values.x::2f" text.eval="true" text:value=":wfscmin + ${i} * (:wfscmax - :wfscmin) / 6.0"/>
386-
<text y="${:i / -6.0}" text="graph.values.x::2f" text.eval="true" text:value=":wfscmin + ${i} * (:wfscmax - :wfscmin) / 6.0"/>
387-
</ui:for>
388-
</ui:with>
389-
<ui:with x="1" ox="2" oy="1" visibility="!:wflog" halign="1" valign="1" pgroup="0" priority="10">
390-
<text y="1" text="labels.amplitude" valign="-1" priority="0"/>
391-
<text y="0" text="0" priority="0"/>
373+
<ui:with x="1" ox="2" oy="1" halign="1" valign="1" pgroup="0" priority="10">
374+
<text y="0" text="0" priority="0"/>
392375

393-
<ui:for id="i" first="1" last="5">
394-
<text y="${:i / 6.0}" text="graph.values.x::f" text.eval="true" text:value="${i} * (10 ** (:wfscmax / 20.0)) / 6.0"/>
395-
<text y="${:i / -6.0}" text="graph.values.x::f" text.eval="true" text:value="${i} * (10 ** (:wfscmax / 20.0)) / -6.0"/>
396-
</ui:for>
397-
</ui:with>
376+
<ui:for id="i" first="2" last="6" step="2">
377+
<text y="${:i / 6.0}" text="graph.values.x::2f" text.eval="true" text:value="${i} / 6.0" priority="0"/>
378+
<text y="${:i / -6.0}" text="graph.values.x::2f" text.eval="true" text:value="${i} / -6.0" priority="0"/>
379+
</ui:for>
380+
</ui:with>
398381

399-
<ui:with y="-1" ox="2" oy="1" visibility=":wflen ge 1.0" halign="1" valign="1" pgroup="0" priority="10">
400-
<text x="0" y="-1" text="graph.units.s" halign="-1" priority="0"/>
401-
<ui:for id="i" first="1" last="10">
402-
<text x="${:i * 0.1}" text="graph.values.x::2f" text.eval="true" text:value="${i} * :wflen * 0.1"/>
403-
</ui:for>
404-
</ui:with>
405-
<ui:with y="-1" ox="2" oy="1" visibility=":wflen lt 1.0" halign="1" valign="1" pgroup="0" priority="10">
406-
<text x="0" text="graph.units.ms" halign="-1" priority="0"/>
407-
<ui:for id="i" first="1" last="10">
408-
<text x="${:i * 0.1}" text="graph.values.x::2f" text.eval="true" text:value="${i} * :wflen * 100.0"/>
409-
</ui:for>
410-
</ui:with>
411-
</graph>
382+
<ui:with y="-1.2" ox="2" oy="1" visibility=":wflen ge 1.0" halign="1" valign="1" pgroup="0" priority="10">
383+
<text x="0" y="-1" text="graph.units.s" halign="-1" priority="0"/>
384+
<ui:for id="i" first="1" last="10">
385+
<text x="${:i * 0.1}" text="graph.values.x::2f" text.eval="true" text:value="${i} * :wflen * 0.1" priority="10"/>
386+
</ui:for>
387+
</ui:with>
388+
<ui:with y="-1.2" ox="2" oy="1" visibility=":wflen lt 1.0" halign="1" valign="1" pgroup="0" priority="10">
389+
<text x="0" text="graph.units.ms" halign="-1" priority="0"/>
390+
<ui:for id="i" first="1" last="10">
391+
<text x="${:i * 0.1}" text="graph.values.x::2f" text.eval="true" text:value="${i} * :wflen * 100.0" priority="10"/>
392+
</ui:for>
393+
</ui:with>
394+
</graph>
395+
<hbox pad.h="6" pad.v="4" vreduce="true" hfill="true">
396+
<label text="labels.metering.frame"/>
397+
<fader id="wflen" angle="0" hfill="true" hexpand="true" pad.h="4"/>
398+
<value id="wflen" sline="true"/>
399+
</hbox>
400+
</vbox>
412401
</group>
413402

414403
<!-- Dynamics -->
415-
<group ui:inject="GraphGroup" ipadding="0" text="referencer.tab.dynamics" expand="true">
416-
<hbox expand="true" width.min="200" height.min="200">
417-
<graph width.min="100" height.min="200" expand="true" fill="true">
418-
<origin hpos="1" vpos="-1" visible="false"/>
419-
<!-- Additional grid -->
420-
<ui:for id="t" first="0" last="2" step="1">
421-
<marker ox="0" oy="1" v="${:t + 0.125}" color="graph_alt_2" visibility=":maxtime le 2.625"/>
422-
<marker ox="0" oy="1" v="${:t + 0.375}" color="graph_alt_2" visibility=":maxtime le 2.625"/>
423-
<marker ox="0" oy="1" v="${:t + 0.625}" color="graph_alt_2" visibility=":maxtime le 2.625"/>
424-
<marker ox="0" oy="1" v="${:t + 0.875}" color="graph_alt_2" visibility=":maxtime le 2.625"/>
425-
</ui:for>
426-
427-
<ui:for id="t" first="0" last="6" step="1">
428-
<marker ox="0" oy="1" v="${:t + 0.25}" color="graph_alt_2" visibility=":maxtime le 5.25"/>
429-
<marker ox="0" oy="1" v="${:t + 0.75}" color="graph_alt_2" visibility=":maxtime le 5.25"/>
430-
</ui:for>
431-
432-
<ui:for id="t" first="0" last="9" step="1">
433-
<marker ox="0" oy="1" v="${:t + 0.5}" color="graph_alt_1" visibility=":maxtime le 10.5"/>
434-
</ui:for>
404+
<group ui:inject="GraphGroup" ipadding="0" text="lists.referencer.tab.dynamics" expand="true">
405+
<vbox expand="true">
406+
<hbox pad.h="6" pad.v="4" bg.color="bg_schema" vfill="false">
407+
<void hexpand="true"/>
408+
<label text="labels.mode" pad.r="4"/>
409+
<combo id="psrmode"/>
410+
</hbox>
411+
<hbox expand="true" width.min="200" height.min="200">
412+
<graph width.min="150" height.min="200" expand="true" fill="true">
413+
<origin hpos="1" vpos="-1" visible="false"/>
414+
<!-- Additional grid -->
415+
<ui:for id="i" first="2" last="16" step="2">
416+
<marker v="${i} db" color="graph_alt_1" ox="1" oy="0"/>
417+
</ui:for>
435418

436-
<ui:with ox="1" oy="0" color="graph_alt_1">
437-
<ui:for id="y" first="0" last="2">
438-
<ui:for id="i" first="1" count="5">
439-
<marker v="${:y*6 + :i} db"/>
440-
</ui:for>
419+
<!-- Main grid -->
420+
<ui:for id="t" first="1" last="19" step="1">
421+
<marker v="${t}" ox="0" oy="1" color="graph_sec"/>
441422
</ui:for>
442-
</ui:with>
443423

444-
<!-- Main grid -->
445-
<ui:for id="t" first="1" last="19" step="1">
446-
<marker v="${t}" ox="0" oy="1" color="graph_sec"/>
447-
</ui:for>
424+
<ui:with ox="1" oy="0" color="graph_sec">
425+
<marker v="6 db"/>
426+
<marker v="12 db"/>
427+
</ui:with>
448428

449-
<ui:with ox="1" oy="0" color="graph_sec">
450-
<marker v="6 db"/>
451-
<marker v="12 db"/>
452-
</ui:with>
429+
<!-- Meshes -->
430+
<mesh id="dmmesh" width="2" xi="0" yi="(ex :in_r) ? 17 : 14" color="reference_ref_1" visibility=":refvis"/>
431+
<mesh id="dmmesh" width="2" xi="0" yi="7" color="reference_mix_1" visibility=":mixvis"/>
453432

454-
<!-- Meshes -->
455-
<mesh id="dmmesh" width="2" xi="0" yi="(ex :in_r) ? 17 : 14" color="reference_ref_1" visibility=":refvis"/>
456-
<mesh id="dmmesh" width="2" xi="0" yi="7" color="reference_mix_1" visibility=":mixvis"/>
433+
<marker id="psrthr" ox="1" oy="0" width="2" hwidth="2" color="threshold" hcolor="threshold" pointer="vsize" editable="true"/>
457434

458-
<marker id="psrthr" ox="1" oy="0" width="2" hwidth="2" color="threshold" hcolor="threshold" pointer="vsize" editable="true"/>
435+
<!-- Axis -->
436+
<axis min="0" max=":maxtime" angle="1.0" log="false" color="graph_prim" visible="false"/>
437+
<axis min="0 db" max="18 db" angle="0.5" log="true" color="graph_prim" visible="false"/>
438+
<axis min="0" max="1" angle="1.0" log="false" color="graph_prim" visible="false"/>
459439

460-
<!-- Axis -->
461-
<axis min="0" max=":maxtime" angle="1.0" log="false" color="graph_prim" visible="false"/>
462-
<axis min="0 db" max="18 db" angle="0.5" log="true" color="graph_prim" visible="false"/>
463-
<axis min="0" max="1" angle="1.0" log="false" color="graph_prim" visible="false"/>
440+
<!-- Text -->
441+
<ui:with y="0 db" halign="-1" valign="1" pgroup="0" priority="10">
442+
<ui:for id="t" first="1" last="9" step="2">
443+
<text x="${t}" text="${t}" visibility=":maxtime le 10.5"/>
444+
</ui:for>
445+
<ui:for id="t" first="0" last="18" step="2">
446+
<text x="${t}" text="${t}"/>
447+
</ui:for>
448+
</ui:with>
464449

465-
<!-- Text -->
466-
<ui:with y="0 db" halign="-1" valign="1" pgroup="0" priority="10">
467-
<ui:for id="t" first="0" last="2" step="1">
468-
<text x="${:t + 0.25}" text="${t}.25" color="graph_alt1" visibility=":maxtime le 2.625"/>
469-
<text x="${:t + 0.75}" text="${t}.75" color="graph_alt1" visibility=":maxtime le 2.625"/>
470-
</ui:for>
471-
<ui:for id="t" first="0" last="4" step="1">
472-
<text x="${:t + 0.5}" text="${t}.5" color="graph_alt1" visibility=":maxtime le 5.25"/>
473-
</ui:for>
474-
<ui:for id="t" first="1" last="9" step="2">
475-
<text x="${t}" text="${t}" visibility=":maxtime le 10.5"/>
476-
</ui:for>
477-
<ui:for id="t" first="0" last="18" step="2">
478-
<text x="${t}" text="${t}"/>
479-
</ui:for>
480-
</ui:with>
450+
<ui:with ox="2" x="1" halign="1" valign="1" pgroup="0" priority="10">
451+
<ui:for id="i" first="2" last="16" step="2">
452+
<text y="${i} db" text="${i}"/>
453+
</ui:for>
454+
</ui:with>
481455

482-
<ui:with ox="2" x="1" halign="1" valign="1" pgroup="0" priority="10">
483-
<ui:for id="i" first="1" last="16">
484-
<text y="${i} db" text="${i}"/>
485-
</ui:for>
486-
</ui:with>
456+
<ui:with pgroup="0" priority="0" ox="2" x="1" halign="1">
457+
<text y="18 db" text="graph.units.db" valign="-1"/>
458+
<text y="0 db" text="graph.units.s" valign="1"/>
459+
</ui:with>
460+
</graph>
487461

488-
<ui:with pgroup="0" priority="0" ox="2" x="1" halign="1">
489-
<text y="18 db" text="graph.units.db" valign="-1"/>
490-
<text y="0 db" text="graph.units.s" valign="1"/>
462+
<ui:with angle="1" min="0 db" max="18 db" balance.visibility="false" log="true" type="peak" text.visibility="true" header.visibility="false" vexpand="true">
463+
<ledchannel id="psr_m" bg.color="bg_schema" value.color="reference_mix_1" activity=":mixvis"/>
464+
<ledchannel id="psr_r" bg.color="bg_schema" value.color="reference_ref_1" activity=":refvis"/>
491465
</ui:with>
492-
</graph>
493466

494-
<ui:with angle="1" min="0 db" max="18 db" balance.visibility="false" log="true" type="peak" text.visibility="true" header.visibility="false" vexpand="true">
495-
<ledchannel id="psr_m" bg.color="bg_schema" value.color="reference_mix_1" activity=":mixvis"/>
496-
<ledchannel id="psr_r" bg.color="bg_schema" value.color="reference_ref_1" activity=":refvis"/>
497-
</ui:with>
498-
499-
<graph width.min="150" height.min="200" vexpand="true" fill="true">
500-
<origin hpos="1" vpos="-1" visible="false"/>
467+
<graph width.min="100" height.min="200" vexpand="true" fill="true">
468+
<origin hpos="1" vpos="-1" visible="false"/>
501469

502-
<!-- Additional grid -->
503-
<ui:with color="graph_alt_1">
504-
<ui:for id="y" first="0" last="2">
505-
<ui:for id="i" first="1" count="5">
506-
<marker v="${:y*6 + :i} db"/>
507-
</ui:for>
470+
<!-- Additional grid -->
471+
<ui:for id="i" first="2" last="16" step="2">
472+
<marker v="${i} db" color="graph_alt_1"/>
508473
</ui:for>
509-
</ui:with>
510474

511-
<ui:with ox="1" oy="0" color="graph_alt_1">
512-
<marker v="20"/>
513-
<marker v="40"/>
514-
<marker v="60"/>
515-
<marker v="80"/>
516-
</ui:with>
475+
<ui:with ox="1" oy="0" color="graph_alt_1">
476+
<marker v="20"/>
477+
<marker v="40"/>
478+
<marker v="60"/>
479+
<marker v="80"/>
480+
</ui:with>
517481

518-
<!-- Main grid -->
519-
<ui:with color="graph_sec">
520-
<marker v="6 db"/>
521-
<marker v="12 db"/>
522-
</ui:with>
482+
<!-- Main grid -->
483+
<ui:with color="graph_sec">
484+
<marker v="6 db"/>
485+
<marker v="12 db"/>
486+
</ui:with>
523487

524-
<!-- Meshes -->
525-
<ui:with id="psrmesh" xi="0" width="2" fill="true" fill.color.a="0.9">
526-
<mesh yi="2" color="reference_ref_1" fill.color="reference_ref_1" visibility=":refvis"/>
527-
<mesh yi="1" color="reference_mix_1" fill.color="reference_mix_1" visibility=":mixvis"/>
528-
</ui:with>
488+
<!-- Meshes -->
489+
<ui:with id="psrmesh" xi="0" width="1" color.a="0.15" fill="true" fill.color.a="0.95">
490+
<mesh yi="2" color="reference_ref_1" fill.color="reference_ref_1" visibility=":refvis"/>
491+
<mesh yi="1" color="reference_mix_1" fill.color="reference_mix_1" visibility=":mixvis"/>
492+
</ui:with>
529493

530-
<marker id="psrthr" ox="0" oy="1" width="2" hwidth="2" color="threshold" hcolor="threshold" pointer="vsize" editable="true"/>
494+
<marker id="psrthr" ox="0" oy="1" width="2" hwidth="2" color="threshold" hcolor="threshold" pointer="vsize" editable="true"/>
531495

532-
<!-- Axis -->
533-
<axis min="0 db" max="18 db" angle="0.5" log="true" color="graph_prim" visible="false"/>
534-
<axis min="0" max="100" angle="1.0" log="false" color="graph_prim" visible="false"/>
496+
<!-- Axis -->
497+
<axis min="0 db" max="18 db" angle="0.5" log="true" color="graph_prim" visible="false"/>
498+
<axis min="0" max="100" angle="1.0" log="false" color="graph_prim" visible="false"/>
535499

536-
<!-- Text -->
537-
<ui:with y="100" halign="1" valign="1" pgroup="0" priority="10">
538-
<ui:for id="i" first="1" last="16">
539-
<text x="${i} db" text="${i}"/>
540-
</ui:for>
541-
</ui:with>
500+
<!-- Text -->
501+
<ui:with y="100" halign="1" valign="1" pgroup="0" priority="10">
502+
<ui:for id="i" first="2" last="16" step="2">
503+
<text x="${i} db" text="${i}"/>
504+
</ui:for>
505+
</ui:with>
542506

543-
<text x="0 db" y="0" text="0" halign="-1" valign="1" pgroup="0" priority="10"/>
544-
<ui:for id="i" first="20" last="80" step="20">
545-
<text x="0 db" y="${i}" text="${i}" halign="1" valign="1" pgroup="0" priority="10"/>
546-
</ui:for>
547-
<text x="0 db" y="0" text="0" valign="1" pgroup="0" priority="0"/>
548-
<ui:with y="100" halign="1" pgroup="0" priority="0">
549-
<text x="18 db" text="graph.units.db" valign="-1"/>
550-
<text x="0 db" text="graph.units.pc" valign="1"/>
551-
</ui:with>
507+
<text x="0 db" y="0" text="0" halign="-1" valign="1" pgroup="0" priority="10"/>
508+
<ui:for id="i" first="20" last="80" step="20">
509+
<text x="0 db" y="${i}" text="${i}" halign="1" valign="1" pgroup="0" priority="10"/>
510+
</ui:for>
511+
<text x="0 db" y="0" text="0" valign="1" pgroup="0" priority="0"/>
512+
<ui:with y="100" halign="1" pgroup="0" priority="0">
513+
<text x="18 db" text="graph.units.db" valign="-1"/>
514+
<text x="0 db" text="graph.units.pc" valign="1"/>
515+
</ui:with>
552516

553-
<!-- PSR percentage -->
554-
<text x=":psrthr" y="25" font.size="20" text="graph.values.x:pc:f" color="reference_ref_1" text:value=":psrpc_r" text.eval="true" halign="0" valign="1"/>
555-
<text x=":psrthr" y="75" font.size="20" text="graph.values.x:pc:f" color="reference_mix_1" text:value=":psrpc_m" text.eval="true" halign="0" valign="1"/>
556-
<text x=":psrthr" y="75" font.size="20" text="graph.values.x:s:2f" color="threshold" text:value=":psrtime" text.eval="true" halign="0" valign="-1"/>
557-
<text x=":psrthr" y="25" font.size="20" text="graph.values.x:db:f" color="threshold" text:value="20*logd(:psrthr)" text.eval="true" halign="0" valign="-1"/>
558-
</graph>
559-
</hbox>
517+
<!-- PSR percentage -->
518+
<text x=":psrthr" y="25" font.size="14" text="graph.values.x:pc:f" color="reference_ref_1" text:value=":psrpc_r" text.eval="true" halign="0" valign="1"/>
519+
<text x=":psrthr" y="75" font.size="14" text="graph.values.x:pc:f" color="reference_mix_1" text:value=":psrpc_m" text.eval="true" halign="0" valign="1"/>
520+
<text x=":psrthr" y="75" font.size="14" text="graph.values.x:s:2f" color="threshold" text:value=":psrtime" text.eval="true" halign="0" valign="-1"/>
521+
<text x=":psrthr" y="25" font.size="14" text="graph.values.x:db:f" color="threshold" text:value="20*logd(:psrthr)" text.eval="true" halign="0" valign="-1"/>
522+
</graph>
523+
</hbox>
524+
</vbox>
560525
</group>
561526
<ui:if test="ex :in_r">
562527

563528
<!-- Goniometer -->
564-
<group ui:inject="GraphGroup" ipadding="0" text="referencer.tab.goniometr" expand="true">
529+
<group ui:inject="GraphGroup" ipadding="0" text="lists.referencer.tab.goniometer" expand="true">
565530
<graph width.min="200" height.min="200" expand="true" fill="true">
566531
<!-- Origin -->
567532
<origin halign="0.0" valign="0.0" visible="false"/>

0 commit comments

Comments
 (0)
Please sign in to comment.