From 330a5098b5cedd593f3054350afd30a32ddd7256 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Thu, 1 Oct 2020 10:30:26 -0500 Subject: [PATCH] Arch: consider DraftText objects in the section plane for compatibility After the reorganization of the Draft Workbench, the `'DraftText'` objects are now of Proxy.Type `'Text'`. In the `DraftAnnotation` class the `__setstate__` method was defined to automatically migrate the Type. The `Arch SectionPlane` only handles `'Text'` objects. If for some reason there is still an old `'DraftText'` object which has not been migrated to the new Type, it won't be found. This is corrected by adding `'DraftText'` to the list of objects to process. --- src/Mod/Arch/ArchSectionPlane.py | 2 +- src/Mod/Draft/draftobjects/draft_annotation.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/Arch/ArchSectionPlane.py b/src/Mod/Arch/ArchSectionPlane.py index 684a456dc9..a75999cf1b 100644 --- a/src/Mod/Arch/ArchSectionPlane.py +++ b/src/Mod/Arch/ArchSectionPlane.py @@ -368,7 +368,7 @@ def getSVG(source, for o in objs: if Draft.getType(o) == "Space": spaces.append(o) - elif Draft.getType(o) in ["AngularDimension","LinearDimension","Annotation","Label","Text"]: + elif Draft.getType(o) in ["AngularDimension","LinearDimension","Annotation","Label","Text", "DraftText"]: if isOriented(o,cutplane): drafts.append(o) elif o.isDerivedFrom("Part::Part2DObject"): diff --git a/src/Mod/Draft/draftobjects/draft_annotation.py b/src/Mod/Draft/draftobjects/draft_annotation.py index c7c3d43d76..1eec289ea5 100644 --- a/src/Mod/Draft/draftobjects/draft_annotation.py +++ b/src/Mod/Draft/draftobjects/draft_annotation.py @@ -131,13 +131,13 @@ class DraftAnnotation(object): # the 'DraftText' type was changed to 'Text' type if state["Type"] == "DraftText": state["Type"] = "Text" - _info = "migrate 'DraftText' type to 'Text'" + _info = "migrated 'DraftText' type to 'Text'" _wrn("v0.19, " + _tr(_info)) self.Type = state["Type"] else: if state == "DraftText": state = "Text" - _info = "migrate 'DraftText' type to 'Text'" + _info = "migrated 'DraftText' type to 'Text'" _wrn("v0.19, " + _tr(_info)) self.Type = state