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

Draft: minor refactor of layer code (#13948)

Browse Source
This commit is contained in:
Roy-043
2024-05-12 09:49:04 +02:00
committed by GitHub
parent 10a25ebf98
commit ec44573bdc
2 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Mod/Draft/draftguitools/gui_layers.py
View File

@@ -173,14 +173,15 @@ class LayerManager:
changed = True
obj = Draft.make_layer(name=None, line_color=None, shape_color=None,
line_width=None, draw_style=None, transparency=None)
vobj = obj.ViewObject
# visibility
checked = True if self.model.item(row,0).checkState() == QtCore.Qt.Checked else False
if checked != obj.ViewObject.Visibility:
if checked != vobj.Visibility:
if not changed:
FreeCAD.ActiveDocument.openTransaction("Layers change")
changed = True
obj.ViewObject.Visibility = checked
vobj.Visibility = checked
# label
label = self.model.item(row,1).text()
@@ -194,60 +195,60 @@ class LayerManager:
# line width
width = self.model.item(row,2).data(QtCore.Qt.DisplayRole)
if width:
if obj.ViewObject.LineWidth != width:
if vobj.LineWidth != width:
if not changed:
FreeCAD.ActiveDocument.openTransaction("Layers change")
changed = True
obj.ViewObject.LineWidth = width
vobj.LineWidth = width
# draw style
style = self.model.item(row,3).text()
if style:
if obj.ViewObject.DrawStyle != style:
if vobj.DrawStyle != style:
if not changed:
FreeCAD.ActiveDocument.openTransaction("Layers change")
changed = True
obj.ViewObject.DrawStyle = style
vobj.DrawStyle = style
# line color
color = self.model.item(row,4).data(QtCore.Qt.UserRole)
if color:
if obj.ViewObject.LineColor[3:] != color:
if vobj.LineColor[:3] != color:
if not changed:
FreeCAD.ActiveDocument.openTransaction("Layers change")
changed = True
obj.ViewObject.LineColor = color
vobj.LineColor = color
# shape color
color = self.model.item(row,5).data(QtCore.Qt.UserRole)
if color:
if obj.ViewObject.ShapeColor[3:] != color:
if vobj.ShapeColor[:3] != color:
if not changed:
FreeCAD.ActiveDocument.openTransaction("Layers change")
changed = True
obj.ViewObject.ShapeColor = color
vobj.ShapeColor = color
# transparency
transparency = self.model.item(row,6).data(QtCore.Qt.DisplayRole)
if transparency:
if obj.ViewObject.Transparency != transparency:
if vobj.Transparency != transparency:
if not changed:
FreeCAD.ActiveDocument.openTransaction("Layers change")
changed = True
obj.ViewObject.Transparency = transparency
vobj.Transparency = transparency
# line print color
color = self.model.item(row,7).data(QtCore.Qt.UserRole)
if color:
if not "LinePrintColor" in obj.ViewObject.PropertiesList:
if hasattr(obj.ViewObject.Proxy,"set_properties"):
obj.ViewObject.Proxy.set_properties(obj.ViewObject)
if "LinePrintColor" in obj.ViewObject.PropertiesList:
if obj.ViewObject.LinePrintColor[3:] != color:
if not "LinePrintColor" in vobj.PropertiesList:
if hasattr(vobj.Proxy,"set_properties"):
vobj.Proxy.set_properties(vobj)
if "LinePrintColor" in vobj.PropertiesList:
if vobj.LinePrintColor[:3] != color:
if not changed:
FreeCAD.ActiveDocument.openTransaction("Layers change")
changed = True
obj.ViewObject.LinePrintColor = color
vobj.LinePrintColor = color
# recompute
if changed:
@@ -329,16 +330,17 @@ class LayerManager:
# populate with object data
if obj:
onItem.setCheckState(QtCore.Qt.Checked if obj.ViewObject.Visibility else QtCore.Qt.Unchecked)
vobj = obj.ViewObject
onItem.setCheckState(QtCore.Qt.Checked if vobj.Visibility else QtCore.Qt.Unchecked)
nameItem.setText(obj.Label)
nameItem.setToolTip(obj.Name)
widthItem.setData(obj.ViewObject.LineWidth,QtCore.Qt.DisplayRole)
styleItem.setText(obj.ViewObject.DrawStyle)
lineColorItem.setData(obj.ViewObject.LineColor[:3],QtCore.Qt.UserRole)
shapeColorItem.setData(obj.ViewObject.ShapeColor[:3],QtCore.Qt.UserRole)
transparencyItem.setData(obj.ViewObject.Transparency,QtCore.Qt.DisplayRole)
if hasattr(obj.ViewObject,"LinePrintColor"):
linePrintColorItem.setData(obj.ViewObject.LinePrintColor[:3],QtCore.Qt.UserRole)
widthItem.setData(vobj.LineWidth,QtCore.Qt.DisplayRole)
styleItem.setText(vobj.DrawStyle)
lineColorItem.setData(vobj.LineColor[:3],QtCore.Qt.UserRole)
shapeColorItem.setData(vobj.ShapeColor[:3],QtCore.Qt.UserRole)
transparencyItem.setData(vobj.Transparency,QtCore.Qt.DisplayRole)
if hasattr(vobj,"LinePrintColor"):
linePrintColorItem.setData(vobj.LinePrintColor[:3],QtCore.Qt.UserRole)
lineColorItem.setIcon(getColorIcon(lineColorItem.data(QtCore.Qt.UserRole)))
shapeColorItem.setIcon(getColorIcon(shapeColorItem.data(QtCore.Qt.UserRole)))
linePrintColorItem.setIcon(getColorIcon(linePrintColorItem.data(QtCore.Qt.UserRole)))

35
src/Mod/Draft/draftmake/make_layer.py
View File

@@ -58,16 +58,16 @@ def get_layer_container():
if obj.Name == "LayerContainer":
return obj
new_obj = doc.addObject("App::DocumentObjectGroupPython",
obj = doc.addObject("App::DocumentObjectGroupPython",
"LayerContainer")
new_obj.Label = translate("draft", "Layers")
obj.Label = translate("draft", "Layers")
LayerContainer(new_obj)
LayerContainer(obj)
if App.GuiUp:
ViewProviderLayerContainer(new_obj.ViewObject)
ViewProviderLayerContainer(obj.ViewObject)
return new_obj
return obj
def getLayerContainer():
@@ -79,7 +79,7 @@ def getLayerContainer():
def make_layer(name=None,
line_color=(0.0, 0.0, 0.0), # does not match default DefaultShapeLineColor
shape_color=(0.8, 0.8, 0.8), # matches default DefaultShapeColor
shape_color=(0.8, 0.8, 0.8), # does not match default DefaultShapeColor
line_width=2.0,
draw_style="Solid",
transparency=0):
@@ -201,27 +201,28 @@ def make_layer(name=None,
_err(translate("draft","Wrong input: must be a number between 0 and 100."))
return None
new_obj = doc.addObject("App::FeaturePython", "Layer")
Layer(new_obj)
obj = doc.addObject("App::FeaturePython", "Layer")
Layer(obj)
new_obj.Label = name
obj.Label = name
if App.GuiUp:
ViewProviderLayer(new_obj.ViewObject)
vobj = obj.ViewObject
ViewProviderLayer(vobj)
if line_color is not None:
new_obj.ViewObject.LineColor = line_color
vobj.LineColor = line_color
if shape_color is not None:
new_obj.ViewObject.ShapeColor = shape_color
vobj.ShapeColor = shape_color
if line_width is not None:
new_obj.ViewObject.LineWidth = line_width
vobj.LineWidth = line_width
if draw_style is not None:
new_obj.ViewObject.DrawStyle = draw_style
vobj.DrawStyle = draw_style
if transparency is not None:
new_obj.ViewObject.Transparency = transparency
vobj.Transparency = transparency
container = get_layer_container()
container.addObject(new_obj)
container.addObject(obj)
return new_obj
return obj
## @}