kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: make move, rotate and scale commands link-aware (#18795)

Browse Source 
* Draft: make move, rotate and scale commands link-aware

Fixes #12836.
Fixes #15681.

These changes are presented as a single ('big') PR because the mentioned commands have several similarities. Working on them seperately would have made less sense.

The commands have been made 'link-aware' meaning they can now handle Links and objects in linked containers.

This required several changes in the following main files. For each command all options are handled by a single function now (the `move`, `rotate` and `scale` functions). This was the only reasonable solution to correctly handle nested placements. As a result there is no longer a need to build very complex 'cmd' strings in the gui_*.py files (which is a good thing IMO).

Main files:

* move.py
* rotate.py
* scale.py
* gui_move.py
* gui_rotate.py
* gui_scale.py
* gui_trackers.py

The following files have also been updated:

* Draft.py: Imports updated.
* DraftGui.py: If `CopyMode` is changed the ghosts have to be updated. The move and rotate commands now also show previews of movable children. But since those are not copied they should be removed from the ghosts if `CopyMode` is changed to `True`.
* utils.py: Some helper functions have been added. An existing helper function (only used internally) has been renamed.
* gui_utils.py: The `select` function has been updated to accept a list of tuples to allow the reselection of nested objects.
* clone.py: A new property `ForceCompound`, necessary for non-uniform scaling, has been added.
* join.py: The `join_wires` function now returns the resultant wire objects.
* task_scale.py: Updated to allow negative scale factors. Support for `SubelementMode` preference added.
* dimension.py: `transform` methods added.
* layer.py: `get_layer` function added.
* svg.py: Updated to use `get_layer`.
* view_text.py: Instead of two added `coin.SoTransform()` nodes the main transform node is used instead. This was done so that ghosts of Draft Texts can be handled properly without requiring dedicated code in gui_trackers.py.

Notes:

* Support for "App::Annotation" is limited. Only their `Position` is handled (by the move and rotate commands).
* Support for "Image::ImagePlane" has been removed from the scale command. The object has its own calibrate feature (see https://wiki.freecad.org/Std_Import).
* Copies and clones are always created in the global space.

* Fix several unit test issues.

* Reset value that was changed while testing

* Rebase and update test_modification.py

* Reintroduce scaling of image planes
This commit is contained in:
Roy-043
2025-01-20 18:23:36 +01:00
committed by GitHub
parent 8d46ba6414
commit d587e6a91a
19 changed files with 1042 additions and 973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Mod/Draft/draftutils/gui_utils.py
View File

@@ -675,10 +675,12 @@ def select(objs=None, gui=App.GuiUp):
Parameters
----------
objs: list of App::DocumentObject, optional
objs: list of App::DocumentObjects or tuples, or a single object or tuple, optional
It defaults to `None`.
Any type of scripted object.
It may be a list of objects or a single object.
Format for tuples:
`(doc.Name or "", sel.Object.Name, sel.SubElementName or "")`
For example (Box nested in Part):
`("", "Part", "Box.Edge1")`
gui: bool, optional
It defaults to the value of `App.GuiUp`, which is `True`
@@ -689,12 +691,21 @@ def select(objs=None, gui=App.GuiUp):
"""
if gui:
Gui.Selection.clearSelection()
if objs:
if objs is not None:
if not isinstance(objs, list):
objs = [objs]
for obj in objs:
if obj:
Gui.Selection.addSelection(obj)
if not obj:
continue
if isinstance(obj, tuple):
Gui.Selection.addSelection(*obj)
continue
try:
if not obj.isAttachedToDocument():
continue
except:
continue
Gui.Selection.addSelection(obj)
def load_texture(filename, size=None, gui=App.GuiUp):

120
src/Mod/Draft/draftutils/utils.py
View File

@@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
# ***************************************************************************
# * (c) 2009, 2010 *
# * Yorik van Havre <yorik@uncreated.net>, Ken Cline <cline@frii.com> *
# * (c) 2019 Eliud Cabrera Castillo <e.cabrera-castillo@tum.de> *
# * Copyright (c) 2009, 2010 Yorik van Havre <yorik@uncreated.net> *
# * Copyright (c) 2009, 2010 Ken Cline <cline@frii.com> *
# * Copyright (c) 2019 Eliud Cabrera Castillo <e.cabrera-castillo@tum.de> *
# * Copyright (c) 2024 The FreeCAD Project Association *
# * *
# * This file is part of the FreeCAD CAx development system. *
# * *
@@ -40,7 +41,7 @@ import PySide.QtCore as QtCore
import FreeCAD as App
from draftutils import params
from draftutils.messages import _wrn, _err, _log
from draftutils.messages import _wrn, _err, _log
from draftutils.translate import translate
# TODO: move the functions that require the graphical interface
@@ -174,7 +175,7 @@ def type_check(args_and_types, name="?"):
for v, t in args_and_types:
if not isinstance(v, t):
w = "typecheck[{}]: '{}' is not {}".format(name, v, t)
_wrn(w)
_err(w)
raise TypeError("Draft." + str(name))
@@ -884,26 +885,105 @@ def get_rgba_tuple(color, typ=1.0):
return color
def filter_objects_for_modifiers(objects, isCopied=False):
filteredObjects = []
for obj in objects:
if hasattr(obj, "MoveBase") and obj.MoveBase and obj.Base:
def _modifiers_process_subselection(sels, copy):
data_list = []
sel_info = []
for sel in sels:
for sub in sel.SubElementNames if sel.SubElementNames else [""]:
if not ("Vertex" in sub or "Edge" in sub):
continue
if copy and "Vertex" in sub:
continue
obj = sel.Object.getSubObject(sub, 1)
pla = sel.Object.getSubObject(sub, 3)
if "Vertex" in sub:
vert_idx = int(sub.rpartition("Vertex")[2]) - 1
edge_idx = -1
else:
vert_idx = -1
edge_idx = int(sub.rpartition("Edge")[2]) - 1
data_list.append((obj, vert_idx, edge_idx, pla))
sel_info.append(("", sel.Object.Name, sub))
return data_list, sel_info
def _modifiers_process_selection(sels, copy, scale=False, add_movable_children=False):
# Only when creating ghosts and if copy is False, should add_movable_children be True.
objects = []
places = []
sel_info = []
for sel in sels:
for sub in sel.SubElementNames if sel.SubElementNames else [""]:
obj = sel.Object.getSubObject(sub, 1)
# Get the global placement of the parent:
if obj == sel.Object:
pla = App.Placement()
else:
pla = sel.Object.getSubObject(sub.rpartition(obj.Name)[0], 3)
objs = _modifiers_get_group_contents(obj)
if add_movable_children:
children = []
for obj in objs:
children.extend(_modifiers_get_movable_children(obj))
objs.extend(children)
objs = _modifiers_filter_objects(objs, copy, scale)
objects.extend(objs)
places.extend(len(objs) * [pla])
if "." in sub:
sub = sub.rpartition(".")[0] + "."
elif "Face" in sub or "Edge" in sub or "Vertex" in sub:
sub = ""
sel_info.append(("", sel.Object.Name, sub))
return objects, places, sel_info
def _modifiers_get_group_contents(obj):
from draftutils import groups
return groups.get_group_contents(obj, addgroups=True, spaces=True, noarchchild=True)
def _modifiers_get_movable_children(obj):
result = []
if hasattr(obj, "Proxy") and hasattr(obj.Proxy, "getMovableChildren"):
children = obj.Proxy.getMovableChildren(obj)
result.extend(children)
for child in children:
result.extend(_modifiers_get_movable_children(child))
return result
def _modifiers_filter_objects(objs, copy, scale=False):
def is_scalable(obj):
if hasattr(obj, "Placement") and hasattr(obj, "Shape"):
return True
if obj.isDerivedFrom("App::DocumentObjectGroup"):
return True
if obj.isDerivedFrom("App::Annotation"):
return True
if obj.isDerivedFrom("Image::ImagePlane"):
return True
return False
result = []
for obj in objs:
if not copy and hasattr(obj, "MoveBase") and obj.MoveBase and obj.Base:
parents = []
for parent in obj.Base.InList:
if parent.isDerivedFrom("Part::Feature"):
parents.append(parent.Name)
if len(parents) > 1:
warningMessage = translate("draft", "%s shares a base with %d other objects. Please check if you want to modify this.") % (obj.Name,len(parents) - 1)
App.Console.PrintError(warningMessage)
if App.GuiUp:
Gui.getMainWindow().showMessage(warningMessage, 0)
filteredObjects.append(obj.Base)
elif hasattr(obj,"Placement") and obj.getEditorMode("Placement") == ["ReadOnly"] and not isCopied:
App.Console.PrintError(translate("draft", "%s cannot be modified because its placement is readonly.") % obj.Name)
continue
else:
filteredObjects.append(obj)
return filteredObjects
message = translate("draft", "%s shares a base with %d other objects. Please check if you want to modify this.") % (obj.Name,len(parents) - 1)
_err(message)
if not scale or utils.get_type(obj.Base) == "Wire":
result.append(obj.Base)
elif not copy \
and hasattr(obj, "Placement") \
and "ReadOnly" in obj.getEditorMode("Placement"):
_err(translate("draft", "%s cannot be modified because its placement is readonly") % obj.Name)
elif not scale or is_scalable(obj):
result.append(obj)
return result
def is_closed_edge(edge_index, object):