FEM: split MechanicalMaterial into separate modules

FreeCAD · Nov 7, 2015 · 05a20ec · 05a20ec
1 parent 49c12c5
commit 05a20ec
Show file tree

Hide file tree

Showing 8 changed files with 501 additions and 359 deletions.
diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
@@ -76,8 +76,6 @@ SET(FemScripts_SRCS
     FemTools.py
     MechanicalAnalysis.ui
     MechanicalAnalysis.py
-    MechanicalMaterial.ui
-    MechanicalMaterial.py
     ShowDisplacement.ui
     FemCommands.py
     _ResultControlTaskPanel.py
@@ -104,6 +102,13 @@ SET(FemScripts_SRCS
     _CommandFemShellThickness.py
     _FemShellThicknessTaskPanel.py
     FemShellThickness.ui
+
+    _MechanicalMaterial.py
+    _ViewProviderMechanicalMaterial.py
+    MechanicalMaterial.py
+    _CommandMechanicalMaterial.py
+    _MechanicalMaterialTaskPanel.py
+    MechanicalMaterial.ui
 )
 #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS})
 

diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
@@ -17,8 +17,6 @@ INSTALL(
         TestFem.py
         FemExample.py
         MechanicalAnalysis.py
-        MechanicalMaterial.py
-        MechanicalMaterial.ui
         MechanicalAnalysis.ui
         ShowDisplacement.ui
         FemCommands.py
@@ -46,6 +44,14 @@ INSTALL(
         _CommandFemShellThickness.py
         _FemShellThicknessTaskPanel.py
         FemShellThickness.ui
+
+        _MechanicalMaterial.py
+        _ViewProviderMechanicalMaterial.py
+        MechanicalMaterial.py
+        _CommandMechanicalMaterial.py
+        _MechanicalMaterialTaskPanel.py
+        MechanicalMaterial.ui
+
     DESTINATION
         Mod/Fem
 )

diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py
@@ -50,9 +50,9 @@ def Initialize(self):
         import _CommandNewMechanicalAnalysis
         import _CommandFemShellThickness
         import _CommandFemBeamSection
+        import _CommandMechanicalMaterial
 
         import MechanicalAnalysis
-        import MechanicalMaterial
 
         import subprocess
         from platform import system