kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: Rename dialog element callbacks

Browse Source 
Also setDisplacement function has been removed

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt
2015-06-03 12:41:07 +01:00
committed by Yorik van Havre
parent 5853eabc62
commit 793a5b79f1
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mod/Fem/MechanicalAnalysis.py
View File

@@ -510,10 +510,10 @@ class _ResultControlTaskPanel:
QtCore.QObject.connect(self.form.rb_abs_displacement, QtCore.SIGNAL("toggled(bool)"), self.abs_displacement_selected)
QtCore.QObject.connect(self.form.rb_vm_stress, QtCore.SIGNAL("toggled(bool)"), self.vm_stress_selected)
QtCore.QObject.connect(self.form.cb_show_displacement, QtCore.SIGNAL("clicked(bool)"), self.showDisplacementClicked)
QtCore.QObject.connect(self.form.hsb_factor, QtCore.SIGNAL("valueChanged(int)"), self.sliderValue)
QtCore.QObject.connect(self.form.sb_slider_factor, QtCore.SIGNAL("valueChanged(int)"), self.sliderMaxValue)
QtCore.QObject.connect(self.form.sb_displacement_factor, QtCore.SIGNAL("valueChanged(int)"), self.displacementFactorValue)
QtCore.QObject.connect(self.form.cb_show_displacement, QtCore.SIGNAL("clicked(bool)"), self.show_displacement)
QtCore.QObject.connect(self.form.hsb_displacement_factor, QtCore.SIGNAL("valueChanged(int)"), self.hsb_disp_factor_changed)
QtCore.QObject.connect(self.form.sb_displacement_factor, QtCore.SIGNAL("valueChanged(int)"), self.sb_disp_factor_changed)
QtCore.QObject.connect(self.form.sb_displacement_factor_max, QtCore.SIGNAL("valueChanged(int)"), self.sb_disp_factor_max_changed)
self.DisplacementObject = None
self.StressObject = None
@@ -581,30 +581,24 @@ class _ResultControlTaskPanel:
self.form.le_max.setProperty("unit", unit)
self.form.le_max.setText("{:.6} {}".format(maxm, unit))
def showDisplacementClicked(self, checked):
def show_displacement(self, checked):
QApplication.setOverrideCursor(Qt.WaitCursor)
factor = 0.0
if checked:
factor = self.form.hsb_factor.value()
self.setDisplacement()
factor = self.form.hsb_displacement_factor.value()
self.MeshObject.ViewObject.setNodeDisplacementByResult(self.DisplacementObject)
self.MeshObject.ViewObject.applyDisplacement(factor)
QtGui.qApp.restoreOverrideCursor()
def sliderValue(self, value):
def hsb_disp_factor_changed(self, value):
self.MeshObject.ViewObject.applyDisplacement(value)
self.form.sb_displacement_factor.setValue(value)
def sliderMaxValue(self, value):
#print 'sliderMaxValue()'
self.form.hsb_factor.setMaximum(value)
def sb_disp_factor_max_changed(self, value):
self.form.hsb_displacement_factor.setMaximum(value)
def displacementFactorValue(self, value):
#print 'displacementFactorValue()'
self.form.hsb_factor.setValue(value)
def setDisplacement(self):
if self.DisplacementObject:
self.MeshObject.ViewObject.setNodeDisplacementByResult(self.DisplacementObject)
def sb_disp_factor_changed(self, value):
self.form.hsb_displacement_factor.setValue(value)
def update(self):
self.MeshObject = None

8
src/Mod/Fem/ShowDisplacement.ui
View File

@@ -148,7 +148,7 @@
</widget>
</item>
<item>
<widget class="QScrollBar" name="hsb_factor">
<widget class="QScrollBar" name="hsb_displacement_factor">
<property name="enabled">
<bool>false</bool>
</property>
@@ -211,7 +211,7 @@
</widget>
</item>
<item>
<widget class="QSpinBox" name="sb_slider_factor">
<widget class="QSpinBox" name="sb_displacement_factor_max">
<property name="enabled">
<bool>false</bool>
</property>
@@ -311,7 +311,7 @@
<connection>
<sender>cb_show_displacement</sender>
<signal>toggled(bool)</signal>
<receiver>sb_slider_factor</receiver>
<receiver>sb_displacement_factor_max</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
@@ -327,7 +327,7 @@
<connection>
<sender>cb_show_displacement</sender>
<signal>toggled(bool)</signal>
<receiver>hsb_factor</receiver>
<receiver>hsb_displacement_factor</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">