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

Build fixes

Browse Source
This commit is contained in:
jriegel 2014-01-02 14:46:16 +01:00
parent 72797fa395
commit 80fe8bc000
3 changed files with 190 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Fem/App/CMakeLists.txt
View File

@ -66,8 +66,11 @@ SET(FemScripts_SRCS
convert2TetGen.py convert2TetGen.py
FemLib.py FemLib.py
CalculixLib.py CalculixLib.py
MechanicalAnalysis.ui
MechanicalAnalysis.py MechanicalAnalysis.py
MechanicalMaterial.ui
MechanicalMaterial.py MechanicalMaterial.py
ShowDisplacement.ui
) )
#SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS}) #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS})

1
src/Mod/Fem/MechanicalAnalysis.py
View File

@ -21,7 +21,6 @@
#*************************************************************************** #***************************************************************************
import FreeCAD, Fem, os,sys,string,math,shutil,glob,subprocess,tempfile import FreeCAD, Fem, os,sys,string,math,shutil,glob,subprocess,tempfile
#from ApplyingBC_IC import ApplyingBC_IC
if FreeCAD.GuiUp: if FreeCAD.GuiUp:
import FreeCADGui,FemGui import FreeCADGui,FemGui

270
src/Mod/Fem/ShowDisplacement.ui
View File

@ -6,93 +6,188 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>193</width> <width>186</width>
<height>354</height> <height>416</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Mechanical analysis</string> <string>Show result</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <widget class="QGroupBox" name="groupBox_Color">
<item> <property name="title">
<widget class="QCheckBox" name="checkBox_UseColor"> <string>Colors</string>
<property name="text"> </property>
<string>Use color</string> <layout class="QVBoxLayout" name="verticalLayout">
</property> <item>
<property name="checked"> <widget class="QRadioButton" name="radioButton_Stress">
<bool>true</bool> <property name="text">
</property> <string>Stress</string>
</widget> </property>
</item> <property name="checked">
<item> <bool>true</bool>
<widget class="Line" name="line"> </property>
<property name="orientation"> </widget>
<enum>Qt::Horizontal</enum> </item>
</property> <item>
</widget> <widget class="QRadioButton" name="radioButton_Displacement">
</item> <property name="text">
<item> <string>Displacement</string>
<layout class="QHBoxLayout" name="horizontalLayout"> </property>
<item> </widget>
<widget class="QLabel" name="label"> </item>
<property name="text"> <item>
<string>Max:</string> <widget class="QRadioButton" name="radioButton_NoColor">
</property> <property name="text">
</widget> <string>No color</string>
</item> </property>
<item> </widget>
<widget class="QLineEdit" name="lineEdit_Max"> </item>
<property name="readOnly"> <item>
<bool>true</bool> <layout class="QFormLayout" name="formLayout_2">
</property> <item row="0" column="0">
</widget> <widget class="QLabel" name="label_5">
</item> <property name="text">
</layout> <string>Max:</string>
</item> </property>
<item> </widget>
<layout class="QHBoxLayout" name="horizontalLayout_2"> </item>
<item> <item row="0" column="1">
<widget class="QLabel" name="label_2"> <widget class="QDoubleSpinBox" name="doubleSpinBox_MinValueColor"/>
<property name="text"> </item>
<string>Avg:</string> <item row="1" column="0">
</property> <widget class="QLabel" name="label_6">
</widget> <property name="text">
</item> <string>Min:</string>
<item> </property>
<widget class="QLineEdit" name="lineEdit_Max_2"> </widget>
<property name="readOnly"> </item>
<bool>true</bool> <item row="1" column="1">
</property> <widget class="QDoubleSpinBox" name="doubleSpinBox_MaxValueColor">
</widget> <property name="maximum">
</item> <double>99999990.000000000000000</double>
</layout> </property>
</item> </widget>
<item> </item>
<widget class="Line" name="line_2"> </layout>
<property name="orientation"> </item>
<enum>Qt::Horizontal</enum> </layout>
</property> </widget>
</widget> </item>
</item> <item>
<item> <widget class="QGroupBox" name="groupBox_2">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <property name="title">
<item> <string>Statistic</string>
<widget class="QLabel" name="label_3"> </property>
<property name="text"> <layout class="QFormLayout" name="formLayout">
<string>Factor:</string> <property name="fieldGrowthPolicy">
</property> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</widget> </property>
</item> <item row="0" column="0">
<item> <widget class="QLabel" name="label">
<widget class="QSpinBox" name="spinBox"/> <property name="text">
</item> <string>Max:</string>
</layout> </property>
</item> </widget>
</layout> </item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_Max">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Min:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_Max_3">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Avg:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEdit_Max_2">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Displacement</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="checkBox_ShowDisplacement">
<property name="text">
<string>Show</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Factor:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_DisplacementFactor">
<property name="value">
<number>1</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>Slider max:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_SliderFactor">
<property name="maximum">
<number>99999</number>
</property>
<property name="value">
<number>20</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
@ -102,7 +197,7 @@
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>168</height> <height>18</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@ -110,7 +205,16 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QScrollBar" name="verticalScrollBar"> <widget class="QScrollBar" name="verticalScrollBar_Factor">
<property name="maximum">
<number>20</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="sliderPosition">
<number>1</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>