FEM: replace vertical factor scroll bar with a horizonal one

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
FreeCAD · Apr 9, 2015 · 8489a01 · 8489a01
1 parent 54bb4e2
commit 8489a01
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 28 deletions.
diff --git a/src/Mod/Fem/MechanicalAnalysis.py b/src/Mod/Fem/MechanicalAnalysis.py
@@ -583,7 +583,7 @@ def __init__(self,object):
         QtCore.QObject.connect(self.form.comboBox_Type, QtCore.SIGNAL("currentIndexChanged(QString)"), self.typeChanged)
 
         QtCore.QObject.connect(self.form.checkBox_ShowDisplacement, QtCore.SIGNAL("clicked(bool)"), self.showDisplacementClicked)
-        QtCore.QObject.connect(self.form.verticalScrollBar_Factor, QtCore.SIGNAL("valueChanged(int)"), self.sliderValue)
+        QtCore.QObject.connect(self.form.horizontalScrollBar_Factor, QtCore.SIGNAL("valueChanged(int)"), self.sliderValue)
         QtCore.QObject.connect(self.form.spinBox_SliderFactor, QtCore.SIGNAL("valueChanged(int)"), self.sliderMaxValue)
         QtCore.QObject.connect(self.form.spinBox_DisplacementFactor, QtCore.SIGNAL("valueChanged(int)"), self.displacementFactorValue)
 
@@ -635,11 +635,11 @@ def sliderValue(self,value):
 
     def sliderMaxValue(self,value):
         #print 'sliderMaxValue()'
-        self.form.verticalScrollBar_Factor.setMaximum(value)
+        self.form.horizontalScrollBar_Factor.setMaximum(value)
 
     def displacementFactorValue(self,value):
         #print 'displacementFactorValue()'
-        self.form.verticalScrollBar_Factor.setValue(value)
+        self.form.horizontalScrollBar_Factor.setValue(value)
 
     def setDisplacement(self):
         if self.DisplacementObject:

diff --git a/src/Mod/Fem/ShowDisplacement.ui b/src/Mod/Fem/ShowDisplacement.ui
@@ -45,9 +45,9 @@
             <property name="readOnly">
              <bool>true</bool>
             </property>
-           <property name="unit" stdset="0">
-            <string>mm</string>
-           </property>
+            <property name="unit" stdset="0">
+             <string>mm</string>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -62,9 +62,9 @@
             <property name="readOnly">
              <bool>true</bool>
             </property>
-           <property name="unit" stdset="0">
-            <string>mm</string>
-           </property>
+            <property name="unit" stdset="0">
+             <string>mm</string>
+            </property>
            </widget>
           </item>
           <item row="2" column="0">
@@ -79,9 +79,9 @@
             <property name="readOnly">
              <bool>true</bool>
             </property>
-           <property name="unit" stdset="0">
-            <string>mm</string>
-           </property>
+            <property name="unit" stdset="0">
+             <string>mm</string>
+            </property>
            </widget>
           </item>
          </layout>
@@ -159,6 +159,13 @@
           </item>
          </layout>
         </item>
+        <item>
+         <widget class="QScrollBar" name="horizontalScrollBar_Factor">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -177,22 +184,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QScrollBar" name="verticalScrollBar_Factor">
-     <property name="maximum">
-      <number>100</number>
-     </property>
-     <property name="pageStep">
-      <number>1</number>
-     </property>
-     <property name="sliderPosition">
-      <number>1</number>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>