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"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>AligmentParameter</class> <class>Aligment_Parameter</class>
<widget class="QWidget" name="AligmentParameter"> <widget class="QWidget" name="Aligment_Parameter">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

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

@ -33,6 +33,24 @@ __title__="Machine-Distortion FemSetGeometryObject managment"
__author__ = "Juergen Riegel" __author__ = "Juergen Riegel"
__url__ = "http://free-cad.sourceforge.net" __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): def makeMaterial(name):
'''makeMaterial(name): makes an Material '''makeMaterial(name): makes an Material
name there fore is a material name or an file name for a FCMat file''' 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.")} 'ToolTip': QtCore.QT_TRANSLATE_NOOP("MachDist_Material","Creates or edit the material definition.")}
def Activated(self): def Activated(self):
MatObj = None
for i in FemGui.getActiveAnalysis().Member:
if i.isDerivedFrom("App::MaterialObject"):
MatObj = i
if (not MatObj):
FreeCAD.ActiveDocument.openTransaction("Create Material") FreeCAD.ActiveDocument.openTransaction("Create Material")
FreeCADGui.addModule("MachDistMaterial") FreeCADGui.addModule("MachDistMaterial")
FreeCADGui.doCommand("mat = MachDistMaterial.makeMaterial('Material')") FreeCADGui.doCommand("mat = MachDistMaterial.makeMaterial('Material')")
FreeCADGui.doCommand("App.activeDocument()."+FemGui.getActiveAnalysis().Name+".Member = App.activeDocument()."+FemGui.getActiveAnalysis().Name+".Member + [mat]") 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("Gui.activeDocument().setEdit(mat.Name,0)")
#FreeCADGui.doCommand("MachDist.makeMaterial()") #FreeCADGui.doCommand("MachDist.makeMaterial()")
FreeCAD.ActiveDocument.commitTransaction() else:
FreeCADGui.doCommand("Gui.activeDocument().setEdit('"+MatObj.Name+"',0)")
def IsActive(self): def IsActive(self):
if FemGui.getActiveAnalysis(): if FemGui.getActiveAnalysis():
return True return True
@ -70,6 +96,7 @@ class _Material:
def __init__(self,obj): def __init__(self,obj):
self.Type = "MachDistMaterial" self.Type = "MachDistMaterial"
obj.Proxy = self obj.Proxy = self
obj.Material = StartMat
#obj.addProperty("App::PropertyString","MaterialName","Base", #obj.addProperty("App::PropertyString","MaterialName","Base",
# "The name of the distorion material") # "The name of the distorion material")
@ -115,7 +142,7 @@ class _ViewProviderMaterial:
return return
def setEdit(self,vobj,mode): def setEdit(self,vobj,mode):
taskd = _MaterialTaskPanel() taskd = _MaterialTaskPanel(self.Object)
taskd.obj = vobj.Object taskd.obj = vobj.Object
taskd.update() taskd.update()
FreeCADGui.Control.showDialog(taskd) FreeCADGui.Control.showDialog(taskd)
@ -134,19 +161,43 @@ class _ViewProviderMaterial:
class _MaterialTaskPanel: class _MaterialTaskPanel:
'''The editmode TaskPanel for Material objects''' '''The editmode TaskPanel for Material objects'''
def __init__(self): def __init__(self,obj):
# the panel has a tree widget that contains categories # the panel has a tree widget that contains categories
# for the subcomponents, such as additions, subtractions. # for the subcomponents, such as additions, subtractions.
# the categories are shown only if they are not empty. # the categories are shown only if they are not empty.
form_class, base_class = uic.loadUiType(FreeCAD.getHomePath() + "Mod/Machining_Distortion/Material.ui") form_class, base_class = uic.loadUiType(FreeCAD.getHomePath() + "Mod/Machining_Distortion/Material.ui")
self.obj = None self.obj = obj
self.formUi = form_class() self.formUi = form_class()
self.form = QtGui.QWidget() self.form = QtGui.QWidget()
self.formUi.setupUi(self.form) 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_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.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() self.update()
@ -164,13 +215,38 @@ class _MaterialTaskPanel:
return return
def accept(self): 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() FreeCADGui.ActiveDocument.resetEdit()
def reject(self): def reject(self):
FreeCADGui.ActiveDocument.resetEdit() 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): 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) values = self.parse_R_output(l_filename)
self.formUi.lc1.setValue(values[0]) self.formUi.lc1.setValue(values[0])
self.formUi.lc2.setValue(values[1]) self.formUi.lc2.setValue(values[1])

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

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>Form</class> <class>Material_Parameter</class>
<widget class="QWidget" name="Form"> <widget class="QWidget" name="Material_Parameter">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>177</width> <width>177</width>
<height>535</height> <height>560</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item row="0" column="0" colspan="2"> <item>
<widget class="QComboBox" name="comboBox"> <widget class="QComboBox" name="comboBox">
<item> <item>
<property name="text"> <property name="text">
@ -23,14 +23,30 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item>
<widget class="QPushButton" name="pushButton_SaveMat">
<property name="text">
<string>Save Material ...</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0" colspan="2">
<widget class="Line" name="line"> <widget class="Line" name="line">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QDoubleSpinBox" name="spinBox_young_modulus"> <widget class="QDoubleSpinBox" name="spinBox_young_modulus">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -55,14 +71,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="1">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Young Modulus</string> <string>Young Modulus</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QDoubleSpinBox" name="spinBox_poisson_ratio"> <widget class="QDoubleSpinBox" name="spinBox_poisson_ratio">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -87,14 +103,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Poisson Ratio</string> <string>Poisson Ratio</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="3" column="0">
<widget class="QDoubleSpinBox" name="spinBox_Plate_Thickness"> <widget class="QDoubleSpinBox" name="spinBox_Plate_Thickness">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -122,21 +138,32 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="3" column="1">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>Plate Thickness</string> <string>Plate Thickness</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> </layout>
<widget class="QPushButton" name="select_L_file"> </item>
<property name="text"> <item>
<string>Select L File</string> <widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item>
<widget class="QPushButton" name="select_L_file">
<property name="text">
<string>Select L File ...</string>
</property>
</widget>
</item>
<item>
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QDoubleSpinBox" name="lc1"> <widget class="QDoubleSpinBox" name="lc1">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -161,14 +188,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>LC1</string> <string>LC1</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="1" column="0">
<widget class="QDoubleSpinBox" name="lc2"> <widget class="QDoubleSpinBox" name="lc2">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -193,14 +220,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="1" column="1">
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_12">
<property name="text"> <property name="text">
<string>LC2</string> <string>LC2</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="2" column="0">
<widget class="QDoubleSpinBox" name="lc3"> <widget class="QDoubleSpinBox" name="lc3">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -225,14 +252,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1"> <item row="2" column="1">
<widget class="QLabel" name="label_11"> <widget class="QLabel" name="label_11">
<property name="text"> <property name="text">
<string>LC3</string> <string>LC3</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0"> <item row="3" column="0">
<widget class="QDoubleSpinBox" name="lc4"> <widget class="QDoubleSpinBox" name="lc4">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -257,14 +284,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1"> <item row="3" column="1">
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>LC4</string> <string>LC4</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="4" column="0">
<widget class="QDoubleSpinBox" name="lc5"> <widget class="QDoubleSpinBox" name="lc5">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -289,14 +316,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1"> <item row="4" column="1">
<widget class="QLabel" name="label_19"> <widget class="QLabel" name="label_19">
<property name="text"> <property name="text">
<string>LC5</string> <string>LC5</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="0"> <item row="5" column="0">
<widget class="QDoubleSpinBox" name="lc6"> <widget class="QDoubleSpinBox" name="lc6">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -321,21 +348,32 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="1"> <item row="5" column="1">
<widget class="QLabel" name="label_20"> <widget class="QLabel" name="label_20">
<property name="text"> <property name="text">
<string>LC6</string> <string>LC6</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0"> </layout>
<widget class="QPushButton" name="select_LT_file"> </item>
<property name="text"> <item>
<string>Select LT File</string> <widget class="Line" name="line_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="0"> <item>
<widget class="QPushButton" name="select_LT_file">
<property name="text">
<string>Select LT File ...</string>
</property>
</widget>
</item>
<item>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QDoubleSpinBox" name="ltc1"> <widget class="QDoubleSpinBox" name="ltc1">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -360,14 +398,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label_16"> <widget class="QLabel" name="label_16">
<property name="text"> <property name="text">
<string>LTC1</string> <string>LTC1</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="0"> <item row="1" column="0">
<widget class="QDoubleSpinBox" name="ltc2"> <widget class="QDoubleSpinBox" name="ltc2">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -392,14 +430,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1"> <item row="1" column="1">
<widget class="QLabel" name="label_13"> <widget class="QLabel" name="label_13">
<property name="text"> <property name="text">
<string>LTC2</string> <string>LTC2</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="0"> <item row="2" column="0">
<widget class="QDoubleSpinBox" name="ltc3"> <widget class="QDoubleSpinBox" name="ltc3">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -424,14 +462,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="1"> <item row="2" column="1">
<widget class="QLabel" name="label_14"> <widget class="QLabel" name="label_14">
<property name="text"> <property name="text">
<string>LTC3</string> <string>LTC3</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="16" column="0"> <item row="3" column="0">
<widget class="QDoubleSpinBox" name="ltc4"> <widget class="QDoubleSpinBox" name="ltc4">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -456,14 +494,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="16" column="1"> <item row="3" column="1">
<widget class="QLabel" name="label_15"> <widget class="QLabel" name="label_15">
<property name="text"> <property name="text">
<string>LTC4</string> <string>LTC4</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="17" column="0"> <item row="4" column="0">
<widget class="QDoubleSpinBox" name="ltc5"> <widget class="QDoubleSpinBox" name="ltc5">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -488,14 +526,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="17" column="1"> <item row="4" column="1">
<widget class="QLabel" name="label_17"> <widget class="QLabel" name="label_17">
<property name="text"> <property name="text">
<string>LTC5</string> <string>LTC5</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="18" column="0"> <item row="5" column="0">
<widget class="QDoubleSpinBox" name="ltc6"> <widget class="QDoubleSpinBox" name="ltc6">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -520,7 +558,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="18" column="1"> <item row="5" column="1">
<widget class="QLabel" name="label_18"> <widget class="QLabel" name="label_18">
<property name="text"> <property name="text">
<string>LTC6</string> <string>LTC6</string>
@ -528,6 +566,8 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

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_FemMesh.svg</file>
<file>icons/MachDist_AddFemMesh.svg</file> <file>icons/MachDist_AddFemMesh.svg</file>
<file>icons/MachDist_Isostatic.svg</file> <file>icons/MachDist_Isostatic.svg</file>
<file>icons/preferences-machining_distortion.svg</file> <file>icons/preferences-part_distortion.svg</file>
</qresource> </qresource>
</RCC> </RCC>

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

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

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

File diff suppressed because it is too large Load Diff