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

Draft: Layer, code formating

Browse Source
This commit is contained in:
JeromeL63
2019-12-03 14:56:58 +01:00
committed by Bernd Hahnebach
parent a0e88dfbac
commit 6c8875e58a
1 changed files with 124 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

238
src/Mod/Draft/DraftLayer.py
View File

@@ -1,52 +1,55 @@
# -*- coding: utf-8 -*-
#***************************************************************************
#* *
#* Copyright (c) 2009, 2010 *
#* Yorik van Havre <yorik@uncreated.net>, Ken Cline <cline@frii.com> *
#* *
#* This program is free software; you can redistribute it and/or modify *
#* it under the terms of the GNU Lesser General Public License (LGPL) *
#* as published by the Free Software Foundation; either version 2 of *
#* the License, or (at your option) any later version. *
#* for detail see the LICENCE text file. *
#* *
#* This program is distributed in the hope that it will be useful, *
#* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
#* GNU Library General Public License for more details. *
#* *
#* You should have received a copy of the GNU Library General Public *
#* License along with this program; if not, write to the Free Software *
#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
#* USA *
#* *
#***************************************************************************
# ***************************************************************************
# * *
# * Copyright (c) 2009, 2010 *
# * Yorik van Havre <yorik@uncreated.net>, Ken Cline <cline@frii.com> *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU Lesser General Public License (LGPL) *
# * as published by the Free Software Foundation; either version 2 of *
# * the License, or (at your option) any later version. *
# * for detail see the LICENCE text file. *
# * *
# * This program is distributed in the hope that it will be useful, *
# * but WITHOUT ANY WARRANTY; without even the implied warranty of *
# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
# * GNU Library General Public License for more details. *
# * *
# * You should have received a copy of the GNU Library General Public *
# * License along with this program; if not, write to the Free Software *
# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
# * USA *
# * *
# ***************************************************************************
import FreeCAD
def translate(ctx,txt):
def translate(ctx, txt):
return txt
def QT_TRANSLATE_NOOP(ctx,txt):
def QT_TRANSLATE_NOOP(ctx, txt):
return txt
"""This module contains everything related to Draft Layers"""
def makeLayer(name=None,linecolor=None,drawstyle=None,shapecolor=None,transparency=None):
def makeLayer(name=None, linecolor=None, drawstyle=None, shapecolor=None, transparency=None):
"""makeLayer([name,linecolor,drawstyle,shapecolor,transparency]):
creates a Layer object in the active document
"""
if not FreeCAD.ActiveDocument:
FreeCAD.Console.PrintError(translate("draft","No active document. Aborting")+"\n")
FreeCAD.Console.PrintError(translate("draft", "No active document. Aborting") + "\n")
return
obj = FreeCAD.ActiveDocument.addObject("App::FeaturePython","Layer")
obj = FreeCAD.ActiveDocument.addObject("App::FeaturePython", "Layer")
Layer(obj)
if name:
obj.Label = name
else:
obj.Label = translate("draft","Layer")
obj.Label = translate("draft", "Layer")
if FreeCAD.GuiUp:
ViewProviderLayer(obj.ViewObject)
if linecolor:
@@ -66,8 +69,8 @@ def getLayerContainer():
for obj in FreeCAD.ActiveDocument.Objects:
if obj.Name == "LayerContainer":
return obj
obj = FreeCAD.ActiveDocument.addObject("App::DocumentObjectGroupPython","LayerContainer")
obj.Label = translate("draft","Layers")
obj = FreeCAD.ActiveDocument.addObject("App::DocumentObjectGroupPython", "LayerContainer")
obj.Label = translate("draft", "Layers")
LayerContainer(obj)
if FreeCAD.GuiUp:
ViewProviderLayerContainer(obj.ViewObject)
@@ -78,7 +81,7 @@ class CommandLayer():
"""The Draft_Layer FreeCAD command"""
def GetResources(self):
return {'Pixmap' : 'Draft_Layer',
return {'Pixmap': 'Draft_Layer',
'MenuText': QT_TRANSLATE_NOOP("Draft_Layer", "Layer"),
'ToolTip' : QT_TRANSLATE_NOOP("Draft_Layer", "Adds a layer")}
@@ -95,30 +98,31 @@ class CommandLayer():
class Layer:
"""The Draft Layer object"""
def __init__(self,obj):
def __init__(self, obj):
self.Type = "Layer"
obj.Proxy = self
self.Object = obj
self.setProperties(obj)
def onDocumentRestored(self,obj):
def onDocumentRestored(self, obj):
self.setProperties(obj)
def setProperties(self,obj):
def setProperties(self, obj):
if not "Group" in obj.PropertiesList:
obj.addProperty("App::PropertyLinkList","Group","Layer",QT_TRANSLATE_NOOP("App::Property","The objects that are part of this layer"))
obj.addProperty("App::PropertyLinkList", "Group", "Layer",
QT_TRANSLATE_NOOP("App::Property", "The objects that are part of this layer"))
def __getstate__(self):
return self.Type
def __setstate__(self,state):
def __setstate__(self, state):
if state:
self.Type = state
def execute(self,obj):
def execute(self, obj):
pass
def addObject(self,obj,child):
def addObject(self, obj, child):
g = obj.Group
if not child in g:
g.append(child)
@@ -128,43 +132,43 @@ class Layer:
class ViewProviderLayer:
"""A View Provider for the Layer object"""
def __init__(self,vobj):
def __init__(self, vobj):
vobj.addProperty("App::PropertyBool", "OverrideLineColorChildren", "Layer", QT_TRANSLATE_NOOP("App::Property", "If on, the child objects of this layer will match its visual aspects"))
vobj.addProperty("App::PropertyBool", "OverrideShapeColorChildren", "Layer", QT_TRANSLATE_NOOP("App::Property", "If on, the child objects of this layer will match its visual aspects"))
vobj.addProperty("App::PropertyColor","LineColor","Layer",QT_TRANSLATE_NOOP("App::Property","The line color of the children of this layer"))
vobj.addProperty("App::PropertyColor","ShapeColor","Layer",QT_TRANSLATE_NOOP("App::Property","The shape color of the children of this layer"))
vobj.addProperty("App::PropertyFloat","LineWidth","Layer",QT_TRANSLATE_NOOP("App::Property","The line width of the children of this layer"))
vobj.addProperty("App::PropertyEnumeration","DrawStyle","Layer",QT_TRANSLATE_NOOP("App::Property","The draw style of the children of this layer"))
vobj.addProperty("App::PropertyInteger","Transparency","Layer",QT_TRANSLATE_NOOP("App::Property","The transparency of the children of this layer"))
vobj.DrawStyle = ["Solid","Dashed","Dotted","Dashdot"]
vobj.addProperty("App::PropertyColor", "LineColor", "Layer", QT_TRANSLATE_NOOP("App::Property", "The line color of the children of this layer"))
vobj.addProperty("App::PropertyColor", "ShapeColor", "Layer", QT_TRANSLATE_NOOP("App::Property", "The shape color of the children of this layer"))
vobj.addProperty("App::PropertyFloat", "LineWidth", "Layer", QT_TRANSLATE_NOOP("App::Property", "The line width of the children of this layer"))
vobj.addProperty("App::PropertyEnumeration", "DrawStyle", "Layer", QT_TRANSLATE_NOOP("App::Property", "The draw style of the children of this layer"))
vobj.addProperty("App::PropertyInteger", "Transparency", "Layer", QT_TRANSLATE_NOOP("App::Property", "The transparency of the children of this layer"))
vobj.DrawStyle = ["Solid", "Dashed", "Dotted", "Dashdot"]
vobj.OverrideLineColorChildren = True
vobj.OverrideShapeColorChildren = True
c = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").GetUnsigned("DefaultShapeLineColor",255)
vobj.LineColor = (((c>>24)&0xFF)/255.0,((c>>16)&0xFF)/255.0,((c>>8)&0xFF)/255.0)
w = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").GetInt("DefaultShapeLineWidth",2)
c = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").GetUnsigned("DefaultShapeLineColor", 255)
vobj.LineColor = (((c >> 24) & 0xFF) / 255, ((c >> 16) & 0xFF) / 255, ((c >> 8) & 0xFF) / 255)
w = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").GetInt("DefaultShapeLineWidth", 2)
vobj.LineWidth = w
c = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").GetUnsigned("DefaultShapeColor",4294967295)
vobj.ShapeColor = (((c>>24)&0xFF)/255.0,((c>>16)&0xFF)/255.0,((c>>8)&0xFF)/255.0)
c = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").GetUnsigned("DefaultShapeColor", 4294967295)
vobj.ShapeColor = (((c >> 24) & 0xFF) / 255, ((c >> 16) & 0xFF) / 255, ((c >> 8) & 0xFF) / 255)
vobj.DrawStyle = "Solid"
vobj.Proxy = self
def getIcon(self):
if hasattr(self,"icondata"):
if hasattr(self, "icondata"):
return self.icondata
import Draft_rc
return ":/icons/Draft_Layer.svg"
def attach(self,vobj):
def attach(self, vobj):
self.Object = vobj.Object
from pivy import coin
sep = coin.SoGroup()
vobj.addDisplayMode(sep,"Default")
vobj.addDisplayMode(sep, "Default")
return
def claimChildren(self):
if hasattr(self,"Object") and hasattr(self.Object,"Group"):
if hasattr(self, "Object") and hasattr(self.Object, "Group"):
return self.Object.Group
def getDisplayModes(self, vobj):
@@ -179,78 +183,78 @@ class ViewProviderLayer:
def __getstate__(self):
return None
def __setstate__(self,state):
def __setstate__(self, state):
return None
def updateData(self,obj,prop):
def updateData(self, obj, prop):
if prop == "Group":
self.onChanged(obj.ViewObject,"LineColor")
self.onChanged(obj.ViewObject, "LineColor")
def onChanged(self,vobj,prop):
if hasattr(vobj,"OverrideLineColorChildren") and vobj.OverrideLineColorChildren:
if hasattr(vobj,"Object")and hasattr(vobj.Object,"Group"):
def onChanged(self, vobj, prop):
if hasattr(vobj, "OverrideLineColorChildren") and vobj.OverrideLineColorChildren:
if hasattr(vobj, "Object") and hasattr(vobj.Object, "Group"):
for o in vobj.Object.Group:
if o.ViewObject:
for p in ["LineColor","ShapeColor","LineWidth","DrawStyle","Transparency"]:
for p in ["LineColor", "ShapeColor", "LineWidth", "DrawStyle", "Transparency"]:
if p == "ShapeColor":
if hasattr(vobj, "OverrideShapeColorChildren") and vobj.OverrideShapeColorChildren:
setattr(o.ViewObject, p, getattr(vobj, p))
else:
if hasattr(vobj, p) and hasattr(o.ViewObject,p):
setattr(o.ViewObject,p,getattr(vobj,p))
if hasattr(vobj, p) and hasattr(o.ViewObject, p):
setattr(o.ViewObject, p, getattr(vobj, p))
# give line color to texts
if hasattr(vobj,"LineColor") and hasattr(o.ViewObject,"TextColor"):
if hasattr(vobj, "LineColor") and hasattr(o.ViewObject, "TextColor"):
o.ViewObject.TextColor = vobj.LineColor
if (prop == "Visibility") and hasattr(vobj,"Visibility"):
if hasattr(vobj,"Object")and hasattr(vobj.Object,"Group"):
if (prop == "Visibility") and hasattr(vobj, "Visibility"):
if hasattr(vobj, "Object") and hasattr(vobj.Object, "Group"):
for o in vobj.Object.Group:
if o.ViewObject and hasattr(o.ViewObject,"Visibility"):
if o.ViewObject and hasattr(o.ViewObject, "Visibility"):
o.ViewObject.Visibility = vobj.Visibility
if (prop in ["LineColor","ShapeColor"]) and hasattr(vobj,"LineColor") and hasattr(vobj,"ShapeColor"):
from PySide import QtCore,QtGui
if (prop in ["LineColor", "ShapeColor"]) and hasattr(vobj, "LineColor") and hasattr(vobj, "ShapeColor"):
from PySide import QtCore, QtGui
lc = vobj.LineColor
sc = vobj.ShapeColor
lc = QtGui.QColor(int(lc[0]*255),int(lc[1]*255),int(lc[2]*255))
sc = QtGui.QColor(int(sc[0]*255),int(sc[1]*255),int(sc[2]*255))
p1 = QtCore.QPointF(2,17)
p2 = QtCore.QPointF(13,8)
p3 = QtCore.QPointF(30,15)
p4 = QtCore.QPointF(20,25)
im = QtGui.QImage(32,32,QtGui.QImage.Format_ARGB32)
lc = QtGui.QColor(int(lc[0] * 255), int(lc[1] * 255), int(lc[2] * 255))
sc = QtGui.QColor(int(sc[0] * 255), int(sc[1] * 255), int(sc[2] * 255))
p1 = QtCore.QPointF(2, 17)
p2 = QtCore.QPointF(13, 8)
p3 = QtCore.QPointF(30, 15)
p4 = QtCore.QPointF(20, 25)
im = QtGui.QImage(32, 32, QtGui.QImage.Format_ARGB32)
im.fill(QtCore.Qt.transparent)
pt = QtGui.QPainter(im)
pt.setBrush(QtGui.QBrush(sc, QtCore.Qt.SolidPattern))
pt.drawPolygon([p1,p2,p3,p4])
pt.drawPolygon([p1, p2, p3, p4])
pt.setPen(QtGui.QPen(lc, 2, QtCore.Qt.SolidLine, QtCore.Qt.FlatCap))
pt.drawPolygon([p1,p2,p3,p4])
pt.drawPolygon([p1, p2, p3, p4])
pt.end()
ba = QtCore.QByteArray()
b = QtCore.QBuffer(ba)
b.open(QtCore.QIODevice.WriteOnly)
im.save(b,"XPM")
im.save(b, "XPM")
self.icondata = ba.data().decode("latin1")
vobj.signalChangeIcon()
def canDragObject(self,obj):
def canDragObject(self, obj):
return True
def canDragObjects(self):
return True
def dragObject(self,vobj,otherobj):
if hasattr(vobj.Object,"Group"):
def dragObject(self, vobj, otherobj):
if hasattr(vobj.Object, "Group"):
if otherobj in vobj.Object.Group:
g = vobj.Object.Group
g.remove(otherobj)
vobj.Object.Group = g
FreeCAD.ActiveDocument.recompute()
def canDropObject(self,obj):
def canDropObject(self, obj):
if hasattr(obj,"Proxy") and isinstance(obj.Proxy,Layer): # for now, prevent stacking layers
if hasattr(obj, "Proxy") and isinstance(obj.Proxy, Layer): # for now, prevent stacking layers
return False
return True
@@ -258,17 +262,18 @@ class ViewProviderLayer:
return True
def dropObject(self,vobj,otherobj):
def dropObject(self, vobj, otherobj):
if hasattr(vobj.Object,"Group"):
if hasattr(vobj.Object, "Group"):
if not otherobj in vobj.Object.Group:
if not(hasattr(otherobj,"Proxy") and isinstance(otherobj.Proxy,Layer)): # for now, prevent stacking layers
if not (hasattr(otherobj, "Proxy") and isinstance(otherobj.Proxy,
Layer)): # for now, prevent stacking layers
g = vobj.Object.Group
g.append(otherobj)
vobj.Object.Group = g
# remove from all other layers (not automatic)
for parent in otherobj.InList:
if hasattr(parent,"Proxy") and isinstance(parent.Proxy,Layer):
if hasattr(parent, "Proxy") and isinstance(parent.Proxy, Layer):
if otherobj in parent.Group:
if parent != vobj.Object:
g = parent.Group
@@ -276,27 +281,29 @@ class ViewProviderLayer:
parent.Group = g
FreeCAD.ActiveDocument.recompute()
def setupContextMenu(self,vobj,menu):
def setupContextMenu(self, vobj, menu):
from PySide import QtCore,QtGui
from PySide import QtCore, QtGui
import Draft_rc
action1 = QtGui.QAction(QtGui.QIcon(":/icons/button_right.svg"),translate("draft","Activate this layer"),menu)
action1 = QtGui.QAction(QtGui.QIcon(":/icons/button_right.svg"), translate("draft", "Activate this layer"),
menu)
action1.triggered.connect(self.activate)
menu.addAction(action1)
action2 = QtGui.QAction(QtGui.QIcon(":/icons/Draft_SelectGroup.svg"),translate("draft","Select contents"),menu)
action2 = QtGui.QAction(QtGui.QIcon(":/icons/Draft_SelectGroup.svg"), translate("draft", "Select contents"),
menu)
action2.triggered.connect(self.selectcontents)
menu.addAction(action2)
def activate(self):
if hasattr(self,"Object"):
if hasattr(self, "Object"):
FreeCADGui.Selection.clearSelection()
FreeCADGui.Selection.addSelection(self.Object)
FreeCADGui.runCommand("Draft_AutoGroup")
def selectcontents(self):
if hasattr(self,"Object"):
if hasattr(self, "Object"):
FreeCADGui.Selection.clearSelection()
for o in self.Object.Group:
FreeCADGui.Selection.addSelection(o)
@@ -305,12 +312,12 @@ class ViewProviderLayer:
class LayerContainer:
"""The Layer Container"""
def __init__(self,obj):
def __init__(self, obj):
self.Type = "LayerContainer"
obj.Proxy = self
def execute(self,obj):
def execute(self, obj):
g = obj.Group
g.sort(key=lambda o: o.Label)
@@ -318,10 +325,10 @@ class LayerContainer:
def __getstate__(self):
if hasattr(self,"Type"):
if hasattr(self, "Type"):
return self.Type
def __setstate__(self,state):
def __setstate__(self, state):
if state:
self.Type = state
@@ -330,7 +337,7 @@ class LayerContainer:
class ViewProviderLayerContainer:
"""A View Provider for the Layer Container"""
def __init__(self,vobj):
def __init__(self, vobj):
vobj.Proxy = self
@@ -339,22 +346,22 @@ class ViewProviderLayerContainer:
import Draft_rc
return ":/icons/Draft_Layer.svg"
def attach(self,vobj):
def attach(self, vobj):
self.Object = vobj.Object
def setupContextMenu(self,vobj,menu):
def setupContextMenu(self, vobj, menu):
import Draft_rc
from PySide import QtCore,QtGui
action1 = QtGui.QAction(QtGui.QIcon(":/icons/Draft_Layer.svg"),"Merge duplicates",menu)
from PySide import QtCore, QtGui
action1 = QtGui.QAction(QtGui.QIcon(":/icons/Draft_Layer.svg"), "Merge duplicates", menu)
action1.triggered.connect(self.mergeByName)
menu.addAction(action1)
def mergeByName(self):
if hasattr(self,"Object") and hasattr(self.Object,"Group"):
layers = [o for o in self.Object.Group if (hasattr(o,"Proxy") and isinstance(o.Proxy,Layer))]
if hasattr(self, "Object") and hasattr(self.Object, "Group"):
layers = [o for o in self.Object.Group if (hasattr(o, "Proxy") and isinstance(o.Proxy, Layer))]
todelete = []
for layer in layers:
if layer.Label[-1].isdigit() and layer.Label[-2].isdigit() and layer.Label[-3].isdigit():
@@ -366,28 +373,31 @@ class ViewProviderLayerContainer:
if orig:
for par in layer.InList:
for prop in par.PropertiesList:
if getattr(par,prop) == layer:
FreeCAD.Console.PrintMessage("Changed property '"+prop+"' of object "+par.Label+" from "+layer.Label+" to "+orig.Label+"\n")
setattr(par,prop,orig)
if getattr(par, prop) == layer:
FreeCAD.Console.PrintMessage(
"Changed property '" + prop + "' of object " + par.Label + " from " + layer.Label + " to " + orig.Label + "\n")
setattr(par, prop, orig)
todelete.append(layer)
for tod in todelete:
if not tod.InList:
FreeCAD.Console.PrintMessage("Merging duplicate layer "+tod.Label+"\n")
FreeCAD.Console.PrintMessage("Merging duplicate layer " + tod.Label + "\n")
FreeCAD.ActiveDocument.removeObject(tod.Name)
elif (len(tod.InList) == 1) and (tod.InList[0].isDerivedFrom("App::DocumentObjectGroup")):
FreeCAD.Console.PrintMessage("Merging duplicate layer "+tod.Label+"\n")
FreeCAD.Console.PrintMessage("Merging duplicate layer " + tod.Label + "\n")
FreeCAD.ActiveDocument.removeObject(tod.Name)
else:
FreeCAD.Console.PrintMessage("Unable to delete layer "+tod.Label+": InList not empty\n")
FreeCAD.Console.PrintMessage("Unable to delete layer " + tod.Label + ": InList not empty\n")
def __getstate__(self):
return None
def __setstate__(self,state):
def __setstate__(self, state):
return None
if FreeCAD.GuiUp:
import FreeCADGui
FreeCADGui.addCommand('Draft_Layer',CommandLayer())
FreeCADGui.addCommand('Draft_Layer', CommandLayer())