switch from MailleurTT to internal meshing

src/View/Geometry/MeshingDialog.py

@@ -23,12 +23,12 @@ from PyQt5.QtGui import (
 )
 
 from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
+    Qt, QVariant, QAbstractTableModel, QItemSelectionModel,
 )
 
 from PyQt5.QtWidgets import (
     QDialogButtonBox, QComboBox, QUndoStack, QShortcut,
-    QDoubleSpinBox,
+    QDoubleSpinBox, QRadioButton,
 )
 
 
@@ -71,7 +71,7 @@ class MeshingDialog(PamhyrDialog):
         self._origin = self._reach.profile(0)
 
         self._init_default_values_profiles()
-        self._init_default_values_guidelines()
+        # self._init_default_values_guidelines()
 
         self.set_double_spin_box(
             "doubleSpinBox_space_step",
@@ -83,19 +83,22 @@ class MeshingDialog(PamhyrDialog):
         else:
             self.set_radio_button("radioButton_spline", True)
 
+        self.find(QRadioButton, "radioButton_spline").setEnabled(False)
+        self.find(QRadioButton, "radioButton_linear").setEnabled(False)
+
     def _init_default_values_profiles(self):
         profiles = self.profiles
 
         self.combobox_add_items("comboBox_begin_rk", profiles)
         self.combobox_add_items("comboBox_end_rk", profiles)
 
-        if len(self.parent.tableView.selectedIndexes()) <= 1:
+        r = self.parent.tableView\
+                .selectionModel()\
+                .selectedRows()
+        if len(r) <= 1:
             self.set_combobox_text("comboBox_begin_rk", profiles[0])
             self.set_combobox_text("comboBox_end_rk", profiles[-1])
         else:
-            r = self.parent.tableView\
-                .selectionModel()\
-                .selectedRows()
             self.set_combobox_text("comboBox_begin_rk", profiles[r[0].row()])
             self.set_combobox_text("comboBox_end_rk", profiles[r[-1].row()])
 
@@ -174,8 +177,10 @@ 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")
+        # self._begin_dir = self.get_combobox_text("comboBox_begin_gl")
+        # self._end_dir = self.get_combobox_text("comboBox_end_gl")
+
+        self.parent.tableView.selectionModel().clearSelection()
 
         super().accept()
 

src/View/Geometry/UndoCommand.py

@@ -28,8 +28,6 @@ from PyQt5.QtWidgets import (
 from Model.Geometry import Reach
 from Model.Except import exception_message_box
 
-from Meshing.Mage import MeshingWithMage
-
 logger = logging.getLogger()
 
 
@@ -240,7 +238,7 @@ class MeshingCommand(QUndoCommand):
         self._mesher = mesher
         self._command = command
 
-        self._profiles = reach.profiles.copy()
+        self._profiles = [p.copy() for p in reach.profiles]
         self._profiles.reverse()
 
         self._new_profiles = None
@@ -264,7 +262,7 @@ class MeshingCommand(QUndoCommand):
                     **self._data
                 )
 
-            self._new_profiles = self._reach.profiles.copy()
+            self._new_profiles = [p.copy() for p in self._reach.profiles]
             self._new_profiles.reverse()
         else:
             self._reach.purge()

src/View/Geometry/Window.py

@@ -49,9 +49,7 @@ from View.Tools.Plot.PamhyrCanvas import MplCanvas
 
 from View.SelectReach.Window import SelectReachWindow
 
-from Meshing.Mage import (
-    MeshingWithMage, MeshingWithMageMailleurTT
-)
+from Meshing.Internal import InternalMeshing
 
 from View.Geometry.Table import GeometryReachTableModel
 from View.Geometry.PlotXY import PlotXY
@@ -298,8 +296,6 @@ 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)
@@ -309,16 +305,10 @@ class GeometryWindow(PamhyrWindow):
 
     def _edit_meshing(self, data):
         try:
-            mesher = MeshingWithMageMailleurTT()
+            mesher = InternalMeshing()
             self._table.meshing(mesher, data)
         except Exception as e:
             logger_exception(e)
-            raise ExternFileMissingError(
-                module="mage",
-                filename="MailleurTT",
-                path=MeshingWithMageMailleurTT._path(),
-                src_except=e
-            )
 
     def update_rk(self):
         try: