diff --git a/src/Mod/Path/Gui/DlgSettingsPathColor.cpp b/src/Mod/Path/Gui/DlgSettingsPathColor.cpp
index d2db05acb2..b68ed7de28 100644
--- a/src/Mod/Path/Gui/DlgSettingsPathColor.cpp
+++ b/src/Mod/Path/Gui/DlgSettingsPathColor.cpp
@@ -67,6 +67,7 @@ void DlgSettingsPathColor::saveSettings()
ui->DefaultBBoxNormalColor->onSave();
ui->DefaultSelectionStyle->onSave();
ui->DefaultTaskPanelLayout->onSave();
+ ui->WarningSuppressRapidSpeeds->onSave();
}
void DlgSettingsPathColor::loadSettings()
@@ -83,6 +84,7 @@ void DlgSettingsPathColor::loadSettings()
ui->DefaultBBoxNormalColor->onRestore();
ui->DefaultSelectionStyle->onRestore();
ui->DefaultTaskPanelLayout->onRestore();
+ ui->WarningSuppressRapidSpeeds->onRestore();
}
/**
diff --git a/src/Mod/Path/Gui/DlgSettingsPathColor.ui b/src/Mod/Path/Gui/DlgSettingsPathColor.ui
index fe18cf2843..ecfbcc1882 100644
--- a/src/Mod/Path/Gui/DlgSettingsPathColor.ui
+++ b/src/Mod/Path/Gui/DlgSettingsPathColor.ui
@@ -6,12 +6,12 @@
0
0
- 483
- 536
+ 512
+ 633
- Path colors
+ GUI
@@ -449,6 +449,31 @@
+ -
+
+
+ Warnings
+
+
+
-
+
+
+ Suppress warning about setting the rapid speed rates for accurate cycle time calculation
+
+
+ Suppress missing rapid speeds warning
+
+
+ WarningSuppressRapidSpeeds
+
+
+ Mod/Path
+
+
+
+
+
+
@@ -472,6 +497,11 @@
QComboBox
+
+ Gui::PrefCheckBox
+ QCheckBox
+
+
DefaultNormalPathColor
diff --git a/src/Mod/Path/PathScripts/PathOp.py b/src/Mod/Path/PathScripts/PathOp.py
index ee1cde01dc..a618d9f026 100644
--- a/src/Mod/Path/PathScripts/PathOp.py
+++ b/src/Mod/Path/PathScripts/PathOp.py
@@ -27,6 +27,7 @@ from PySide import QtCore
import Path
import PathScripts.PathGeom as PathGeom
import PathScripts.PathLog as PathLog
+import PathScripts.PathPreferences as PathPreferences
import PathScripts.PathUtil as PathUtil
import PathScripts.PathUtils as PathUtils
from PathScripts.PathUtils import waiting_effects
@@ -551,7 +552,7 @@ class ObjectOp(object):
PathLog.warning(translate("Path", "Tool Controller feedrates required to calculate the cycle time."))
return translate('Path', 'Feedrate Error')
- if hRapidrate == 0 or vRapidrate == 0:
+ if (hRapidrate == 0 or vRapidrate == 0) and not PathPreferences.suppressRapidSpeedsWarning():
PathLog.warning(translate("Path", "Add Tool Controller Rapid Speeds on the SetupSheet for more accurate cycle times."))
# Get the cycle time in seconds
diff --git a/src/Mod/Path/PathScripts/PathPreferences.py b/src/Mod/Path/PathScripts/PathPreferences.py
index 6954c4b977..d41326ae30 100644
--- a/src/Mod/Path/PathScripts/PathPreferences.py
+++ b/src/Mod/Path/PathScripts/PathPreferences.py
@@ -29,35 +29,36 @@ import PathScripts.PathLog as PathLog
# PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
# PathLog.trackModule()
-DefaultFilePath = "DefaultFilePath"
-DefaultJobTemplate = "DefaultJobTemplate"
-DefaultStockTemplate = "DefaultStockTemplate"
-DefaultTaskPanelLayout = "DefaultTaskPanelLayout"
+DefaultFilePath = "DefaultFilePath"
+DefaultJobTemplate = "DefaultJobTemplate"
+DefaultStockTemplate = "DefaultStockTemplate"
+DefaultTaskPanelLayout = "DefaultTaskPanelLayout"
-PostProcessorDefault = "PostProcessorDefault"
-PostProcessorDefaultArgs = "PostProcessorDefaultArgs"
-PostProcessorBlacklist = "PostProcessorBlacklist"
-PostProcessorOutputFile = "PostProcessorOutputFile"
-PostProcessorOutputPolicy = "PostProcessorOutputPolicy"
+PostProcessorDefault = "PostProcessorDefault"
+PostProcessorDefaultArgs = "PostProcessorDefaultArgs"
+PostProcessorBlacklist = "PostProcessorBlacklist"
+PostProcessorOutputFile = "PostProcessorOutputFile"
+PostProcessorOutputPolicy = "PostProcessorOutputPolicy"
-LastPathToolBit = "LastPathToolBit"
-LastPathToolLibrary = "LastPathToolLibrary"
-LastPathToolShape = "LastPathToolShape"
-LastPathToolTable = "LastPathToolTable"
+LastPathToolBit = "LastPathToolBit"
+LastPathToolLibrary = "LastPathToolLibrary"
+LastPathToolShape = "LastPathToolShape"
+LastPathToolTable = "LastPathToolTable"
-LastFileToolBit = "LastFileToolBit"
-LastFileToolLibrary = "LastFileToolLibrary"
-LastFileToolShape = "LastFileToolShape"
+LastFileToolBit = "LastFileToolBit"
+LastFileToolLibrary = "LastFileToolLibrary"
+LastFileToolShape = "LastFileToolShape"
-UseLegacyTools = "UseLegacyTools"
-UseAbsoluteToolPaths = "UseAbsoluteToolPaths"
-OpenLastLibrary = "OpenLastLibrary"
+UseLegacyTools = "UseLegacyTools"
+UseAbsoluteToolPaths = "UseAbsoluteToolPaths"
+OpenLastLibrary = "OpenLastLibrary"
# Linear tolerance to use when generating Paths, eg when tessellating geometry
-GeometryTolerance = "GeometryTolerance"
-LibAreaCurveAccuracy = "LibAreaCurveAccuarcy"
+GeometryTolerance = "GeometryTolerance"
+LibAreaCurveAccuracy = "LibAreaCurveAccuarcy"
-EnableExperimentalFeatures = "EnableExperimentalFeatures"
+WarningSuppressRapidSpeeds = "WarningSuppressRapidSpeeds"
+EnableExperimentalFeatures = "EnableExperimentalFeatures"
def preferences():
@@ -259,6 +260,9 @@ def setDefaultTaskPanelLayout(style):
def experimentalFeaturesEnabled():
return preferences().GetBool(EnableExperimentalFeatures, False)
+def suppressRapidSpeedsWarning():
+ return preferences().GetBool(WarningSuppressRapidSpeeds, False)
+
def lastFileToolLibrary():
filename = preferences().GetString(LastFileToolLibrary)