Merge branch 'master' into bugfix/toolbit-properties-alignment

src/Mod/Path/PathScripts/PathPreferences.py

@@ -62,6 +62,7 @@ WarningSuppressAllSpeeds        = "WarningSuppressAllSpeeds"
 WarningSuppressSelectionMode    = "WarningSuppressSelectionMode"
 WarningSuppressOpenCamLib       = "WarningSuppressOpenCamLib"
 EnableExperimentalFeatures      = "EnableExperimentalFeatures"
+EnableAdvancedOCLFeatures      = "EnableAdvancedOCLFeatures"
 
 
 def preferences():
@@ -243,6 +244,10 @@ def setDefaultTaskPanelLayout(style):
     preferences().SetInt(DefaultTaskPanelLayout, style)
 
 
+def advancedOCLFeaturesEnabled():
+    return preferences().GetBool(EnableAdvancedOCLFeatures, False)
+
+
 def experimentalFeaturesEnabled():
     return preferences().GetBool(EnableExperimentalFeatures, False)
 
@@ -251,8 +256,8 @@ def suppressAllSpeedsWarning():
     return preferences().GetBool(WarningSuppressAllSpeeds, True)
 
 
-def suppressRapidSpeedsWarning():
-    return suppressAllSpeedsWarning() or preferences().GetBool(WarningSuppressRapidSpeeds, True)
+def suppressRapidSpeedsWarning(user=True):
+    return (user and suppressAllSpeedsWarning()) or preferences().GetBool(WarningSuppressRapidSpeeds, True)
 
 
 def suppressSelectionModeWarning():
@@ -262,6 +267,12 @@ def suppressSelectionModeWarning():
 def suppressOpenCamLibWarning():
     return preferences().GetBool(WarningSuppressOpenCamLib, True)
 
+def setPreferencesAdvanced(ocl, warnSpeeds, warnRapids, warnModes, warnOCL):
+    preferences().SetBool(EnableAdvancedOCLFeatures,    ocl)
+    preferences().SetBool(WarningSuppressAllSpeeds,     warnSpeeds)
+    preferences().SetBool(WarningSuppressRapidSpeeds,   warnRapids)
+    preferences().SetBool(WarningSuppressSelectionMode, warnModes)
+    preferences().SetBool(WarningSuppressOpenCamLib,    warnOCL)
 
 def lastFileToolLibrary():
     filename = preferences().GetString(LastFileToolLibrary)

src/Mod/Path/PathScripts/PathPreferencesAdvanced.py

@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+# ***************************************************************************
+# *   Copyright (c) 2021 sliptonic <shopinthewoods@gmail.com>               *
+# *                                                                         *
+# *   This program is free software; you can redistribute it and/or modify  *
+# *   it under the terms of the GNU Lesser General Public License (LGPL)    *
+# *   as published by the Free Software Foundation; either version 2 of     *
+# *   the License, or (at your option) any later version.                   *
+# *   for detail see the LICENCE text file.                                 *
+# *                                                                         *
+# *   This program is distributed in the hope that it will be useful,       *
+# *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+# *   GNU Library General Public License for more details.                  *
+# *                                                                         *
+# *   You should have received a copy of the GNU Library General Public     *
+# *   License along with this program; if not, write to the Free Software   *
+# *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+# *   USA                                                                   *
+# *                                                                         *
+# ***************************************************************************
+
+import FreeCADGui
+import PathScripts.PathPreferences as PathPreferences
+import PySide
+
+# Qt translation handling
+def translate(context, text, disambig=None):
+    return PySide.QtCore.QCoreApplication.translate(context, text, disambig)
+
+class AdvancedPreferencesPage:
+    def __init__(self, parent=None):
+        self.form = FreeCADGui.PySideUic.loadUi(':preferences/Advanced.ui')
+        self.form.WarningSuppressAllSpeeds.stateChanged.connect(self.updateSelection)
+        self.form.EnableAdvancedOCLFeatures.stateChanged.connect(self.updateSelection)
+
+    def saveSettings(self):
+        PathPreferences.setPreferencesAdvanced(
+                self.form.EnableAdvancedOCLFeatures.isChecked(),
+                self.form.WarningSuppressAllSpeeds.isChecked(),
+                self.form.WarningSuppressRapidSpeeds.isChecked(),
+                self.form.WarningSuppressSelectionMode.isChecked(),
+                self.form.WarningSuppressOpenCamLib.isChecked())
+
+    def loadSettings(self):
+        self.form.WarningSuppressAllSpeeds.setChecked(PathPreferences.suppressAllSpeedsWarning())
+        self.form.WarningSuppressRapidSpeeds.setChecked(PathPreferences.suppressRapidSpeedsWarning(False))
+        self.form.WarningSuppressSelectionMode.setChecked(PathPreferences.suppressSelectionModeWarning())
+        self.form.EnableAdvancedOCLFeatures.setChecked(PathPreferences.advancedOCLFeaturesEnabled())
+        self.form.WarningSuppressOpenCamLib.setChecked(PathPreferences.suppressOpenCamLibWarning())
+        self.updateSelection()
+
+    def updateSelection(self, state=None):
+        self.form.WarningSuppressOpenCamLib.setEnabled(self.form.EnableAdvancedOCLFeatures.isChecked())
+        if self.form.WarningSuppressAllSpeeds.isChecked():
+            self.form.WarningSuppressRapidSpeeds.setChecked(True)
+            self.form.WarningSuppressRapidSpeeds.setEnabled(False)
+        else:
+            self.form.WarningSuppressRapidSpeeds.setEnabled(True)
+

src/Mod/Path/PathScripts/PathSurfaceSupport.py

@@ -2555,6 +2555,7 @@ class OCL_Tool():
         if (self.diameter == -1.0 or self.cutEdgeHeight == -1.0):
             return
         self.tiltCutter = True
+        if self.cutEdgeHeight==0 : self.cutEdgeHeight = self.diameter/2
         self.oclTool = self.ocl.BallCutter(
                             self.diameter,
                             self.cutEdgeHeight + self.lengthOffset
@@ -2582,8 +2583,8 @@ class OCL_Tool():
             return
         self.oclTool = self.ocl.ConeCutter(
                             self.diameter,
-                            self.cutEdgeAngle,
-                            self.cutEdgeHeight + self.lengthOffset
+                            self.cutEdgeAngle/2,
+                            self.lengthOffset
                         )
 
     def _setToolMethod(self):