Merge pull request #413 from ywwg/not-transformer

Add a BindProperty transformation for boolean Not
mixxxdj · Nov 30, 2014 · a28e19b · a28e19b
2 parents ba293d2 + 691f03c
commit a28e19b
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 15 deletions.
diff --git a/res/skins/Deere/effect_rack.xml b/res/skins/Deere/effect_rack.xml
@@ -91,8 +91,7 @@
       <ConfigKey persist="true">[Master],show_library</ConfigKey>
       <BindProperty>visible</BindProperty>
       <Transform>
-        <Invert/>
-        <Add>1</Add>
+        <Not/>
       </Transform>
     </Connection>
   </WidgetGroup>

diff --git a/res/skins/Deere/left_deck_mixer_controls.xml b/res/skins/Deere/left_deck_mixer_controls.xml
@@ -22,8 +22,7 @@
           <ConfigKey>[Master],show_4decks</ConfigKey>
           <BindProperty>visible</BindProperty>
           <Transform>
-            <Invert/>
-            <Add>1</Add>
+            <Not/>
           </Transform>
         </Connection>
       </WidgetGroup>

diff --git a/res/skins/Deere/main_decks.xml b/res/skins/Deere/main_decks.xml
@@ -17,8 +17,7 @@
       <ConfigKey persist="true">[Master],show_library</ConfigKey>
       <BindProperty>visible</BindProperty>
       <Transform>
-        <Invert/>
-        <Add>1</Add>
+        <Not/>
       </Transform>
     </Connection>
   </WidgetGroup>

diff --git a/res/skins/Deere/microphone_rack.xml b/res/skins/Deere/microphone_rack.xml
@@ -80,8 +80,7 @@
       <ConfigKey persist="true">[Master],show_library</ConfigKey>
       <BindProperty>visible</BindProperty>
       <Transform>
-        <Invert/>
-        <Add>1</Add>
+        <Not/>
       </Transform>
     </Connection>
   </WidgetGroup>

diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml
@@ -70,8 +70,7 @@
       <ConfigKey>[Master],hide_mixer</ConfigKey>
       <BindProperty>visible</BindProperty>
       <Transform>
-        <Invert/>
-        <Add>1</Add>
+        <Not/>
       </Transform>
     </Connection>
   </WidgetGroup>

diff --git a/res/skins/Deere/right_deck_mixer_controls.xml b/res/skins/Deere/right_deck_mixer_controls.xml
@@ -22,8 +22,7 @@
           <ConfigKey>[Master],show_4decks</ConfigKey>
           <BindProperty>visible</BindProperty>
           <Transform>
-            <Invert/>
-            <Add>1</Add>
+            <Not/>
           </Transform>
         </Connection>
       </WidgetGroup>

diff --git a/res/skins/Deere/sample_decks.xml b/res/skins/Deere/sample_decks.xml
@@ -97,8 +97,7 @@
       <ConfigKey persist="true">[Master],show_library</ConfigKey>
       <BindProperty>visible</BindProperty>
       <Transform>
-        <Invert/>
-        <Add>1</Add>
+        <Not/>
       </Transform>
     </Connection>
   </WidgetGroup>

diff --git a/res/skins/LateNight/waveform_and_mixer.xml b/res/skins/LateNight/waveform_and_mixer.xml
@@ -84,7 +84,32 @@
                     <ConfigKey>[Master],show_mixer</ConfigKey>
                     <BindProperty>visible</BindProperty>
                 </Connection>
-            </WidgetGroup> 
+            </WidgetGroup>
+            <WidgetGroup>
+                <ObjectName>AlignRightBottom</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,f</SizePolicy>
+                <Children>
+                    <WidgetGroup> <!-- spacer to push logo to the right -->
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>e,min</SizePolicy>
+                        <Children/>
+                    </WidgetGroup>
+                    <WidgetGroup>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>f,f</SizePolicy>
+                        <Size>103,40</Size>
+                        <BackPath>style/mixxx_logo.png</BackPath>
+                    </WidgetGroup>
+                </Children>
+                <Connection>
+                    <ConfigKey>[Master],show_mixer</ConfigKey>
+                    <BindProperty>visible</BindProperty>
+                    <Transform>
+                        <Not/>
+                    </Transform>
+                </Connection>
+            </WidgetGroup>
 		</Children>
 	</WidgetGroup>
 </Template>
diff --git a/src/util/valuetransformer.cpp b/src/util/valuetransformer.cpp
@@ -49,6 +49,8 @@ ValueTransformer* ValueTransformer::parseFromXml(QDomElement transformElement,
             if (ok) {
                 pTransformer->addTransformer(new TransformAdd(addend));
             }
+        } else if (element.nodeName() == "Not") {
+            pTransformer->addTransformer(new TransformNot());
         }
     }
 

diff --git a/src/util/valuetransformer.h b/src/util/valuetransformer.h
@@ -43,6 +43,19 @@ class TransformInvert : public TransformNode {
     }
 };
 
+class TransformNot : public TransformNode {
+  public:
+    TransformNot() {}
+
+    double transform(double argument) const {
+        return !static_cast<bool>(argument);
+    }
+
+    double transformInverse(double argument) const {
+        return !static_cast<bool>(argument);
+    }
+};
+
 class ValueTransformer {
   public:
     double transform(double argument) const;