Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
FEM: rename modul MechanicalAnalysis to FemAnalysis
  • Loading branch information
berndhahnebach authored and yorikvanhavre committed Nov 28, 2015
1 parent 03d1d32 commit 9d2d923
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/Mod/Fem/App/CMakeLists.txt
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Fem/CMakeLists.txt
Expand Up @@ -34,7 +34,7 @@ INSTALL(
_FemAnalysis.py
_ViewProviderFemAnalysis.py

MechanicalAnalysis.py
FemAnalysis.py
_CommandNewMechanicalAnalysis.py

_CommandSolverJobControl.py
Expand Down
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/Mod/Fem/InitGui.py
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/TestFem.py
Expand Up @@ -27,7 +27,7 @@
import Fem
import FemTools
import FreeCAD
import MechanicalAnalysis
import FemAnalysis
import FemSolverCalculix
import MechanicalMaterial
import csv
Expand Down Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/_CommandNewMechanicalAnalysis.py
Expand Up @@ -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]")
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/ccxFrdReader.py
Expand Up @@ -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 !
Expand Down

0 comments on commit 9d2d923

Please sign in to comment.