FEM: rename modul MechanicalAnalysis to FemAnalysis

This commit is contained in:
Bernd Hahnebach 2015-11-25 06:58:25 +01:00 committed by Yorik van Havre
parent 03d1d32e38
commit 9d2d92336e
7 changed files with 10 additions and 12 deletions

View File

@ -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

View File

@ -34,7 +34,7 @@ INSTALL(
_FemAnalysis.py
_ViewProviderFemAnalysis.py
MechanicalAnalysis.py
FemAnalysis.py
_CommandNewMechanicalAnalysis.py
_CommandSolverJobControl.py

View File

@ -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

View File

@ -53,8 +53,6 @@ class FemWorkbench (Workbench):
import _CommandMechanicalMaterial
import _CommandFemSolverCalculix
import MechanicalAnalysis
import subprocess
from platform import system
ccx_path = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem").GetString("ccxBinaryPath")

View File

@ -27,7 +27,7 @@
import Fem
import FemTools
import FreeCAD
import MechanicalAnalysis
import FemAnalysis
import FemSolverCalculix
import MechanicalMaterial
import csv
@ -70,7 +70,7 @@ class FemTest(unittest.TestCase):
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):

View File

@ -45,9 +45,9 @@ class _CommandNewMechanicalAnalysis(FemCommands):
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]")

View File

@ -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 !