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

Merge pull request #13633 from Roy-043/Draft-revert-Draft-WB-changes-from-13294

Browse Source 
Draft: revert Draft WB changes from #13294
This commit is contained in:
Roy-043
2024-04-26 10:46:05 +02:00
committed by GitHub
parent 5753fe12c4 7407eee427
commit d92f74ef01
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Draft/draftfunctions/upgrade.py
View File

@@ -227,7 +227,7 @@ def upgrade(objects, delete=False, force=None):
# of downgrade, nor do they have the same hashCode().
# Nevertheless, they still keep reference to their original
# colors, capture that in facecolors.
# Also, cannot use ShapeAppearance here, we need a whole array
# Also, cannot use ShapeColor here, we need a whole array
# matching the colors of the array of faces per object,
# only DiffuseColor has that
facecolors[0].extend(obj.ViewObject.DiffuseColor)

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

@@ -474,7 +474,7 @@ def format_object(target, origin=None):
If construction mode is active target is then placed in the construction
group and the `constr` color is applied to its applicable color properties:
TextColor, PointColor, LineColor, and ShapeAppearance.
TextColor, PointColor, LineColor, and ShapeColor.
Parameters
----------

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

@@ -88,14 +88,14 @@ def get_default_shape_style():
display_mode_index = params.get_param("DefaultDisplayMode")
draw_style_index = params.get_param("DefaultDrawStyle")
return {
"DisplayMode": ("index", display_mode_index, DISPLAY_MODES[display_mode_index]),
"DrawStyle": ("index", draw_style_index, DRAW_STYLES[draw_style_index]),
"LineColor": ("color", params.get_param_view("DefaultShapeLineColor")),
"LineWidth": ("int", params.get_param_view("DefaultShapeLineWidth")),
"PointColor": ("color", params.get_param_view("DefaultShapeVertexColor")),
"PointSize": ("int", params.get_param_view("DefaultShapePointSize")),
"ShapeColor": ("color", params.get_param_view("DefaultShapeColor")),
"Transparency": ("int", params.get_param_view("DefaultShapeTransparency"))
"DisplayMode": ("index", display_mode_index, DISPLAY_MODES[display_mode_index]),
"DrawStyle": ("index", draw_style_index, DRAW_STYLES[draw_style_index]),
"LineColor": ("color", params.get_param_view("DefaultShapeLineColor")),
"LineWidth": ("int", params.get_param_view("DefaultShapeLineWidth")),
"PointColor": ("color", params.get_param_view("DefaultShapeVertexColor")),
"PointSize": ("int", params.get_param_view("DefaultShapePointSize")),
"ShapeColor": ("color", params.get_param_view("DefaultShapeColor")),
"Transparency": ("int", params.get_param_view("DefaultShapeTransparency"))
}

6
src/Mod/Draft/draftviewproviders/view_layer.py
View File

@@ -70,16 +70,16 @@ class ViewProviderLayer:
_tip)
vobj.OverrideLineColorChildren = True
if "OverrideShapeAppearanceChildren" not in properties:
if "OverrideShapeColorChildren" not in properties:
_tip = QT_TRANSLATE_NOOP("App::Property",
"If it is true, the objects contained "
"within this layer will adopt "
"the shape color of the layer")
vobj.addProperty("App::PropertyBool",
"OverrideShapeAppearanceChildren",
"OverrideShapeColorChildren",
"Layer",
_tip)
vobj.OverrideShapeAppearanceChildren = True
vobj.OverrideShapeColorChildren = True
if "UsePrintColor" not in properties:
_tip = QT_TRANSLATE_NOOP("App::Property",