From 8489a014d1ba7a9a709e21dbd9173f8b12edd7e7 Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Sat, 4 Apr 2015 12:30:52 +0100 Subject: [PATCH] FEM: replace vertical factor scroll bar with a horizonal one Signed-off-by: Przemo Firszt --- src/Mod/Fem/MechanicalAnalysis.py | 6 ++--- src/Mod/Fem/ShowDisplacement.ui | 41 ++++++++++++------------------- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/src/Mod/Fem/MechanicalAnalysis.py b/src/Mod/Fem/MechanicalAnalysis.py index 55ceb209f91b..afca403db0ab 100644 --- 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 index c532c40b55bb..e843f394b5e3 100644 --- a/src/Mod/Fem/ShowDisplacement.ui +++ b/src/Mod/Fem/ShowDisplacement.ui @@ -45,9 +45,9 @@ true - - mm - + + mm + @@ -62,9 +62,9 @@ true - - mm - + + mm + @@ -79,9 +79,9 @@ true - - mm - + + mm + @@ -159,6 +159,13 @@ + + + + Qt::Horizontal + + + @@ -177,22 +184,6 @@ - - - - 100 - - - 1 - - - 1 - - - Qt::Vertical - - -