Commit 61428580 authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

Geometry: Meshing: Add "directrices".

Showing with 28 additions and 5 deletions
+28 -5
...@@ -56,6 +56,7 @@ class MeshingDialog(PamhyrDialog): ...@@ -56,6 +56,7 @@ class MeshingDialog(PamhyrDialog):
self._end_cs = -1 self._end_cs = -1
self._init_default_values_profiles() self._init_default_values_profiles()
self._init_default_values_guidelines()
self.set_double_spin_box( self.set_double_spin_box(
"doubleSpinBox_space_step", "doubleSpinBox_space_step",
...@@ -98,9 +99,18 @@ class MeshingDialog(PamhyrDialog): ...@@ -98,9 +99,18 @@ class MeshingDialog(PamhyrDialog):
return name return name
def _get_guide_line(self): def _init_default_values_guidelines(self):
gl = self._reach gl, _ = self._reach.compute_guidelines()
return [] 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 @property
def space_step(self): def space_step(self):
...@@ -122,6 +132,14 @@ class MeshingDialog(PamhyrDialog): ...@@ -122,6 +132,14 @@ class MeshingDialog(PamhyrDialog):
def end_cs(self): def end_cs(self):
return self._end_cs + 1 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): def accept(self):
self._space_step = self.get_double_spin_box( self._space_step = self.get_double_spin_box(
"doubleSpinBox_space_step", "doubleSpinBox_space_step",
...@@ -134,6 +152,9 @@ class MeshingDialog(PamhyrDialog): ...@@ -134,6 +152,9 @@ class MeshingDialog(PamhyrDialog):
self._begin_cs = self.profiles.index(p1) self._begin_cs = self.profiles.index(p1)
self._end_cs = self.profiles.index(p2) 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() super().accept()
def reject(self): def reject(self):
......
...@@ -269,11 +269,13 @@ class GeometryWindow(PamhyrWindow): ...@@ -269,11 +269,13 @@ class GeometryWindow(PamhyrWindow):
data = { data = {
"step": dlg.space_step, "step": dlg.space_step,
"limites": [dlg.begin_cs, dlg.end_cs], "limites": [dlg.begin_cs, dlg.end_cs],
"directrices": [dlg.begin_dir, dlg.end_dir],
"lplan": dlg.lplan, "lplan": dlg.lplan,
"linear": dlg.linear, "linear": dlg.linear,
} }
self._edit_meshing(data) self._edit_meshing(data)
except Exception as e: except Exception as e:
logger_exception(e)
return return
def _edit_meshing(self, data): def _edit_meshing(self, data):
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBox_begin_kp_2"> <widget class="QComboBox" name="comboBox_begin_gl">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBox_end_kp_2"> <widget class="QComboBox" name="comboBox_end_gl">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment