Geometry: Meshing: Update windows with radiobutton instead of checkbox.

setup.py
Pierre-Antoine Rouby 2024-02-09 16:47:51 +01:00
parent e6178525d7
commit 387d462c2c
3 changed files with 55 additions and 35 deletions

View File

@ -36,13 +36,15 @@ class MeshingDialog(PamhyrDialog):
_pamhyr_ui = "MeshingOptions" _pamhyr_ui = "MeshingOptions"
_pamhyr_name = "Meshing" _pamhyr_name = "Meshing"
def __init__(self, parent=None): def __init__(self, reach, parent=None):
super(MeshingDialog, self).__init__( super(MeshingDialog, self).__init__(
title=self._pamhyr_name, title=self._pamhyr_name,
options=[], options=[],
parent=parent parent=parent
) )
self._reach = reach
self._init_default_values() self._init_default_values()
def _init_default_values(self): def _init_default_values(self):
@ -55,8 +57,10 @@ class MeshingDialog(PamhyrDialog):
self._space_step self._space_step
) )
self.set_check_box("checkBox_lplan", self._lplan) if self._linear:
self.set_check_box("checkBox_linear", self._linear) self.set_radio_button("radioButton_linear", True)
else:
self.set_radio_button("radioButton_spline", True)
@property @property
def space_step(self): def space_step(self):
@ -74,8 +78,7 @@ class MeshingDialog(PamhyrDialog):
self._space_step = self.get_double_spin_box( self._space_step = self.get_double_spin_box(
"doubleSpinBox_space_step", "doubleSpinBox_space_step",
) )
self._lplan = self.get_check_box("checkBox_lplan") self._linear = self.get_radio_button("radioButton_linear")
self._linear = self.get_check_box("checkBox_linear")
super().accept() super().accept()

View File

@ -261,7 +261,10 @@ class GeometryWindow(PamhyrWindow):
def edit_meshing(self): def edit_meshing(self):
try: try:
dlg = MeshingDialog(parent=self) dlg = MeshingDialog(
reach=self._reach,
parent=self
)
if dlg.exec(): if dlg.exec():
data = { data = {
"step": dlg.space_step, "step": dlg.space_step,

View File

@ -21,7 +21,7 @@
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>First cross section</string> <string>First cross section</string>
@ -31,7 +31,7 @@
<item> <item>
<widget class="QComboBox" name="comboBox_begin_kp"> <widget class="QComboBox" name="comboBox_begin_kp">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -42,7 +42,7 @@
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Last cross section</string> <string>Last cross section</string>
@ -52,7 +52,7 @@
<item> <item>
<widget class="QComboBox" name="comboBox_end_kp"> <widget class="QComboBox" name="comboBox_end_kp">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -67,7 +67,7 @@
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>First guide line</string> <string>First guide line</string>
@ -77,7 +77,7 @@
<item> <item>
<widget class="QComboBox" name="comboBox_begin_kp_2"> <widget class="QComboBox" name="comboBox_begin_kp_2">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -88,7 +88,7 @@
<item> <item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Last guide line</string> <string>Last guide line</string>
@ -98,7 +98,7 @@
<item> <item>
<widget class="QComboBox" name="comboBox_end_kp_2"> <widget class="QComboBox" name="comboBox_end_kp_2">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -138,17 +138,17 @@
<item> <item>
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>lm</string> <string>Distance computation guild line</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBox_lm"> <widget class="QComboBox" name="comboBox_lm">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -168,26 +168,40 @@
</layout> </layout>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QCheckBox" name="checkBox_lplan"> <layout class="QHBoxLayout" name="horizontalLayout_9">
<property name="enabled"> <item>
<bool>true</bool> <widget class="QRadioButton" name="radioButton_spline">
</property>
<property name="text"> <property name="text">
<string>Lplan</string> <string>Spline</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item>
<widget class="QCheckBox" name="checkBox_linear"> <widget class="QRadioButton" name="radioButton_linear">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text"> <property name="text">
<string>Linear</string> <string>Linear</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="5" column="0">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>