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

Material: editor, code formating, line length, prints, add some comments

Browse Source
This commit is contained in:
Bernd Hahnebach
2019-04-23 09:13:04 +02:00
parent 4cb913d12c
commit ac71d82dd4
1 changed files with 64 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,23 +20,21 @@
# * *
# ***************************************************************************
from __future__ import print_function
import FreeCAD
import FreeCADGui
from Material import getMaterialAttributeStructure
import os
from PySide import QtCore, QtGui
# from PySide import QtUiTools, QtSvg
import sys
if sys.version_info.major >= 3:
unicode = str
__title__ = "FreeCAD material editor"
__author__ = "Yorik van Havre"
__url__ = "http://www.freecadweb.org"
import os
import sys
from PySide import QtCore, QtGui
# from PySide import QtUiTools, QtSvg
import FreeCAD
import FreeCADGui
if sys.version_info.major >= 3:
unicode = str
class MaterialEditor:
@@ -78,7 +76,8 @@ class MaterialEditor:
standardButtons.button(QtGui.QDialogButtonBox.Ok).setAutoDefault(False)
standardButtons.button(QtGui.QDialogButtonBox.Cancel).setAutoDefault(False)
self.updateCards()
# TODO allow to enter a custom property by pressing Enter in the lineedit (currently closes the dialog)
# TODO allow to enter a custom property by pressing Enter in the lineedit
# currently closes the dialog
standardButtons.rejected.connect(self.reject)
standardButtons.accepted.connect(self.accept)
@@ -119,6 +118,7 @@ class MaterialEditor:
treeView.setColumnWidth(1, 250)
treeView.setColumnHidden(2, True)
from Material import getMaterialAttributeStructure
tree = getMaterialAttributeStructure(True)
MatPropDict = tree.getroot()
@@ -149,9 +149,12 @@ class MaterialEditor:
def updateContents(self, data):
'''updates the contents of the editor with the given data, can be:
- the name of a card, if material is changed in editors combo box
- a dictionary, if the editor was called with data.'''
- a dictionary, if the editor was called with data
- a string, the name of a card, if material is changed in editors combo box
the material property keys where added to the editor already
not known material property keys will be added to the user defined group'''
# print type(data)
if isinstance(data, dict):
# a standard material property dict is provided
model = self.widget.treeView.model()
@@ -182,7 +185,8 @@ class MaterialEditor:
self.customprops.append(k)
elif isinstance(data, unicode):
# a card name is provided, search card, read material data and call this def once more with std material property dict
# a card name is provided, search card, read material data and call
# this def once more with std material property dict
k = str(data)
if k:
if k in self.cards:
@@ -225,7 +229,9 @@ class MaterialEditor:
print('\n')
def updateCards(self):
"updates the contents of the materials combo with existing material cards"
'''updates the contents of the materials combo with existing material cards'''
self.getMaterialResources()
self.cards = {}
for p in self.resources:
@@ -239,10 +245,11 @@ class MaterialEditor:
self.widget.ComboMaterial.clear()
self.widget.ComboMaterial.addItem("") # add a blank item first
for card in sorted(self.cards.keys()):
self.widget.ComboMaterial.addItem(card)
self.widget.ComboMaterial.addItem(card) # all keys in self.cards are unicode
def openProductURL(self):
"opens the contents of the ProductURL field in an external browser."
'''opens the contents of the ProductURL field in an external browser.'''
model = self.widget.treeView.model()
item = model.findItems(translate("Material", "Product URL"),
@@ -383,7 +390,8 @@ class MaterialEditor:
kk = group.child(row, 0).text()
ii = group.child(row, 1).text()
# TODO the following should be translated back to english,since text(0) could be translated
# TODO the following should be translated back to english
# since text(0) could be translated
matkey = self.collapseKey(str(kk))
matvalue = unicode(ii)
if matvalue or (matkey == 'Name'):
@@ -395,9 +403,10 @@ class MaterialEditor:
def outputDict(self, d):
print('MaterialEditor dictionary')
for param in d:
print(' ' + param + ' : ' + d[param])
print(' {} : {}'.format(param, d[param]))
'''def setTexture(self, pattern):
'''
def setTexture(self, pattern):
"displays a texture preview if needed"
self.widget.PreviewVector.hide()
if pattern:
@@ -409,12 +418,19 @@ class MaterialEditor:
pattern = DrawingPatterns.buildFileSwatch(pattern, size=96, png=True)
if pattern:
self.widget.PreviewVector.setPixmap(QtGui.QPixmap(pattern))
self.widget.PreviewVector.show()'''
self.widget.PreviewVector.show()
'''
def openfile(self):
"Opens a FCMat file"
filetuple = QtGui.QFileDialog.getOpenFileName(QtGui.QApplication.activeWindow(), 'Open FreeCAD Material file', self.directory, '*.FCMat')
filename = filetuple[0] # a tuple of two empty strings returns True, so use the filename directly
filetuple = QtGui.QFileDialog.getOpenFileName(
QtGui.QApplication.activeWindow(),
'Open FreeCAD Material file',
self.directory,
'*.FCMat'
)
# a tuple of two empty strings returns True, so use the filename directly
filename = filetuple[0]
if filename:
from importFCMat import read
self.directory = os.path.dirname(filename)
@@ -436,11 +452,14 @@ class MaterialEditor:
name = name.encode("utf8")
if not name:
name = "Material"
filetuple =\
QtGui.QFileDialog.getSaveFileName(QtGui.QApplication.activeWindow(),
'Save FreeCAD Material file',
self.directory + '/' + name + '.FCMat', '*.FCMat')
filename = filetuple[0] # a tuple of two empty strings returns True, so use the filename directly
filetuple = QtGui.QFileDialog.getSaveFileName(
QtGui.QApplication.activeWindow(),
'Save FreeCAD Material file',
self.directory + '/' + name + '.FCMat',
'*.FCMat'
)
# a tuple of two empty strings returns True, so use the filename directly
filename = filetuple[0]
if filename:
self.directory = os.path.dirname(filename)
d = self.getDict()
@@ -567,7 +586,7 @@ def matProperWidget(parent=None, matproperty=None, Type="String", Value=None,
quantity = FreeCAD.Units.Quantity(1, unit)
widget.setProperty('unit', quantity.getUserPreferred()[2])
else:
FreeCAD.Console.PrintError('Not known unit for property: ' + matproperty + '\n')
FreeCAD.Console.PrintError('Not known unit for property: {}\n'.format(matproperty))
elif Type == "Integer":
@@ -644,9 +663,11 @@ def editMaterial(material):
"""editMaterial(material): opens the editor to edit the contents
of the given material dictionary. Returns the modified material dictionary."""
# if the material editor is opened with this def the combo box with the card name is empty
# this makes sense, because the editor was not opened with a card but with material dictionary instead
# this makes sense ...
# because the editor was not opened with a card but with material dictionary instead
# TODO: add some text in combo box, may be "custom material data" or "user material data"
# TODO: all card could be checked if one fits exact ALL provided data and than this card name could be displayed
# TODO: all card could be checked if one fits exact ALL provided data
# than this card name could be displayed
editor = MaterialEditor(material=material)
result = editor.exec_()
if result:
@@ -660,12 +681,19 @@ def editMaterial(material):
import MaterialEditor
MaterialEditor.openEditor()
doc = FreeCAD.open(FreeCAD.ConfigGet("AppHomePath") + 'data/examples/FemCalculixCantilever3D.FCStd')
doc = FreeCAD.open(
FreeCAD.ConfigGet("AppHomePath") + 'data/examples/FemCalculixCantilever3D.FCStd'
)
import MaterialEditor
MaterialEditor.openEditor('SolidMaterial', 'Material')
import MaterialEditor
MaterialEditor.editMaterial({'Density': '1234.0 kg/m^3', 'Name': 'My-Material-Data', 'PoissonRatio': '0.66', 'YoungsModulus': '123456 MPa'})
MaterialEditor.editMaterial({
'Density': '1234.0 kg/m^3',
'Name': 'My-Material-Data',
'PoissonRatio': '0.66',
'YoungsModulus': '123456 MPa'
})
import MaterialEditor
MaterialEditor.editMaterial('ABS')