From 739fe3ae39efab385cb430b057c9dc07480c7e96 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Mon, 2 Jan 2017 13:44:14 +0100 Subject: [PATCH] FEM: move modules MechanicalMaterial to a more general FemMaterial --- src/Mod/Fem/App/CMakeLists.txt | 12 +++++----- src/Mod/Fem/CMakeLists.txt | 12 +++++----- .../{MechanicalMaterial.py => FemMaterial.py} | 16 +++++++------- src/Mod/Fem/FemMeshTools.py | 2 +- src/Mod/Fem/Gui/CMakeLists.txt | 1 - src/Mod/Fem/Gui/Workbench.cpp | 4 ++-- src/Mod/Fem/InitGui.py | 2 +- ...calMaterial.ui => TaskPanelFemMaterial.ui} | 6 ++--- ...hanicalMaterial.py => _CommandMaterial.py} | 22 +++++++++---------- ..._MechanicalMaterial.py => _FemMaterial.py} | 10 ++++----- ...alMaterial.py => _TaskPanelFemMaterial.py} | 10 ++++----- ...aterial.py => _ViewProviderFemMaterial.py} | 12 +++++----- 12 files changed, 54 insertions(+), 55 deletions(-) rename src/Mod/Fem/{MechanicalMaterial.py => FemMaterial.py} (82%) rename src/Mod/Fem/{TaskPanelMechanicalMaterial.ui => TaskPanelFemMaterial.ui} (98%) rename src/Mod/Fem/{_CommandMechanicalMaterial.py => _CommandMaterial.py} (80%) rename src/Mod/Fem/{_MechanicalMaterial.py => _FemMaterial.py} (92%) rename src/Mod/Fem/{_TaskPanelMechanicalMaterial.py => _TaskPanelFemMaterial.py} (98%) rename src/Mod/Fem/{_ViewProviderMechanicalMaterial.py => _ViewProviderFemMaterial.py} (90%) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 4e577578c..9502efc15 100755 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -68,7 +68,7 @@ SET(FemScripts_SRCS _CommandConstraintSelfWeight.py _CommandFEMMesh2Mesh.py _CommandMaterialMechanicalNonlinear.py - _CommandMechanicalMaterial.py + _CommandMaterial.py _CommandMeshGmshFromShape.py _CommandMeshNetgenFromShape.py _CommandMeshRegion.py @@ -87,13 +87,13 @@ SET(FemScripts_SRCS _FemShellThickness.py _FemSolverCalculix.py _FemSolverZ88.py - _MechanicalMaterial.py + _FemMaterial.py _TaskPanelFemBeamSection.py _TaskPanelFemMeshGmsh.py _TaskPanelFemMeshRegion.py _TaskPanelFemShellThickness.py _TaskPanelFemSolverCalculix.py - _TaskPanelMechanicalMaterial.py + _TaskPanelFemMaterial.py _TaskPanelShowResult.py _ViewProviderFemBeamSection.py _ViewProviderFemConstraintSelfWeight.py @@ -103,7 +103,7 @@ SET(FemScripts_SRCS _ViewProviderFemShellThickness.py _ViewProviderFemSolverCalculix.py _ViewProviderFemSolverZ88.py - _ViewProviderMechanicalMaterial.py + _ViewProviderFemMaterial.py ccxDatReader.py ccxFrdReader.py convert2TetGen.py @@ -130,7 +130,7 @@ SET(FemScripts_SRCS FemTools.py FemToolsCcx.py FemToolsZ88.py - MechanicalMaterial.py + FemMaterial.py FemSelectionObserver.py TestFem.py z88DispReader.py @@ -139,7 +139,7 @@ SET(FemScripts_SRCS TaskPanelFemMeshRegion.ui TaskPanelFemShellThickness.ui TaskPanelFemSolverCalculix.ui - TaskPanelMechanicalMaterial.ui + TaskPanelFemMaterial.ui TaskPanelShowResult.ui ) #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS}) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 6f3c59f51..6a318ae8c 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -81,12 +81,12 @@ INSTALL( _ViewProviderFemConstraintSelfWeight.py _CommandConstraintSelfWeight.py - MechanicalMaterial.py - _MechanicalMaterial.py - _ViewProviderMechanicalMaterial.py - _CommandMechanicalMaterial.py - _TaskPanelMechanicalMaterial.py - TaskPanelMechanicalMaterial.ui + FemMaterial.py + _FemMaterial.py + _ViewProviderFemMaterial.py + _CommandMaterial.py + _TaskPanelFemMaterial.py + TaskPanelFemMaterial.ui FemMaterialMechanicalNonlinear.py _FemMaterialMechanicalNonlinear.py diff --git a/src/Mod/Fem/MechanicalMaterial.py b/src/Mod/Fem/FemMaterial.py similarity index 82% rename from src/Mod/Fem/MechanicalMaterial.py rename to src/Mod/Fem/FemMaterial.py index a54ab9ef2..de91e2965 100644 --- a/src/Mod/Fem/MechanicalMaterial.py +++ b/src/Mod/Fem/FemMaterial.py @@ -20,7 +20,7 @@ # * * # *************************************************************************** -__title__ = "MechanicalMaterial" +__title__ = "FemMaterial" __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" @@ -28,17 +28,17 @@ __url__ = "http://www.freecadweb.org" # @{ import FreeCAD -import _MechanicalMaterial +import _FemMaterial -def makeMechanicalMaterial(name): - '''makeMaterial(name): makes an Material - name there fore is a material name or an file name for a FCMat file''' +def makeFemMaterial(name): + '''makeFemMaterial(name): makes an FEM Material + ''' obj = FreeCAD.ActiveDocument.addObject("App::MaterialObjectPython", name) - _MechanicalMaterial._MechanicalMaterial(obj) + _FemMaterial._FemMaterial(obj) if FreeCAD.GuiUp: - import _ViewProviderMechanicalMaterial - _ViewProviderMechanicalMaterial._ViewProviderMechanicalMaterial(obj.ViewObject) + import _ViewProviderFemMaterial + _ViewProviderFemMaterial._ViewProviderFemMaterial(obj.ViewObject) # FreeCAD.ActiveDocument.recompute() return obj diff --git a/src/Mod/Fem/FemMeshTools.py b/src/Mod/Fem/FemMeshTools.py index 4d76e2ed3..3cc1b6c4c 100644 --- a/src/Mod/Fem/FemMeshTools.py +++ b/src/Mod/Fem/FemMeshTools.py @@ -402,7 +402,7 @@ def get_femelement_sets_from_group_data(femmesh, fem_objects): def get_elset_short_name(obj, i): - if hasattr(obj, "Proxy") and obj.Proxy.Type == 'MechanicalMaterial': + if hasattr(obj, "Proxy") and obj.Proxy.Type == 'FemMaterial': return 'Mat' + str(i) elif hasattr(obj, "Proxy") and obj.Proxy.Type == 'FemBeamSection': return 'Beam' + str(i) diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 1f6779479..ddf24d761 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -344,7 +344,6 @@ fc_target_copy_resource(FemGui ${CMAKE_SOURCE_DIR}/src/Mod/Fem ${CMAKE_BINARY_DIR}/Mod/Fem InitGui.py - TaskPanelMechanicalMaterial.ui ) SET(FemGuiIcon_SVG diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp index 0b5327115..63b25d258 100755 --- a/src/Mod/Fem/Gui/Workbench.cpp +++ b/src/Mod/Fem/Gui/Workbench.cpp @@ -73,7 +73,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const << "Fem_MeshRegion" //<< "Fem_CreateNodesSet" << "Separator" - << "Fem_MechanicalMaterial" + << "Fem_Material" << "Fem_MaterialMechanicalNonlinear" << "Fem_BeamSection" << "Fem_ShellThickness" @@ -145,7 +145,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Fem_MeshRegion" << "Fem_CreateNodesSet" << "Separator" - << "Fem_MechanicalMaterial" + << "Fem_Material" << "Fem_MaterialMechanicalNonlinear" << "Fem_BeamSection" << "Fem_ShellThickness" diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py index ae33e45f2..dbe0ce629 100644 --- a/src/Mod/Fem/InitGui.py +++ b/src/Mod/Fem/InitGui.py @@ -58,7 +58,7 @@ class FemWorkbench (Workbench): import _CommandAnalysis import _CommandShellThickness import _CommandBeamSection - import _CommandMechanicalMaterial + import _CommandMaterial import _CommandMaterialMechanicalNonlinear import _CommandSolverCalculix import _CommandSolverZ88 diff --git a/src/Mod/Fem/TaskPanelMechanicalMaterial.ui b/src/Mod/Fem/TaskPanelFemMaterial.ui similarity index 98% rename from src/Mod/Fem/TaskPanelMechanicalMaterial.ui rename to src/Mod/Fem/TaskPanelFemMaterial.ui index a836fec34..9c468f3a1 100644 --- a/src/Mod/Fem/TaskPanelMechanicalMaterial.ui +++ b/src/Mod/Fem/TaskPanelFemMaterial.ui @@ -1,7 +1,7 @@ - ThermalMechanicalMaterial - + FemMaterial + 0 @@ -11,7 +11,7 @@ - Mechanical material + FEM material diff --git a/src/Mod/Fem/_CommandMechanicalMaterial.py b/src/Mod/Fem/_CommandMaterial.py similarity index 80% rename from src/Mod/Fem/_CommandMechanicalMaterial.py rename to src/Mod/Fem/_CommandMaterial.py index 8976d6069..840f6718c 100644 --- a/src/Mod/Fem/_CommandMechanicalMaterial.py +++ b/src/Mod/Fem/_CommandMaterial.py @@ -20,11 +20,11 @@ # * * # *************************************************************************** -__title__ = "_CommandMechanicalMaterial" +__title__ = "_CommandMaterial" __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandMechanicalMaterial +## @package CommandMaterial # \ingroup FEM import FreeCAD @@ -34,25 +34,25 @@ import FemGui from PySide import QtCore -class _CommandMechanicalMaterial(FemCommands): - "the Fem_MechanicalMaterial command definition" +class _CommandMaterial(FemCommands): + "the Fem_Material command definition" def __init__(self): - super(_CommandMechanicalMaterial, self).__init__() + super(_CommandMaterial, self).__init__() self.resources = {'Pixmap': 'fem-material', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_MechanicalMaterial", "Mechanical material"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_Material", "FEM material"), 'Accel': "M, M", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_MechanicalMaterial", "Creates a mechanical material")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_Material", "Creates a FEM material")} self.is_active = 'with_analysis' def Activated(self): femDoc = FemGui.getActiveAnalysis().Document if FreeCAD.ActiveDocument is not femDoc: FreeCADGui.setActiveDocument(femDoc) - FreeCAD.ActiveDocument.openTransaction("Create MechanicalMaterial") - FreeCADGui.addModule("MechanicalMaterial") - FreeCADGui.doCommand("MechanicalMaterial.makeMechanicalMaterial('MechanicalMaterial')") + FreeCAD.ActiveDocument.openTransaction("Create Material") + FreeCADGui.addModule("FemMaterial") + FreeCADGui.doCommand("FemMaterial.makeFemMaterial('FemMaterial')") FreeCADGui.doCommand("App.activeDocument()." + FemGui.getActiveAnalysis().Name + ".Member = App.activeDocument()." + FemGui.getActiveAnalysis().Name + ".Member + [App.ActiveDocument.ActiveObject]") FreeCADGui.doCommand("Gui.activeDocument().setEdit(App.ActiveDocument.ActiveObject.Name)") -FreeCADGui.addCommand('Fem_MechanicalMaterial', _CommandMechanicalMaterial()) +FreeCADGui.addCommand('Fem_Material', _CommandMaterial()) diff --git a/src/Mod/Fem/_MechanicalMaterial.py b/src/Mod/Fem/_FemMaterial.py similarity index 92% rename from src/Mod/Fem/_MechanicalMaterial.py rename to src/Mod/Fem/_FemMaterial.py index 48f72dd11..9dd0ab4bc 100644 --- a/src/Mod/Fem/_MechanicalMaterial.py +++ b/src/Mod/Fem/_FemMaterial.py @@ -20,20 +20,20 @@ # * * # *************************************************************************** -__title__ = "_MechanicalMaterial" +__title__ = "FemMaterial" __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package MechanicalMaterial +## @package FemMaterial # \ingroup FEM -class _MechanicalMaterial: - "The Material object" +class _FemMaterial: + "The FEM Material object" def __init__(self, obj): obj.addProperty("App::PropertyLinkSubList", "References", "Material", "List of material shapes") obj.Proxy = self - self.Type = "MechanicalMaterial" + self.Type = "FemMaterial" def execute(self, obj): return diff --git a/src/Mod/Fem/_TaskPanelMechanicalMaterial.py b/src/Mod/Fem/_TaskPanelFemMaterial.py similarity index 98% rename from src/Mod/Fem/_TaskPanelMechanicalMaterial.py rename to src/Mod/Fem/_TaskPanelFemMaterial.py index 21f706f1f..0b87cafc8 100644 --- a/src/Mod/Fem/_TaskPanelMechanicalMaterial.py +++ b/src/Mod/Fem/_TaskPanelFemMaterial.py @@ -20,11 +20,11 @@ # * * # *************************************************************************** -__title__ = "_TaskPanelMechanicalMaterial" +__title__ = "_TaskPanelFemMaterial" __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package TaskPanelMechanicalMaterial +## @package TaskPanelFemMaterial # \ingroup FEM import FreeCAD @@ -34,8 +34,8 @@ from PySide import QtCore import Units -class _TaskPanelMechanicalMaterial: - '''The editmode TaskPanel for MechanicalMaterial objects''' +class _TaskPanelFemMaterial: + '''The editmode TaskPanel for FemMaterial objects''' def __init__(self, obj): FreeCADGui.Selection.clearSelection() self.sel_server = None @@ -50,7 +50,7 @@ class _TaskPanelMechanicalMaterial: self.get_references() self.references_shape_type = None - self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelMechanicalMaterial.ui") + self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelFemMaterial.ui") QtCore.QObject.connect(self.form.pushButton_MatWeb, QtCore.SIGNAL("clicked()"), self.goMatWeb) QtCore.QObject.connect(self.form.cb_materials, QtCore.SIGNAL("activated(int)"), self.choose_material) QtCore.QObject.connect(self.form.input_fd_young_modulus, QtCore.SIGNAL("valueChanged(double)"), self.ym_changed) diff --git a/src/Mod/Fem/_ViewProviderMechanicalMaterial.py b/src/Mod/Fem/_ViewProviderFemMaterial.py similarity index 90% rename from src/Mod/Fem/_ViewProviderMechanicalMaterial.py rename to src/Mod/Fem/_ViewProviderFemMaterial.py index 236c40b2e..e95e6b919 100644 --- a/src/Mod/Fem/_ViewProviderMechanicalMaterial.py +++ b/src/Mod/Fem/_ViewProviderFemMaterial.py @@ -20,19 +20,19 @@ # * * # *************************************************************************** -__title__ = "_ViewProviderMechanicalMaterial" +__title__ = "_ViewProviderFemMaterial" __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package ViewProviderMechanicalMaterial +## @package _ViewProviderFemMaterial # \ingroup FEM import FreeCAD import FreeCADGui -class _ViewProviderMechanicalMaterial: - "A View Provider for the MechanicalMaterial object" +class _ViewProviderFemMaterial: + "A View Provider for the FemMaterial object" def __init__(self, vobj): vobj.Proxy = self @@ -51,8 +51,8 @@ class _ViewProviderMechanicalMaterial: return def setEdit(self, vobj, mode): - import _TaskPanelMechanicalMaterial - taskd = _TaskPanelMechanicalMaterial._TaskPanelMechanicalMaterial(self.Object) + import _TaskPanelFemMaterial + taskd = _TaskPanelFemMaterial._TaskPanelFemMaterial(self.Object) taskd.obj = vobj.Object FreeCADGui.Control.showDialog(taskd) return True