suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

further implement Align and Material

Browse Source
This commit is contained in:
jriegel 2013-07-13 21:00:03 +02:00
parent 7319f89167
commit d2f7efe8c6
7 changed files with 2283 additions and 2167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Machining_Distortion/Aligment.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AligmentParameter</class>
<widget class="QWidget" name="AligmentParameter">
<class>Aligment_Parameter</class>
<widget class="QWidget" name="Aligment_Parameter">
<property name="geometry">
<rect>
<x>0</x>

98
src/Mod/Machining_Distortion/MachDistMaterial.py
View File

@ -33,6 +33,24 @@ __title__="Machine-Distortion FemSetGeometryObject managment"
__author__ = "Juergen Riegel"
__url__ = "http://free-cad.sourceforge.net"
StartMat = {'FEM_YoungsModulus' :'7000.00',
'PartDist_PoissonRatio' :'0.30',
'PartDist_PlateThickness' :'40.0',
'PartDist_LC1' :'1.0',
'PartDist_LC2' :'2.0',
'PartDist_LC3' :'3.0',
'PartDist_LC4' :'4.0',
'PartDist_LC5' :'5.0',
'PartDist_LC6' :'6.0',
'PartDist_LTC1' :'7.0',
'PartDist_LTC2' :'8.0',
'PartDist_LTC3' :'9.0',
'PartDist_LTC4' :'10.0',
'PartDist_LTC5' :'11.0',
'PartDist_LTC6' :'12.0'
}
def makeMaterial(name):
'''makeMaterial(name): makes an Material
name there fore is a material name or an file name for a FCMat file'''
@ -51,13 +69,21 @@ class _CommandMaterial:
'ToolTip': QtCore.QT_TRANSLATE_NOOP("MachDist_Material","Creates or edit the material definition.")}
def Activated(self):
FreeCAD.ActiveDocument.openTransaction("Create Material")
FreeCADGui.addModule("MachDistMaterial")
FreeCADGui.doCommand("mat = MachDistMaterial.makeMaterial('Material')")
FreeCADGui.doCommand("App.activeDocument()."+FemGui.getActiveAnalysis().Name+".Member = App.activeDocument()."+FemGui.getActiveAnalysis().Name+".Member + [mat]")
FreeCADGui.doCommand("Gui.activeDocument().setEdit(mat.Name,0)")
#FreeCADGui.doCommand("MachDist.makeMaterial()")
FreeCAD.ActiveDocument.commitTransaction()
MatObj = None
for i in FemGui.getActiveAnalysis().Member:
if i.isDerivedFrom("App::MaterialObject"):
MatObj = i
if (not MatObj):
FreeCAD.ActiveDocument.openTransaction("Create Material")
FreeCADGui.addModule("MachDistMaterial")
FreeCADGui.doCommand("mat = MachDistMaterial.makeMaterial('Material')")
FreeCADGui.doCommand("App.activeDocument()."+FemGui.getActiveAnalysis().Name+".Member = App.activeDocument()."+FemGui.getActiveAnalysis().Name+".Member + [mat]")
FreeCADGui.doCommand("Gui.activeDocument().setEdit(mat.Name,0)")
#FreeCADGui.doCommand("MachDist.makeMaterial()")
else:
FreeCADGui.doCommand("Gui.activeDocument().setEdit('"+MatObj.Name+"',0)")
def IsActive(self):
if FemGui.getActiveAnalysis():
return True
@ -70,6 +96,7 @@ class _Material:
def __init__(self,obj):
self.Type = "MachDistMaterial"
obj.Proxy = self
obj.Material = StartMat
#obj.addProperty("App::PropertyString","MaterialName","Base",
# "The name of the distorion material")
@ -115,7 +142,7 @@ class _ViewProviderMaterial:
return
def setEdit(self,vobj,mode):
taskd = _MaterialTaskPanel()
taskd = _MaterialTaskPanel(self.Object)
taskd.obj = vobj.Object
taskd.update()
FreeCADGui.Control.showDialog(taskd)
@ -134,19 +161,43 @@ class _ViewProviderMaterial:
class _MaterialTaskPanel:
'''The editmode TaskPanel for Material objects'''
def __init__(self):
def __init__(self,obj):
# the panel has a tree widget that contains categories
# for the subcomponents, such as additions, subtractions.
# the categories are shown only if they are not empty.
form_class, base_class = uic.loadUiType(FreeCAD.getHomePath() + "Mod/Machining_Distortion/Material.ui")
self.obj = None
self.obj = obj
self.formUi = form_class()
self.form = QtGui.QWidget()
self.formUi.setupUi(self.form)
QtCore.QObject.connect(self.formUi.select_L_file, QtCore.SIGNAL("clicked()"), self.add_L_data)
QtCore.QObject.connect(self.formUi.select_LT_file, QtCore.SIGNAL("clicked()"), self.add_LT_data)
QtCore.QObject.connect(self.formUi.pushButton_SaveMat, QtCore.SIGNAL("clicked()"), self.saveMat)
matmap = self.obj.Material
self.formUi.spinBox_young_modulus.setValue(float(matmap['FEM_YoungsModulus']))
self.formUi.spinBox_poisson_ratio.setValue(float(matmap['PartDist_PoissonRatio']))
self.formUi.spinBox_Plate_Thickness.setValue(float(matmap['PartDist_PlateThickness']))
self.formUi.lc1.setValue(float(matmap['PartDist_LC1']))
self.formUi.lc2.setValue(float(matmap['PartDist_LC2']))
self.formUi.lc3.setValue(float(matmap['PartDist_LC3']))
self.formUi.lc4.setValue(float(matmap['PartDist_LC4']))
self.formUi.lc5.setValue(float(matmap['PartDist_LC5']))
self.formUi.lc6.setValue(float(matmap['PartDist_LC6']))
self.formUi.ltc1.setValue(float(matmap['PartDist_LTC1']))
self.formUi.ltc2.setValue(float(matmap['PartDist_LTC2']))
self.formUi.ltc3.setValue(float(matmap['PartDist_LTC3']))
self.formUi.ltc4.setValue(float(matmap['PartDist_LTC4']))
self.formUi.ltc5.setValue(float(matmap['PartDist_LTC5']))
self.formUi.ltc6.setValue(float(matmap['PartDist_LTC6']))
self.update()
@ -164,13 +215,38 @@ class _MaterialTaskPanel:
return
def accept(self):
matmap = self.obj.Material
matmap['FEM_YoungsModulus'] = str(self.formUi.spinBox_young_modulus.value())
matmap['PartDist_PoissonRatio'] = str(self.formUi.spinBox_poisson_ratio.value())
matmap['PartDist_PlateThickness'] = str(self.formUi.spinBox_Plate_Thickness.value())
matmap['PartDist_LC1'] = str(self.formUi.lc1.value())
matmap['PartDist_LC2'] = str(self.formUi.lc2.value())
matmap['PartDist_LC3'] = str(self.formUi.lc3.value())
matmap['PartDist_LC4'] = str(self.formUi.lc4.value())
matmap['PartDist_LC5'] = str(self.formUi.lc5.value())
matmap['PartDist_LC6'] = str(self.formUi.lc6.value())
matmap['PartDist_LTC1'] = str(self.formUi.ltc1.value())
matmap['PartDist_LTC2'] = str(self.formUi.ltc2.value())
matmap['PartDist_LTC3'] = str(self.formUi.ltc3.value())
matmap['PartDist_LTC4'] = str(self.formUi.ltc4.value())
matmap['PartDist_LTC5'] = str(self.formUi.ltc5.value())
matmap['PartDist_LTC6'] = str(self.formUi.ltc6.value())
self.obj.Material = matmap
FreeCADGui.ActiveDocument.resetEdit()
def reject(self):
FreeCADGui.ActiveDocument.resetEdit()
def saveMat(self):
l_filename = QtGui.QFileDialog.getSaveFileName(None, 'Save Material file file','','FreeCAD material file (*.FCMat)')
def add_L_data(self):
l_filename = QtGui.QFileDialog.getOpenFileName(None, 'Opesn file','','R-Script File for L Coefficients (*.txt)')
l_filename = QtGui.QFileDialog.getOpenFileName(None, 'Open file','','R-Script File for L Coefficients (*.txt)')
values = self.parse_R_output(l_filename)
self.formUi.lc1.setValue(values[0])
self.formUi.lc2.setValue(values[1])

1014
src/Mod/Machining_Distortion/Material.ui
View File

File diff suppressed because it is too large Load Diff

0
src/Mod/Machining_Distortion/Resources/Icons/preferences-machining_distortion.svg → src/Mod/Machining_Distortion/Resources/Icons/preferences-part_distortion.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

2
src/Mod/Machining_Distortion/Resources/machdist_resources.qrc
View File

@ -12,6 +12,6 @@
<file>icons/MachDist_FemMesh.svg</file>
<file>icons/MachDist_AddFemMesh.svg</file>
<file>icons/MachDist_Isostatic.svg</file>
<file>icons/preferences-machining_distortion.svg</file>
<file>icons/preferences-part_distortion.svg</file>
</qresource>
</RCC>

4
src/Mod/Machining_Distortion/Resources/ui/MachDist-userprefs.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Gui::Dialog::DlgSettingsDraft</class>
<widget class="QWidget" name="Gui::Dialog::DlgSettingsDraft">
<class>Gui::Dialog::DlgSettingsPartDistortion</class>
<widget class="QWidget" name="Gui::Dialog::DlgSettingsPartDistortion">
<property name="geometry">
<rect>
<x>0</x>

3328
src/Mod/Machining_Distortion/machdist_rc.py
View File

File diff suppressed because it is too large Load Diff