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

Draft: Now uses general FreeCAD shape colors instead of defining its own

Browse Source
This commit is contained in:
Yorik van Havre
2019-06-03 17:47:39 -03:00
parent 25c1007676
commit b9bcffda03
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Mod/Draft/Draft.py
View File

@@ -139,6 +139,8 @@ def getParam(param,default=None):
elif t == "unsigned":
if default == None:
default = 0
if param == "color":
return FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").GetUnsigned("DefaultShapeLineColor",default)
return p.GetUnsigned(param,default)
else:
return None
@@ -147,11 +149,19 @@ def setParam(param,value):
"setParam(parameterName,value): sets a Draft parameter with the given value"
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")
t = getParamType(param)
if t == "int": p.SetInt(param,value)
elif t == "string": p.SetString(param,value)
elif t == "float": p.SetFloat(param,value)
elif t == "bool": p.SetBool(param,value)
elif t == "unsigned": p.SetUnsigned(param,value)
if t == "int":
p.SetInt(param,value)
elif t == "string":
p.SetString(param,value)
elif t == "float":
p.SetFloat(param,value)
elif t == "bool":
p.SetBool(param,value)
elif t == "unsigned":
if param == "color":
FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").SetUnsigned("DefaultShapeLineColor",value)
else:
p.SetUnsigned(param,value)
def precision():
"precision(): returns the precision value from Draft user settings"
@@ -5754,13 +5764,13 @@ class _PathArray(_DraftObject):
shape.Placement.Rotation, pathwire, count, xlate, align)
base = []
for placement in placements:
ns = shape.copy()
ns.Placement = placement
base.append(ns)
return (Part.makeCompound(base))
class _PointArray(_DraftObject):

4
src/Mod/Draft/DraftGui.py
View File

@@ -345,7 +345,7 @@ class DraftToolBar:
#print("taskmode: ",str(self.taskmode))
self.paramcolor = Draft.getParam("color",255)>>8
self.color = QtGui.QColor(self.paramcolor)
self.facecolor = QtGui.QColor(204,204,204)
self.facecolor = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").GetUnsigned("DefaultShapeColor",4294967295)>>8
self.linewidth = Draft.getParam("linewidth",2)
self.fontsize = Draft.getParam("textheight",0.20)
self.paramconstr = Draft.getParam("constructioncolor",746455039)>>8
@@ -1469,6 +1469,8 @@ class DraftToolBar:
return
self.facecolorPix.fill(self.facecolor)
self.facecolorButton.setIcon(QtGui.QIcon(self.facecolorPix))
if Draft.getParam("saveonexit",False):
FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").SetUnsigned("DefaultShapeColor",self.facecolor.rgb()<<8)
r = float(self.facecolor.red()/255.0)
g = float(self.facecolor.green()/255.0)
b = float(self.facecolor.blue()/255.0)