feat: valuesAsLabels - show min and max in GUI

tv2 · Nov 10, 2021 · a5489f8 · a5489f8
1 parent c93a0b0
commit a5489f8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/client/components/ChanStrip.tsx b/client/components/ChanStrip.tsx
@@ -243,7 +243,9 @@ class ChanStrip extends React.PureComponent<
                 {window.mixerProtocol.channelTypes[0].fromMixer[fxParam][0]
                     .label ?? ''}
                 <div className="parameter-mini-text">
-                    {maxLabel + valueLabel}
+                    {!valueAsLabels
+                        ? maxLabel + valueLabel
+                        : valueAsLabels[valueAsLabels.length - 1] + valueLabel}
                 </div>
                 <ReactSlider
                     className="chan-strip-fader"
@@ -267,7 +269,8 @@ class ChanStrip extends React.PureComponent<
                                   )
                                 : valueAsLabels[
                                       Math.round(
-                                          parseFloat(state.valueNow) * (maxLabel - minLabel)
+                                          parseFloat(state.valueNow) *
+                                              (maxLabel - minLabel)
                                       )
                                   ]}
                             {valueLabel}
@@ -278,7 +281,9 @@ class ChanStrip extends React.PureComponent<
                     }}
                 />
                 <div className="parameter-mini-text">
-                    {minLabel + valueLabel}
+                    {!valueAsLabels
+                        ? minLabel + valueLabel
+                        : valueAsLabels[0] + valueLabel}
                 </div>
             </div>
         )

diff --git a/client/components/ChanStripFull.tsx b/client/components/ChanStripFull.tsx
@@ -589,42 +589,42 @@ class ChanStripFull extends React.PureComponent<
         let valueLabel =
             window.mixerProtocol.channelTypes[0].fromMixer[fxParam]?.[0]
                 .valueLabel ?? ''
-
+        let valueAsLabels =
+            window.mixerProtocol.channelTypes[0].fromMixer[fxParam]?.[0]
+                .valueAsLabels
         return (
             <div className="parameter-text">
-                {
-                    window.mixerProtocol.channelTypes[0].fromMixer[fxParam][0]
-                        .label
-                }
+                {window.mixerProtocol.channelTypes[0].fromMixer[fxParam][0]
+                    .label ?? ''}
                 <div className="parameter-mini-text">
-                    {maxLabel + valueLabel}
+                    {!valueAsLabels
+                        ? maxLabel + valueLabel
+                        : valueAsLabels[valueAsLabels.length - 1] + valueLabel}
                 </div>
                 <ReactSlider
-                    className="chan-strip-full-fader"
-                    thumbClassName="chan-strip-full-thumb"
+                    className="chan-strip-fader"
+                    thumbClassName="chan-strip-thumb"
                     orientation="vertical"
+                    invert
                     min={0}
                     max={1}
                     step={0.001}
-                    invert="false"
                     value={
                         this.props.fader[this.props.faderIndex][fxParam]?.[0] ??
                         0
                     }
                     renderThumb={(props: any, state: any) => (
                         <div {...props}>
-                            {!window.mixerProtocol.channelTypes[0].fromMixer[
-                                fxParam
-                            ]?.[0].valueAsLabels
+                            {!valueAsLabels
                                 ? Math.round(
                                       (maxLabel - minLabel) *
                                           parseFloat(state.valueNow) +
                                           minLabel
                                   )
-                                : window.mixerProtocol.channelTypes[0]
-                                      .fromMixer[fxParam]?.[0].valueAsLabels[
+                                : valueAsLabels[
                                       Math.round(
-                                          parseFloat(state.valueNow) * 10
+                                          parseFloat(state.valueNow) *
+                                              (maxLabel - minLabel)
                                       )
                                   ]}
                             {valueLabel}
@@ -635,7 +635,9 @@ class ChanStripFull extends React.PureComponent<
                     }}
                 />
                 <div className="parameter-mini-text">
-                    {minLabel + valueLabel}
+                    {!valueAsLabels
+                        ? minLabel + valueLabel
+                        : valueAsLabels[0] + valueLabel}
                 </div>
             </div>
         )