diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 349cb5888e..6fba1c7b4a 100755 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -83,7 +83,6 @@ SET(FemScripts_SRCS _CommandShellThickness.py _CommandSolverCalculix.py _CommandSolverZ88.py - _FemAnalysis.py _FemBeamSection.py _FemConstraintSelfWeight.py _FemShellThickness.py @@ -95,7 +94,6 @@ SET(FemScripts_SRCS _TaskPanelFemSolverCalculix.py _TaskPanelMechanicalMaterial.py _TaskPanelShowResult.py - _ViewProviderFemAnalysis.py _ViewProviderFemBeamSection.py _ViewProviderFemConstraintSelfWeight.py _ViewProviderFemShellThickness.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index dac55ce4d2..198bbde87c 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -36,8 +36,6 @@ INSTALL( TaskPanelShowResult.ui FemAnalysis.py - _FemAnalysis.py - _ViewProviderFemAnalysis.py _CommandAnalysis.py FemBeamSection.py diff --git a/src/Mod/Fem/FemAnalysis.py b/src/Mod/Fem/FemAnalysis.py index a664e7b7ac..4825423c33 100644 --- a/src/Mod/Fem/FemAnalysis.py +++ b/src/Mod/Fem/FemAnalysis.py @@ -30,9 +30,4 @@ __url__ = "http://www.freecadweb.org" def makeFemAnalysis(name): '''makeFemAnalysis(name): makes a Fem Analysis object''' obj = FreeCAD.ActiveDocument.addObject("Fem::FemAnalysisPython", name) - import _FemAnalysis - _FemAnalysis._FemAnalysis(obj) - import _ViewProviderFemAnalysis - _ViewProviderFemAnalysis._ViewProviderFemAnalysis() - # FreeCAD.ActiveDocument.recompute() return obj diff --git a/src/Mod/Fem/_FemAnalysis.py b/src/Mod/Fem/_FemAnalysis.py deleted file mode 100644 index 1277339c9b..0000000000 --- a/src/Mod/Fem/_FemAnalysis.py +++ /dev/null @@ -1,35 +0,0 @@ -# *************************************************************************** -# * * -# * Copyright (c) 2013-2015 - Juergen Riegel * -# * * -# * This program is free software; you can redistribute it and/or modify * -# * it under the terms of the GNU Lesser General Public License (LGPL) * -# * as published by the Free Software Foundation; either version 2 of * -# * the License, or (at your option) any later version. * -# * for detail see the LICENCE text file. * -# * * -# * This program is distributed in the hope that it will be useful, * -# * but WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -# * GNU Library General Public License for more details. * -# * * -# * You should have received a copy of the GNU Library General Public * -# * License along with this program; if not, write to the Free Software * -# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * -# * USA * -# * * -# *************************************************************************** - -__title__ = "Fem Analysis" -__author__ = "Juergen Riegel" -__url__ = "http://www.freecadweb.org" - - -class _FemAnalysis: - "The FemAnalysis container object" - def __init__(self, obj): - self.Type = "FemAnalysis" - obj.Proxy = self - - def execute(self, obj): - return diff --git a/src/Mod/Fem/_ViewProviderFemAnalysis.py b/src/Mod/Fem/_ViewProviderFemAnalysis.py deleted file mode 100644 index 920ff7a145..0000000000 --- a/src/Mod/Fem/_ViewProviderFemAnalysis.py +++ /dev/null @@ -1,41 +0,0 @@ -import FreeCAD - -if FreeCAD.GuiUp: - import FreeCADGui - import FemGui - - -class _ViewProviderFemAnalysis: - "A View Provider for the FemAnalysis container object" - - def __init__(self): - # vobj.addProperty("App::PropertyLength", "BubbleSize", "Base", "The size of the axis bubbles") - pass - - def getIcon(self): - return ":/icons/fem-analysis.svg" - - def attach(self, vobj): - self.ViewObject = vobj - self.Object = vobj.Object - self.bubbles = None - - def updateData(self, obj, prop): - return - - def onChanged(self, vobj, prop): - return - - def doubleClicked(self, vobj): - if not FemGui.getActiveAnalysis() == self.Object: - if FreeCADGui.activeWorkbench().name() != 'FemWorkbench': - FreeCADGui.activateWorkbench("FemWorkbench") - FemGui.setActiveAnalysis(self.Object) - return True - return True - - def __getstate__(self): - return None - - def __setstate__(self, state): - return None