From 9d2d92336eaf3e84d09f7aaade1c31859ef6234e Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Wed, 25 Nov 2015 06:58:25 +0100
Subject: [PATCH] FEM: rename modul MechanicalAnalysis to FemAnalysis

---
 src/Mod/Fem/App/CMakeLists.txt                        | 2 +-
 src/Mod/Fem/CMakeLists.txt                            | 2 +-
 src/Mod/Fem/{MechanicalAnalysis.py => FemAnalysis.py} | 4 ++--
 src/Mod/Fem/InitGui.py                                | 2 --
 src/Mod/Fem/TestFem.py                                | 4 ++--
 src/Mod/Fem/_CommandNewMechanicalAnalysis.py          | 4 ++--
 src/Mod/Fem/ccxFrdReader.py                           | 4 ++--
 7 files changed, 10 insertions(+), 12 deletions(-)
 rename src/Mod/Fem/{MechanicalAnalysis.py => FemAnalysis.py} (96%)

diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index 02d1e037aba2..adc0339fc652 100755
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -101,13 +101,13 @@ SET(FemScripts_SRCS
     convert2TetGen.py
     Init.py
     InitGui.py
+    FemAnalysis.py
     FemCommands.py
     FemBeamSection.py
     FemExample.py
     FemShellThickness.py
     FemSolverCalculix.py
     FemTools.py
-    MechanicalAnalysis.py
     MechanicalMaterial.py
     SelectionObserverFem.py
     TestFem.py
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 809c35fbe418..618c330a5163 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -34,7 +34,7 @@ INSTALL(
         _FemAnalysis.py
         _ViewProviderFemAnalysis.py
 
-        MechanicalAnalysis.py
+        FemAnalysis.py
         _CommandNewMechanicalAnalysis.py
 
         _CommandSolverJobControl.py
diff --git a/src/Mod/Fem/MechanicalAnalysis.py b/src/Mod/Fem/FemAnalysis.py
similarity index 96%
rename from src/Mod/Fem/MechanicalAnalysis.py
rename to src/Mod/Fem/FemAnalysis.py
index a6d95b6c2e22..52f87526cba5 100644
--- a/src/Mod/Fem/MechanicalAnalysis.py
+++ b/src/Mod/Fem/FemAnalysis.py
@@ -22,12 +22,12 @@
 
 import FreeCAD
 
-__title__ = "Mechanical Analysis managment"
+__title__ = "FEM Analysis managment"
 __author__ = "Juergen Riegel"
 __url__ = "http://www.freecadweb.org"
 
 
-def makeMechanicalAnalysis(name):
+def makeFemAnalysis(name):
     '''makeFemAnalysis(name): makes a Fem Analysis object'''
     obj = FreeCAD.ActiveDocument.addObject("Fem::FemAnalysisPython", name)
     import _FemAnalysis
diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py
index e2799b6dade2..a00c72fb9bee 100644
--- a/src/Mod/Fem/InitGui.py
+++ b/src/Mod/Fem/InitGui.py
@@ -53,8 +53,6 @@ def Initialize(self):
         import _CommandMechanicalMaterial
         import _CommandFemSolverCalculix
 
-        import MechanicalAnalysis
-
         import subprocess
         from platform import system
         ccx_path = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem").GetString("ccxBinaryPath")
diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py
index 248a0a77cfcb..5429575b3b1a 100644
--- a/src/Mod/Fem/TestFem.py
+++ b/src/Mod/Fem/TestFem.py
@@ -27,7 +27,7 @@
 import Fem
 import FemTools
 import FreeCAD
-import MechanicalAnalysis
+import FemAnalysis
 import FemSolverCalculix
 import MechanicalMaterial
 import csv
@@ -70,7 +70,7 @@ def setUp(self):
         self.active_doc.recompute()
 
     def create_new_analysis(self):
-        self.analysis = MechanicalAnalysis.makeMechanicalAnalysis('MechanicalAnalysis')
+        self.analysis = FemAnalysis.makeFemAnalysis('MechanicalAnalysis')
         self.active_doc.recompute()
 
     def create_new_solver(self):
diff --git a/src/Mod/Fem/_CommandNewMechanicalAnalysis.py b/src/Mod/Fem/_CommandNewMechanicalAnalysis.py
index 6dd76991db25..335ed6258e2f 100644
--- a/src/Mod/Fem/_CommandNewMechanicalAnalysis.py
+++ b/src/Mod/Fem/_CommandNewMechanicalAnalysis.py
@@ -45,9 +45,9 @@ def __init__(self):
     def Activated(self):
         FreeCAD.ActiveDocument.openTransaction("Create Analysis")
         FreeCADGui.addModule("FemGui")
-        FreeCADGui.addModule("MechanicalAnalysis")
+        FreeCADGui.addModule("FemAnalysis")
         FreeCADGui.addModule("FemSolverCalculix")
-        FreeCADGui.doCommand("MechanicalAnalysis.makeMechanicalAnalysis('MechanicalAnalysis')")
+        FreeCADGui.doCommand("FemAnalysis.makeFemAnalysis('MechanicalAnalysis')")
         FreeCADGui.doCommand("FemGui.setActiveAnalysis(App.activeDocument().ActiveObject)")
         FreeCADGui.doCommand("FemSolverCalculix.makeFemSolverCalculix('Calculix')")
         FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [App.activeDocument().ActiveObject]")
diff --git a/src/Mod/Fem/ccxFrdReader.py b/src/Mod/Fem/ccxFrdReader.py
index deee4785157b..ba05663db700 100644
--- a/src/Mod/Fem/ccxFrdReader.py
+++ b/src/Mod/Fem/ccxFrdReader.py
@@ -220,8 +220,8 @@ def importFrd(filename, analysis=None):
         import Fem
         if analysis is None:
             analysis_name = os.path.splitext(os.path.basename(filename))[0]
-            import MechanicalAnalysis
-            analysis_object = MechanicalAnalysis.makeMechanicalAnalysis('Analysis')
+            import FemAnalysis
+            analysis_object = FemAnalysis.makeFemAnalysis('Analysis')
             analysis_object.Label = analysis_name
         else:
             analysis_object = analysis  # see if statement few lines later, if not analysis -> no FemMesh object is created !