diff --git a/src/View/Geometry/MeshingDialog.py b/src/View/Geometry/MeshingDialog.py index 4caa27cce893e98cccc1737686e3aeeea286084d..ccdb0bdeb04c5c375c43d0db22d85ac9cb7647f8 100644 --- a/src/View/Geometry/MeshingDialog.py +++ b/src/View/Geometry/MeshingDialog.py @@ -51,9 +51,12 @@ class MeshingDialog(PamhyrDialog): def _init_default_values(self): self._space_step = 50.0 self._lplan = False + self._lm = "3" self._linear = False self._begin_cs = -1 self._end_cs = -1 + self._begin_dir = "un" + self._end_dir = "np" self._init_default_values_profiles() self._init_default_values_guidelines() @@ -63,6 +66,11 @@ class MeshingDialog(PamhyrDialog): self._space_step ) + self.combobox_add_items( + "comboBox_lm", ["1","2","3"] + ) + self.set_combobox_text("comboBox_lm", self._lm) + if self._linear: self.set_radio_button("radioButton_linear", True) else: @@ -109,8 +117,8 @@ class MeshingDialog(PamhyrDialog): 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]) + self.set_combobox_text("comboBox_begin_gl", self._begin_dir) + self.set_combobox_text("comboBox_end_gl", self._end_dir) @property def space_step(self): @@ -120,6 +128,10 @@ class MeshingDialog(PamhyrDialog): def lplan(self): return self._lplan + @property + def lm(self): + return int(self._lm) + @property def linear(self): return self._linear @@ -155,6 +167,8 @@ class MeshingDialog(PamhyrDialog): self._begin_dir = self.get_combobox_text("comboBox_begin_gl") self._end_dir = self.get_combobox_text("comboBox_end_gl") + self._lm = self.get_combobox_text("comboBox_lm") + super().accept() def reject(self): diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py index d090aa2a12182b00ef00903511d18b621fc2b5be..6c9342bdfc803d425e5d56079c0d401d35c15e5f 100644 --- a/src/View/Geometry/Window.py +++ b/src/View/Geometry/Window.py @@ -271,6 +271,7 @@ class GeometryWindow(PamhyrWindow): "limites": [dlg.begin_cs, dlg.end_cs], "directrices": [dlg.begin_dir, dlg.end_dir], "lplan": dlg.lplan, + "lm": dlg.lm, "linear": dlg.linear, } self._edit_meshing(data)