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

Material: pep8 code formating

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-11-17 22:10:04 +01:00
parent 3c0bbd25e4
commit f6978f419e
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Mod/Material/MaterialEditor.py
View File

@@ -30,7 +30,7 @@ from PySide import QtCore, QtGui, QtSvg
import FreeCAD
import FreeCADGui
import Material_rc
# import Material_rc
# is this still needed after the move to card utils???
if sys.version_info.major >= 3:
@@ -65,9 +65,9 @@ class MaterialEditor:
# restore size and position
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Material")
w = p.GetInt("MaterialEditorWidth",441)
h = p.GetInt("MaterialEditorHeight",626)
self.widget.resize(w,h)
w = p.GetInt("MaterialEditorWidth", 441)
h = p.GetInt("MaterialEditorHeight", 626)
self.widget.resize(w, h)
# additional UI fixes and tweaks
widget = self.widget
@@ -80,7 +80,6 @@ class MaterialEditor:
comboMaterial = widget.ComboMaterial
treeView = widget.treeView
# create preview svg slots
self.widget.PreviewRender = QtSvg.QSvgWidget(":/icons/preview-rendered.svg")
self.widget.PreviewRender.setMaximumWidth(64)
@@ -174,10 +173,10 @@ class MaterialEditor:
itType = QtGui.QStandardItem(tt)
top.appendRow([item, it, itType])
treeView.setExpanded(top.index(),p.GetBool("TreeExpand"+gg,True))
#top.sortChildren(0)
treeView.setExpanded(top.index(), p.GetBool("TreeExpand"+gg, True))
# top.sortChildren(0)
#treeView.expandAll()
# treeView.expandAll()
def updateMatParamsInTree(self, data):
@@ -294,12 +293,12 @@ class MaterialEditor:
"stores the widget size"
# store widths
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Material")
p.SetInt("MaterialEditorWidth",self.widget.width())
p.SetInt("MaterialEditorHeight",self.widget.height())
p.SetInt("MaterialEditorWidth", self.widget.width())
p.SetInt("MaterialEditorHeight", self.widget.height())
root = self.widget.treeView.model().invisibleRootItem()
for gg in range(root.rowCount()):
group = root.child(gg)
p.SetBool("TreeExpand"+group.text(),self.widget.treeView.isExpanded(group.index()))
p.SetBool("TreeExpand"+group.text(), self.widget.treeView.isExpanded(group.index()))
def expandKey(self, key):
"adds spaces before caps in a KeyName"
@@ -456,7 +455,7 @@ class MaterialEditor:
self.widget.PreviewVector.show()
'''
def updatePreviews(self,mat=None):
def updatePreviews(self, mat=None):
"updates the preview images from the content of the editor"
if not mat:
mat = self.getDict()
@@ -479,27 +478,27 @@ class MaterialEditor:
svg = QtCore.QTextStream(fd).readAll()
fd.close()
if diffcol:
svg = svg.replace("#d3d7cf",self.getColorHash(diffcol,val=255))
svg = svg.replace("#555753",self.getColorHash(diffcol,val=125))
svg = svg.replace("#d3d7cf", self.getColorHash(diffcol, val=255))
svg = svg.replace("#555753", self.getColorHash(diffcol, val=125))
if highlightcol:
svg = svg.replace("#fffffe",self.getColorHash(highlightcol,val=255))
self.widget.PreviewRender.load(QtCore.QByteArray(bytes(svg,encoding="utf8")))
svg = svg.replace("#fffffe", self.getColorHash(highlightcol, val=255))
self.widget.PreviewRender.load(QtCore.QByteArray(bytes(svg, encoding="utf8")))
if diffcol or sectioncol:
fd = QtCore.QFile(":/icons/preview-vector.svg")
if fd.open(QtCore.QIODevice.ReadOnly | QtCore.QIODevice.Text):
svg = QtCore.QTextStream(fd).readAll()
fd.close()
if diffcol:
svg = svg.replace("#d3d7cf",self.getColorHash(diffcol,val=255))
svg = svg.replace("#555753",self.getColorHash(diffcol,val=125))
svg = svg.replace("#d3d7cf", self.getColorHash(diffcol, val=255))
svg = svg.replace("#555753", self.getColorHash(diffcol, val=125))
if sectioncol:
svg = svg.replace("#ffffff",self.getColorHash(sectioncol,val=255))
self.widget.PreviewVector.load(QtCore.QByteArray(bytes(svg,encoding="utf8")))
svg = svg.replace("#ffffff", self.getColorHash(sectioncol, val=255))
self.widget.PreviewVector.load(QtCore.QByteArray(bytes(svg, encoding="utf8")))
def getColorHash(self,col,val=255):
def getColorHash(self, col, val=255):
"returns a '#000000' string from a '(0.1,0.2,0.3)' string"
col = [float(x.strip()) for x in col.strip("()").split(",")]
color = QtGui.QColor(int(col[0]*val),int(col[1]*val),int(col[2]*val))
color = QtGui.QColor(int(col[0]*val), int(col[1]*val), int(col[2]*val))
return color.name()
def openfile(self):

20
src/Mod/Material/materialtools/cardutils.py
View File

@@ -100,11 +100,11 @@ def get_material_resources(category='Solid'):
if os.path.exists(custom_mat_dir):
resources[custom_mat_dir] = ":/icons/user.svg"
# fail silently
#else:
# FreeCAD.Console.PrintError(
# 'Custom material directory set by user: {} does not exist.\n'
# .format(custom_mat_dir)
# )
# else:
# FreeCAD.Console.PrintError(
# 'Custom material directory set by user: {} does not exist.\n'
# .format(custom_mat_dir)
# )
return resources
@@ -149,7 +149,7 @@ def add_cards_from_a_dir(materials, cards, icons, mat_dir, icon, template=False)
for a_path in dir_path_list:
try:
mat_dict = read(a_path)
except:
except Exception:
FreeCAD.Console.PrintError(
'Error on reading card data. The card data will be empty for card:\n{}\n'
.format(a_path)
@@ -483,7 +483,7 @@ def check_value_unit(param, value):
'{} Unit {} is known by FreeCAD, but wrong for parameter {}.\n'
.format(some_text, unitproblem, param)
)
except:
except Exception:
FreeCAD.Console.PrintError(
'{} Not known problem.\n'
.format(some_text)
@@ -494,7 +494,7 @@ def check_value_unit(param, value):
'{} Unit {} is not known by FreeCAD.\n'
.format(some_text, unitproblem)
)
except:
except Exception:
FreeCAD.Console.PrintError(
'{} Not known problem.\n'
.format(some_text)
@@ -584,7 +584,7 @@ def output_value_unit_info(param, value):
'{} Unit {} is known by FreeCAD, but wrong for parameter {}.\n'
.format(some_text, unitproblem, param)
)
except:
except Exception:
FreeCAD.Console.PrintError(
'{} Not known problem.\n'
.format(some_text)
@@ -597,7 +597,7 @@ def output_value_unit_info(param, value):
.format(some_text, unitproblem)
)
except:
except Exception:
FreeCAD.Console.PrintError(
'{} Not known problem.\n'
.format(some_text)