From 5f7971d32b39c9ad5353bc712eab4b131ea01612 Mon Sep 17 00:00:00 2001
From: Markus Lampert <markus@bibi.ca>
Date: Fri, 29 Sep 2017 19:06:25 -0700
Subject: [PATCH] Placement preferences for stock.

---
 .../Path/Gui/Resources/preferences/PathJob.ui | 98 ++++++++++++++++++-
 src/Mod/Path/PathScripts/PathJob.py           |  1 -
 .../PathScripts/PathPreferencesPathJob.py     | 35 +++++++
 3 files changed, 129 insertions(+), 5 deletions(-)

diff --git a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui b/src/Mod/Path/Gui/Resources/preferences/PathJob.ui
index 5659614d31..3450979155 100644
--- a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui
+++ b/src/Mod/Path/Gui/Resources/preferences/PathJob.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>440</width>
-    <height>515</height>
+    <height>669</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,7 +25,7 @@
         <x>0</x>
         <y>0</y>
         <width>422</width>
-        <height>404</height>
+        <height>558</height>
        </rect>
       </property>
       <attribute name="label">
@@ -133,7 +133,7 @@
         <x>0</x>
         <y>0</y>
         <width>422</width>
-        <height>404</height>
+        <height>558</height>
        </rect>
       </property>
       <attribute name="label">
@@ -502,6 +502,88 @@
             </layout>
            </widget>
           </item>
+          <item>
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="stockPlacementGroup">
+            <property name="title">
+             <string>Placement</string>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_3">
+             <item row="0" column="2">
+              <widget class="Gui::InputField" name="stockAngle"/>
+             </item>
+             <item row="4" column="0">
+              <widget class="QLabel" name="label_10">
+               <property name="text">
+                <string>Position</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0">
+              <widget class="QLabel" name="label_11">
+               <property name="text">
+                <string>Axis</string>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="2">
+              <widget class="Gui::InputField" name="stockPositionX"/>
+             </item>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_9">
+               <property name="text">
+                <string>Angle</string>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="3">
+              <widget class="Gui::InputField" name="stockPositionY"/>
+             </item>
+             <item row="4" column="4">
+              <widget class="Gui::InputField" name="stockPositionZ"/>
+             </item>
+             <item row="3" column="2">
+              <widget class="QDoubleSpinBox" name="stockAxisX">
+               <property name="buttonSymbols">
+                <enum>QAbstractSpinBox::NoButtons</enum>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="3">
+              <widget class="QDoubleSpinBox" name="stockAxisY">
+               <property name="buttonSymbols">
+                <enum>QAbstractSpinBox::NoButtons</enum>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="4">
+              <widget class="QDoubleSpinBox" name="stockAxisZ">
+               <property name="buttonSymbols">
+                <enum>QAbstractSpinBox::NoButtons</enum>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -513,7 +595,7 @@
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>8</height>
+           <height>13</height>
           </size>
          </property>
         </spacer>
@@ -558,6 +640,14 @@
   <tabstop>stockBoxLength</tabstop>
   <tabstop>stockBoxWidth</tabstop>
   <tabstop>stockBoxHeight</tabstop>
+  <tabstop>stockPlacementGroup</tabstop>
+  <tabstop>stockAngle</tabstop>
+  <tabstop>stockAxisX</tabstop>
+  <tabstop>stockAxisY</tabstop>
+  <tabstop>stockAxisZ</tabstop>
+  <tabstop>stockPositionX</tabstop>
+  <tabstop>stockPositionY</tabstop>
+  <tabstop>stockPositionZ</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/src/Mod/Path/PathScripts/PathJob.py b/src/Mod/Path/PathScripts/PathJob.py
index 54251134ec..fa5fb7d48e 100644
--- a/src/Mod/Path/PathScripts/PathJob.py
+++ b/src/Mod/Path/PathScripts/PathJob.py
@@ -41,7 +41,6 @@ if False:
     PathLog.trackModule(PathLog.thisModule())
 else:
     PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
-    PathLog.trackModule(PathLog.thisModule())
 
 """Path Job object and FreeCAD command"""
 
diff --git a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py
index 80d12ebd51..47c534eddd 100644
--- a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py
+++ b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py
@@ -85,6 +85,17 @@ class JobPreferencesPage:
                 attrs['ypos'] = FreeCAD.Units.Quantity(self.form.stockExtYpos.text()).UserString
                 attrs['zneg'] = FreeCAD.Units.Quantity(self.form.stockExtZneg.text()).UserString
                 attrs['zpos'] = FreeCAD.Units.Quantity(self.form.stockExtZpos.text()).UserString
+            if self.form.stockPlacementGroup.isChecked():
+                angle = FreeCAD.Units.Quantity(self.form.stockAngle.text()).Value
+                axis = FreeCAD.Vector(self.form.stockAxisX.value(), self.form.stockAxisY.value(), self.form.stockAxisZ.value())
+                rot = FreeCAD.Rotation(axis, angle)
+                attrs['rotX'] = rot.Q[0]
+                attrs['rotY'] = rot.Q[1]
+                attrs['rotZ'] = rot.Q[2]
+                attrs['rotW'] = rot.Q[3]
+                attrs['posX'] = FreeCAD.Units.Quantity(self.form.stockPositionX.text()).Value
+                attrs['posY'] = FreeCAD.Units.Quantity(self.form.stockPositionY.text()).Value
+                attrs['posZ'] = FreeCAD.Units.Quantity(self.form.stockPositionZ.text()).Value
             PathPreferences.setDefaultStockTemplate(json.dumps(attrs))
         else:
             PathPreferences.setDefaultStockTemplate('')
@@ -184,6 +195,30 @@ class JobPreferencesPage:
         self.form.stockCylinderRadius.setText(attrs.get('radius', '5 mm'))
         self.form.stockCylinderHeight.setText(attrs.get('height', '10 mm'))
 
+        posX = attrs.get('posX')
+        posY = attrs.get('posY')
+        posZ = attrs.get('posZ')
+        rotX = attrs.get('rotX')
+        rotY = attrs.get('rotY')
+        rotZ = attrs.get('rotZ')
+        rotW = attrs.get('rotW')
+        if posX is not None and posY is not None and posZ is not None and rotX is not None and rotY is not None and rotZ is not None and rotW is not None:
+            pos = FreeCAD.Vector(float(posX), float(posY), float(posZ)) 
+            rot = FreeCAD.Rotation(float(rotX), float(rotY), float(rotZ), float(rotW))
+            placement = FreeCAD.Placement(pos, rot)
+            self.form.stockPlacementGroup.setChecked(True)
+        else:
+            placement = FreeCAD.Placement()
+            self.form.stockPlacementGroup.setChecked(False)
+
+        self.form.stockAngle.setText(FreeCAD.Units.Quantity("%f rad" % placement.Rotation.Angle).UserString)
+        self.form.stockAxisX.setValue(placement.Rotation.Axis.x)
+        self.form.stockAxisY.setValue(placement.Rotation.Axis.y)
+        self.form.stockAxisZ.setValue(placement.Rotation.Axis.z)
+        self.form.stockPositionX.setText(FreeCAD.Units.Quantity(placement.Base.x, FreeCAD.Units.Length).UserString)
+        self.form.stockPositionY.setText(FreeCAD.Units.Quantity(placement.Base.y, FreeCAD.Units.Length).UserString)
+        self.form.stockPositionZ.setText(FreeCAD.Units.Quantity(placement.Base.z, FreeCAD.Units.Length).UserString)
+
         self.setupStock(index)
         self.form.stock.currentIndexChanged.connect(self.setupStock)