ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-14 09:38:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Padder : fix RmaxRmin's variable name and update default values for NbIter and RmaxRmin

Browse Source
This commit is contained in:
uhz 2017-04-07 17:09:46 +02:00
parent 4fb165eddf
commit 3ac75b1234
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Tools/padder/spadderpy/gui/inputdialog.py
View File

@ -42,9 +42,9 @@ INPUTDATA_KEY_FILES="meshfiles"
INPUTDATA_KEY_PARAM="parameters" INPUTDATA_KEY_PARAM="parameters"
PARAM_KEY_NBITER = "NbIteration" PARAM_KEY_NBITER = "NbIteration"
PARAM_KEY_RMINRMAX = "RminRmax" PARAM_KEY_RMAXRMIN = "RmaxRmin"
PARAM_NBITER_DEFAULT_VALUE = 3 PARAM_NBITER_DEFAULT_VALUE = 10
PARAM_RMINRMAX_DEFAULT_VALUE = 1.5 PARAM_RMAXRMIN_DEFAULT_VALUE = 3
class InputDialog(GenericDialog): class InputDialog(GenericDialog):
@ -125,7 +125,7 @@ class InputDialog(GenericDialog):
# Setup default values for numerical parameters # Setup default values for numerical parameters
self.__ui.txtParamNbIter.setValue(PARAM_NBITER_DEFAULT_VALUE) self.__ui.txtParamNbIter.setValue(PARAM_NBITER_DEFAULT_VALUE)
self.__ui.txtParamRminRmax.setValue(PARAM_RMINRMAX_DEFAULT_VALUE) self.__ui.txtParamRmaxRmin.setValue(PARAM_RMAXRMIN_DEFAULT_VALUE)
# Note that PADDER does not support group name longer than 8 # Note that PADDER does not support group name longer than 8
# characters. We apply then this limit in the gui field. # characters. We apply then this limit in the gui field.
@ -317,8 +317,8 @@ class InputDialog(GenericDialog):
dictInputParameters = dictInputData[INPUTDATA_KEY_PARAM] dictInputParameters = dictInputData[INPUTDATA_KEY_PARAM]
if dictInputParameters.has_key(PARAM_KEY_NBITER): if dictInputParameters.has_key(PARAM_KEY_NBITER):
self.__ui.txtParamNbIter.setValue(dictInputParameters[PARAM_KEY_NBITER]) self.__ui.txtParamNbIter.setValue(dictInputParameters[PARAM_KEY_NBITER])
if dictInputParameters.has_key(PARAM_KEY_RMINRMAX): if dictInputParameters.has_key(PARAM_KEY_RMAXRMIN):
self.__ui.txtParamRminRmax.setValue(dictInputParameters[PARAM_KEY_RMINRMAX]) self.__ui.txtParamRminRmax.setValue(dictInputParameters[PARAM_KEY_RMAXRMIN])
def getData(self): def getData(self):
""" """
@ -334,7 +334,7 @@ class InputDialog(GenericDialog):
# Get the list of additionnal parameters # Get the list of additionnal parameters
dictInputParameters = {} dictInputParameters = {}
dictInputParameters[PARAM_KEY_NBITER] = self.__ui.txtParamNbIter.value() dictInputParameters[PARAM_KEY_NBITER] = self.__ui.txtParamNbIter.value()
dictInputParameters[PARAM_KEY_RMINRMAX] = self.__ui.txtParamRminRmax.value() dictInputParameters[PARAM_KEY_RMAXRMIN] = self.__ui.txtParamRmaxRmin.value()
dictInputData[INPUTDATA_KEY_PARAM] = dictInputParameters dictInputData[INPUTDATA_KEY_PARAM] = dictInputParameters
return dictInputData return dictInputData

8
src/Tools/padder/spadderpy/gui/inputframe.ui
View File

@ -111,7 +111,7 @@
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string>Béton</string> <string>Beton</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
@ -213,9 +213,9 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="lblParamRminRmax"> <widget class="QLabel" name="lblParamRmaxRmin">
<property name="text"> <property name="text">
<string>Rmin / Rmax</string> <string>Rmax / Rmin</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -227,7 +227,7 @@
<widget class="QSpinBox" name="txtParamNbIter"/> <widget class="QSpinBox" name="txtParamNbIter"/>
</item> </item>
<item> <item>
<widget class="QDoubleSpinBox" name="txtParamRminRmax"/> <widget class="QDoubleSpinBox" name="txtParamRmaxRmin"/>
</item> </item>
</layout> </layout>
</item> </item>

2
src/Tools/padder/spadderpy/gui/plugindialog.py
View File

@ -24,7 +24,7 @@ from qtsalome import QDialog, QIcon, Qt
from plugindialog_ui import Ui_PluginDialog from plugindialog_ui import Ui_PluginDialog
from inputdialog import InputDialog, INPUTDATA_KEY_FILES, INPUTDATA_KEY_PARAM from inputdialog import InputDialog, INPUTDATA_KEY_FILES, INPUTDATA_KEY_PARAM
from inputdialog import PARAM_KEY_NBITER, PARAM_KEY_RMINRMAX from inputdialog import PARAM_KEY_NBITER, PARAM_KEY_RMAXRMIN
from inputdata import InputData from inputdata import InputData
# __GBO__: uncomment this line and comment the previous one to use the # __GBO__: uncomment this line and comment the previous one to use the
# demo input dialog instead of the real one. # demo input dialog instead of the real one.

2
src/Tools/padder/unittests/usecase_meshJobManager.py
View File

@ -161,7 +161,7 @@ def test03_parameters():
meshJobFileList = test03_parameters() meshJobFileList = test03_parameters()
meshJobParameterList = [] meshJobParameterList = []
param = MESHJOB.MeshJobParameter(name="RminRmax",value="1.5") param = MESHJOB.MeshJobParameter(name="RmaxRmin",value="1.5")
meshJobParameterList.append(param) meshJobParameterList.append(param)
param = MESHJOB.MeshJobParameter(name="NbIteration",value="3") param = MESHJOB.MeshJobParameter(name="NbIteration",value="3")
meshJobParameterList.append(param) meshJobParameterList.append(param)