diff --git a/src/View/Geometry/MeshingDialog.py b/src/View/Geometry/MeshingDialog.py index a83d4d5bfae15dfc61011f689a911ecd11175add..4caa27cce893e98cccc1737686e3aeeea286084d 100644 --- a/src/View/Geometry/MeshingDialog.py +++ b/src/View/Geometry/MeshingDialog.py @@ -56,6 +56,7 @@ class MeshingDialog(PamhyrDialog): self._end_cs = -1 self._init_default_values_profiles() + self._init_default_values_guidelines() self.set_double_spin_box( "doubleSpinBox_space_step", @@ -98,9 +99,18 @@ class MeshingDialog(PamhyrDialog): return name - def _get_guide_line(self): - gl = self._reach - return [] + def _init_default_values_guidelines(self): + gl, _ = self._reach.compute_guidelines() + gl = list(gl) + + bgl = ['un'] + gl + egl = gl + ['np'] + + self.combobox_add_items("comboBox_begin_gl", bgl) + self.combobox_add_items("comboBox_end_gl", egl) + + self.set_combobox_text("comboBox_begin_gl", bgl[0]) + self.set_combobox_text("comboBox_end_gl", egl[-1]) @property def space_step(self): @@ -122,6 +132,14 @@ class MeshingDialog(PamhyrDialog): def end_cs(self): return self._end_cs + 1 + @property + def begin_dir(self): + return self._begin_dir + + @property + def end_dir(self): + return self._end_dir + def accept(self): self._space_step = self.get_double_spin_box( "doubleSpinBox_space_step", @@ -134,6 +152,9 @@ class MeshingDialog(PamhyrDialog): self._begin_cs = self.profiles.index(p1) self._end_cs = self.profiles.index(p2) + self._begin_dir = self.get_combobox_text("comboBox_begin_gl") + self._end_dir = self.get_combobox_text("comboBox_end_gl") + super().accept() def reject(self): diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py index 1006d22919300d00c42027d8df5278842ad89e92..d090aa2a12182b00ef00903511d18b621fc2b5be 100644 --- a/src/View/Geometry/Window.py +++ b/src/View/Geometry/Window.py @@ -269,11 +269,13 @@ class GeometryWindow(PamhyrWindow): data = { "step": dlg.space_step, "limites": [dlg.begin_cs, dlg.end_cs], + "directrices": [dlg.begin_dir, dlg.end_dir], "lplan": dlg.lplan, "linear": dlg.linear, } self._edit_meshing(data) except Exception as e: + logger_exception(e) return def _edit_meshing(self, data): diff --git a/src/View/ui/MeshingOptions.ui b/src/View/ui/MeshingOptions.ui index fd3d077d44c672c79d397e22639e3460a0abf2ff..dde78e5129a2d75973e1a8e60957884988d5906c 100644 --- a/src/View/ui/MeshingOptions.ui +++ b/src/View/ui/MeshingOptions.ui @@ -75,7 +75,7 @@ </widget> </item> <item> - <widget class="QComboBox" name="comboBox_begin_kp_2"> + <widget class="QComboBox" name="comboBox_begin_gl"> <property name="enabled"> <bool>true</bool> </property> @@ -96,7 +96,7 @@ </widget> </item> <item> - <widget class="QComboBox" name="comboBox_end_kp_2"> + <widget class="QComboBox" name="comboBox_end_gl"> <property name="enabled"> <bool>true</bool> </property>