Skip to content

Commit

Permalink
UI update. Added correlation meters.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bor-T
bor-T committed Apr 5, 2024
1 parent 85b322b commit 9d80fe5
Show file tree
Hide file tree
Showing 5 changed files with 340 additions and 180 deletions.
41 changes: 34 additions & 7 deletions res/main/ui/analyzer/spectrum/x12.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,11 +379,11 @@

<!-- Channel for metering configuration -->
<group text="groups.channels" visibility="(:mode ieq 0) or (:mode ieq 2)" spacing="4" bg.color="bg" ipadding="0">
<grid rows="7" cols="25" transpose="true" hspacing="2">
<grid rows="8" cols="25" transpose="true" hspacing="2">
<ui:with padding="6" bg.color="bg_schema">
<cell rows="2">
<void/>
</cell>
<void/>
<label text="labels.chan.correlation" pad.v="0"/>
<void padding="0"/>
<label text="labels.specials.num" width.min="62"/>
<label text="labels.chan.on"/>
<label text="labels.chan.solo_hold" pad.b="10"/>
Expand All @@ -392,14 +392,36 @@
</ui:with>

<ui:for id="i" first="0" count="12">
<cell rows="${7 - (:i % 2) * 2}" cols="1" expand="false" padding="0" bg.color="bg">
<cell rows="${8 - (:i % 2) * 3}" cols="1" expand="false" padding="0" bg.color="bg">
<vsep/>
</cell>

<ui:if test=":i % 2 ieq 0">
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms_${:i idiv 2}" height="19" hfill="true"/>
</cell>
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<hbox>
<label text="-1" font.size="8" hfill="true" text.halign="-1" pad.t="2" pad.r="1"/>
<ledchannel
id="cm_${:i / 2}"
width.min="13"
width.max="13"
min="-100"
max="100"
balance="0"
balance.visibility="true"
log="false"
type="peak"
text.visibility="false"
hexpand="true"
bg.color="bg_schema"
balance.color="bright_cyan"
value.color="cyan"
activity=":on_${:i} and :on_${:i + 1}"/>
<label text="+1" font.size="8" hfill="true" text.halign="1" pad.t="2"/>
</hbox>
</cell>
<cell cols="3">
<hsep hfill="true" vreduce="true" pad.v="2"/>
</cell>
Expand Down Expand Up @@ -483,8 +505,13 @@
<vbox>
<label text="labels.channel" visibility=":mode ieq 4" pad.b="4"/>
<label text="labels.channels" visibility=":mode band 1" pad.b="4"/>
<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms" height="19" hfill="true" pad.b="8" visibility="(:mode ieq 1) or (:mode ieq 3) or (:mode ieq 5)"/>
<hbox spacing="4">
<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms" height="19" hfill="true" pad.b="4" visibility="(:mode ieq 1) or (:mode ieq 3) or (:mode ieq 5)"/>
<hbox visibility="(:mode ieq 1) or (:mode ieq 3) or (:mode ieq 5)">
<label text="-1" font.size="8" hfill="true" text.halign="-1" pad.t="2" pad.r="2"/>
<ledchannel id="cccm" width.min="13" width.max="13" min="-100" max="100" balance="0" balance.visibility="true" log="false" type="peak" text.visibility="false" hexpand="true" bg.color="bg_schema" balance.color="bright_cyan" value.color="cyan"/>
<label text="+1" font.size="8" hfill="true" text.halign="1" pad.t="2"/>
</hbox>
<hbox spacing="4" pad.t="4">
<combo id="spc0" fill="true" visibility="(:mode ine 0) and (:mode ine 2)"/>
<combo id="spc1" fill="true" visibility="(:mode ieq 1) or (:mode ieq 3) or (:mode ieq 5)"/>
</hbox>
Expand Down
41 changes: 34 additions & 7 deletions res/main/ui/analyzer/spectrum/x16.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,11 @@

<!-- Channel for metering configuration -->
<group text="groups.channels" visibility="(:mode ieq 0) or (:mode ieq 2)" vspacing="4" bg.color="bg" ipadding="0">
<grid rows="7" cols="33" transpose="true" hspacing="2">
<grid rows="8" cols="33" transpose="true" hspacing="2">
<ui:with padding="6" bg.color="bg_schema">
<cell rows="2">
<void/>
</cell>
<void/>
<label text="labels.chan.correlation" pad.v="0"/>
<void padding="0"/>
<label text="labels.specials.num"/>
<label text="labels.chan.on"/>
<label text="labels.chan.solo_hold" pad.b="10"/>
Expand All @@ -391,14 +391,36 @@
</ui:with>

<ui:for id="i" first="0" count="16">
<cell rows="${7 - (:i % 2) * 2}" cols="1" expand="false" padding="0" bg.color="bg">
<cell rows="${8 - (:i % 2) * 3}" cols="1" expand="false" padding="0" bg.color="bg">
<vsep/>
</cell>

<ui:if test=":i % 2 ieq 0">
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms_${:i idiv 2}" height="19" hfill="true"/>
</cell>
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<hbox>
<label text="-1" font.size="8" hfill="true" text.halign="-1" pad.t="2" pad.r="1"/>
<ledchannel
id="cm_${:i / 2}"
width.min="13"
width.max="13"
min="-100"
max="100"
balance="0"
balance.visibility="true"
log="false"
type="peak"
text.visibility="false"
hexpand="true"
bg.color="bg_schema"
balance.color="bright_cyan"
value.color="cyan"
activity=":on_${:i} and :on_${:i + 1}"/>
<label text="+1" font.size="8" hfill="true" text.halign="1" pad.t="2"/>
</hbox>
</cell>
<cell cols="3">
<hsep hfill="true" vreduce="true" pad.v="2"/>
</cell>
Expand Down Expand Up @@ -482,8 +504,13 @@
<vbox>
<label text="labels.channel" visibility=":mode ieq 4" pad.b="4"/>
<label text="labels.channels" visibility=":mode band 1" pad.b="4"/>
<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms" height="19" hfill="true" pad.b="8" visibility="(:mode ieq 1) or (:mode ieq 3) or (:mode ieq 5)"/>
<hbox spacing="4">
<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms" height="19" hfill="true" pad.b="4" visibility="(:mode ieq 1) or (:mode ieq 3) or (:mode ieq 5)"/>
<hbox visibility="(:mode ieq 1) or (:mode ieq 3) or (:mode ieq 5)">
<label text="-1" font.size="8" hfill="true" text.halign="-1" pad.t="2" pad.r="2"/>
<ledchannel id="cccm" width.min="13" width.max="13" min="-100" max="100" balance="0" balance.visibility="true" log="false" type="peak" text.visibility="false" hexpand="true" bg.color="bg_schema" balance.color="bright_cyan" value.color="cyan"/>
<label text="+1" font.size="8" hfill="true" text.halign="1" pad.t="2"/>
</hbox>
<hbox spacing="4" pad.t="4">
<combo id="spc0" fill="true" visibility="(:mode ine 0) and (:mode ine 2)"/>
<combo id="spc1" fill="true" visibility="(:mode ieq 1) or (:mode ieq 3) or (:mode ieq 5)"/>
</hbox>
Expand Down
47 changes: 47 additions & 0 deletions res/main/ui/analyzer/spectrum/x2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,30 @@

<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms_0" height="19" hfill="true" pad.v="4" pad.h="6"/>

<vbox vfill="false" bg.color="bg_schema" pad.v="4" pad.h="6">
<label text="labels.chan.correlation" pad.v="0"/>
<hbox>
<label text="-1" font.size="8" hfill="true" text.halign="-1" pad.t="2" pad.r="1"/>
<ledchannel
id="cm_0"
width.min="13"
width.max="13"
min="-100"
max="100"
balance="0"
balance.visibility="true"
log="false"
type="peak"
text.visibility="false"
hexpand="true"
bg.color="bg_schema"
balance.color="bright_cyan"
value.color="cyan"
activity=":on_0 and :on_1"/>
<label text="+1" font.size="8" hfill="true" text.halign="1" pad.t="2"/>
</hbox>
</vbox>

<group text="groups.channels" vexpand="true" bg.color="bg" ipadding="0">
<grid rows="3" cols="3" hfill="false" spacing="2">
<ui:with bg.color="bg_schema">
Expand Down Expand Up @@ -440,6 +464,29 @@
</grid>
</group>
<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms" height="19" hfill="true" pad.v="4" pad.h="6" visibility=":mode ieq 3"/>
<vbox vfill="false" bg.color="bg_schema" pad.v="4" pad.h="6" visibility=":mode ieq 3">
<label text="labels.chan.correlation" pad.v="0"/>
<hbox>
<label text="-1" font.size="8" hfill="true" text.halign="-1" pad.t="2" pad.r="1"/>
<ledchannel
id="cm_0"
width.min="13"
width.max="13"
min="-100"
max="100"
balance="0"
balance.visibility="true"
log="false"
type="peak"
text.visibility="false"
hexpand="true"
bg.color="bg_schema"
balance.color="bright_cyan"
value.color="cyan"
activity=":on_0 and :on_1"/>
<label text="+1" font.size="8" hfill="true" text.halign="1" pad.t="2"/>
</hbox>
</vbox>
<group text="groups.channels" vexpand="true" bg.color="bg" ipadding="0">
<grid rows="3" cols="3" hfill="false" spacing="2">
<ui:with bg.color="bg_schema">
Expand Down
Loading

0 comments on commit 9d80fe5

Please sign in to comment.