Merge pull request #11440 from Roy-043/Draft-make-Draft_Edit-prefs-non-global

Draft: make Draft_Edit prefs non-global
This commit is contained in:
Roy-043
2023-11-18 19:45:00 +01:00
committed by GitHub

View File

@@ -128,7 +128,7 @@ class Edit(gui_base_original.Modifier):
Preferences
-----------
maxObjects: Int
max_objects: Int
set by "DraftEditMaxObjects" in user preferences
The max number of FreeCAD objects the tool is
allowed to edit at the same time.
@@ -213,10 +213,10 @@ class Edit(gui_base_original.Modifier):
# only used by Arch Structure
self.objs_formats = {}
# settings
param = App.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")
self.maxObjects = param.GetInt("DraftEditMaxObjects", 5)
self.pick_radius = param.GetInt("DraftEditPickRadius", 20)
# settings (get updated in Activated)
self.param = App.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")
self.max_objects = 5
self.pick_radius = 20
self.alt_edit_mode = 0 # default edit mode for objects
@@ -278,6 +278,8 @@ class Edit(gui_base_original.Modifier):
self.ui = Gui.draftToolBar
self.view = gui_utils.get_3d_view()
self.max_objects = self.param.GetInt("DraftEditMaxObjects", 5)
self.pick_radius = self.param.GetInt("DraftEditPickRadius", 20)
if Gui.Selection.getSelection():
self.proceed()
@@ -778,9 +780,9 @@ class Edit(gui_base_original.Modifier):
"""
selection = Gui.Selection.getSelection()
self.edited_objects = []
if len(selection) > self.maxObjects:
if len(selection) > self.max_objects:
_err = translate("draft", "Too many objects selected, max number set to:")
App.Console.PrintMessage(_err + " " + str(self.maxObjects) + "\n")
App.Console.PrintMessage(_err + " " + str(self.max_objects) + "\n")
return None
for obj in selection: