From 77049e31ac0b31a0e6250629335984dcb2716a09 Mon Sep 17 00:00:00 2001
From: Paul RASCLE <paul.rascle@openfields.fr>
Date: Wed, 25 Nov 2020 23:07:25 +0100
Subject: [PATCH] fitShapesPointsToMesheEdges dialog completed

---
 .../plugins/fitShapePointsToMeshEdges.ui      | 40 +++++++++++++++++--
 .../fitShapePointsToMeshEdgesDialog.py        | 14 +++++--
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/HYDROTools/plugins/fitShapePointsToMeshEdges.ui b/src/HYDROTools/plugins/fitShapePointsToMeshEdges.ui
index de18cd81..895b4d9a 100644
--- a/src/HYDROTools/plugins/fitShapePointsToMeshEdges.ui
+++ b/src/HYDROTools/plugins/fitShapePointsToMeshEdges.ui
@@ -169,14 +169,14 @@
         <item row="0" column="1">
          <widget class="QCheckBox" name="cb_loadMeshEdges">
           <property name="text">
-           <string>load result</string>
+           <string>Load result</string>
           </property>
          </widget>
         </item>
         <item row="0" column="2">
          <widget class="QCheckBox" name="cb_splineMeshEdges">
           <property name="text">
-           <string>load as spline</string>
+           <string>Load as spline</string>
           </property>
          </widget>
         </item>
@@ -203,14 +203,14 @@
         <item row="1" column="1">
          <widget class="QCheckBox" name="cb_loadShapeToAdjust">
           <property name="text">
-           <string>load result</string>
+           <string>Load result</string>
           </property>
          </widget>
         </item>
         <item row="1" column="2">
          <widget class="QCheckBox" name="cb_splineShapeToAdjust">
           <property name="text">
-           <string>load as spline</string>
+           <string>Load as spline</string>
           </property>
          </widget>
         </item>
@@ -327,5 +327,37 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>cb_loadMeshEdges</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>cb_splineMeshEdges</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>282</x>
+     <y>194</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>396</x>
+     <y>194</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_loadShapeToAdjust</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>cb_splineShapeToAdjust</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>282</x>
+     <y>223</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>396</x>
+     <y>223</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
diff --git a/src/HYDROTools/plugins/fitShapePointsToMeshEdgesDialog.py b/src/HYDROTools/plugins/fitShapePointsToMeshEdgesDialog.py
index dc9e646f..e9485336 100644
--- a/src/HYDROTools/plugins/fitShapePointsToMeshEdgesDialog.py
+++ b/src/HYDROTools/plugins/fitShapePointsToMeshEdgesDialog.py
@@ -61,6 +61,8 @@ class fitShapePointsToMeshEdgesDialog(QDialog):
         self.pb_help.clicked.connect(self.on_help)
         self.pb_ok.accepted.connect(self.on_accept)
         self.pb_ok.rejected.connect(self.on_reject)
+        self.cb_splineMeshEdges.setEnabled(False)
+        self.cb_splineShapeToAdjust.setEnabled(False)
         self.meshEdges = None
         self.shapeToAdjust = None
         self.tmpdir = tempfile.mkdtemp()
@@ -168,13 +170,19 @@ class fitShapePointsToMeshEdgesDialog(QDialog):
         Below is the description of the dialog controls.
 
         <h3>Mesh edges shapefile</h3>
-        This field allows selection of a shapefile (via the standard file open dialog).
+        This field allows selection of a shapefile (via the standard file open dialog or by selection in the Object Browser).
         <h3>Shapefile to adjust</h3>
-        This field allows selection of a shapefile (via the standard file open dialog).
+        This field allows selection of a shapefile (via the standard file open dialog or by selection in the Object Browser).
+        <h3>Output dir</h3>
+        This field allows selection of the directory used to store the results.
         <h3>Split mesh edges shapefile</h3>
         If this checkbox is checked, the mesh edges shapefile is split at the intersection with the other shapefile.
-         <h3>Split shapefile to adjust</h3>
+        <h3>Split shapefile to adjust</h3>
         If this checkbox is checked, the shapefile to adjust is split at the intersection with the other shapefile.
+        <h3>Load result</h3>
+        If this checkbox is checked, the corresponding shapefile is loaded.
+        <h3>Load as spline</h3>
+        If this checkbox is checked, the corresponding shapefile is loaded as a spline.
         """
         QMessageBox.about(self, self.tr("About fit shape points to mesh edges dialog"), msg);
        
-- 
2.39.2