From d28faee03a28fd4fa542161ec99233d1fc25d701 Mon Sep 17 00:00:00 2001
From: Jose Luis Cercos Pita <jlcercos@gmail.com>
Date: Fri, 16 Oct 2015 11:14:53 +0200
Subject: [PATCH] Imported the areas curve tool improvements from sourceforge

---
 src/Mod/Ship/shipAreasCurve/TaskPanel.py | 39 ++++++++++++++++++++++--
 src/Mod/Ship/shipAreasCurve/TaskPanel.ui | 22 ++++++++++++-
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/src/Mod/Ship/shipAreasCurve/TaskPanel.py b/src/Mod/Ship/shipAreasCurve/TaskPanel.py
index 787bb2dc0..40719b935 100644
--- a/src/Mod/Ship/shipAreasCurve/TaskPanel.py
+++ b/src/Mod/Ship/shipAreasCurve/TaskPanel.py
@@ -50,10 +50,12 @@ class TaskPanel:
         form = mw.findChild(QtGui.QWidget, "TaskPanel")
         form.draft = self.widget(QtGui.QLineEdit, "Draft")
         form.trim = self.widget(QtGui.QLineEdit, "Trim")
+        form.num = self.widget(QtGui.QSpinBox, "Num")
         draft = Units.Quantity(Locale.fromString(
             form.draft.text())).getValueAs('m').Value
         trim = Units.Quantity(Locale.fromString(
             form.trim.text())).getValueAs('deg').Value
+        num = form.num.value()
         data = Hydrostatics.displacement(self.ship,
                                          draft,
                                          0.0,
@@ -63,7 +65,9 @@ class TaskPanel:
         data = Hydrostatics.areas(self.ship,
                                   draft,
                                   0.0,
-                                  trim)
+                                  trim,
+                                  0.0,
+                                  num)
         x = []
         y = []
         for i in range(0, len(data)):
@@ -104,6 +108,7 @@ class TaskPanel:
 
         form.draft = self.widget(QtGui.QLineEdit, "Draft")
         form.trim = self.widget(QtGui.QLineEdit, "Trim")
+        form.num = self.widget(QtGui.QSpinBox, "Num")
         form.output = self.widget(QtGui.QTextEdit, "OutputData")
         form.doc = QtGui.QTextDocument(form.output)
         self.form = form
@@ -183,6 +188,7 @@ class TaskPanel:
         form = mw.findChild(QtGui.QWidget, "TaskPanel")
         form.draft = self.widget(QtGui.QLineEdit, "Draft")
         form.trim = self.widget(QtGui.QLineEdit, "Trim")
+        form.num = self.widget(QtGui.QSpinBox, "Num")
         form.draft.setText(Locale.toString(length_format.format(
             self.ship.Draft.getValueAs(USys.getLengthUnits()).Value)))
         form.trim.setText(Locale.toString(angle_format.format(0.0)))
@@ -202,6 +208,11 @@ class TaskPanel:
                     USys.getAngleUnits()).Value)))
         except ValueError:
             pass
+        try:
+            props.index("AreaCurveNum")
+            form.num.setValue(self.ship.AreaCurveNum)
+        except ValueError:
+            pass
         # Update GUI
         draft = Units.Quantity(form.draft.text()).getValueAs('m').Value
         trim = Units.Quantity(form.trim.text()).getValueAs('deg').Value
@@ -227,7 +238,13 @@ class TaskPanel:
         self.widget(QtGui.QLabel, "TrimLabel").setText(
             QtGui.QApplication.translate(
                 "ship_areas",
-                "Trim",
+                "Trim angle",
+                None,
+                QtGui.QApplication.UnicodeUTF8))
+        self.widget(QtGui.QLabel, "NumLabel").setText(
+            QtGui.QApplication.translate(
+                "ship_areas",
+                "Number of points",
                 None,
                 QtGui.QApplication.UnicodeUTF8))
 
@@ -347,11 +364,13 @@ class TaskPanel:
         form = mw.findChild(QtGui.QWidget, "TaskPanel")
         form.draft = self.widget(QtGui.QLineEdit, "Draft")
         form.trim = self.widget(QtGui.QLineEdit, "Trim")
+        form.num = self.widget(QtGui.QSpinBox, "Num")
 
         draft = Units.Quantity(Locale.fromString(
             form.draft.text())).getValueAs('m').Value
         trim = Units.Quantity(Locale.fromString(
             form.trim.text())).getValueAs('deg').Value
+        num = form.num.value()
 
         props = self.ship.PropertiesList
         try:
@@ -386,6 +405,22 @@ class TaskPanel:
                                   "Ship",
                                   tooltip)
         self.ship.AreaCurveTrim = '{} deg'.format(trim)
+        try:
+            props.index("AreaCurveNum")
+        except ValueError:
+            try:
+                tooltip = str(QtGui.QApplication.translate(
+                    "ship_areas",
+                    "Areas curve tool number of points",
+                    None,
+                    QtGui.QApplication.UnicodeUTF8))
+            except:
+                tooltip = "Areas curve tool number of points"
+            self.ship.addProperty("App::PropertyInteger",
+                                  "AreaCurveNum",
+                                  "Ship",
+                                  tooltip)
+        self.ship.AreaCurveNum = num
 
 
 def createTask():
diff --git a/src/Mod/Ship/shipAreasCurve/TaskPanel.ui b/src/Mod/Ship/shipAreasCurve/TaskPanel.ui
index 75aa5cc81..8f1914d03 100644
--- a/src/Mod/Ship/shipAreasCurve/TaskPanel.ui
+++ b/src/Mod/Ship/shipAreasCurve/TaskPanel.ui
@@ -45,7 +45,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Trim</string>
+        <string>Trim angle</string>
        </property>
       </widget>
      </item>
@@ -55,6 +55,26 @@
      <item row="1" column="1">
       <widget class="Gui::InputField" name="Trim"/>
      </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="NumLabel">
+       <property name="text">
+        <string>Number of points</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QSpinBox" name="Num">
+       <property name="minimum">
+        <number>2</number>
+       </property>
+       <property name="maximum">
+        <number>9999</number>
+       </property>
+       <property name="value">
+        <number>30</number>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>