suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEM: Remove Frequency Analysis from GUI

Browse Source 
Separate Frequency analysis button is no longer required.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt 2015-10-13 17:50:00 +01:00 committed by wmayer
parent 35632147ad
commit ddb20e7329
5 changed files with 0 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Fem/App/CMakeLists.txt
View File

@ -88,7 +88,6 @@ SET(FemScripts_SRCS
_ViewProviderFemAnalysis.py
_FemAnalysis.py
_CommandMechanicalShowResult.py
_CommandFrequencyAnalysis.py
_CommandQuickAnalysis.py
_CommandPurgeFemResults.py
_CommandMechanicalJobControl.py

1
src/Mod/Fem/CMakeLists.txt
View File

@ -30,7 +30,6 @@ INSTALL(
_ViewProviderFemAnalysis.py
_FemAnalysis.py
_CommandMechanicalShowResult.py
_CommandFrequencyAnalysis.py
_CommandQuickAnalysis.py
_CommandPurgeFemResults.py
_CommandMechanicalJobControl.py

1
src/Mod/Fem/Gui/AppFemGui.cpp
View File

@ -105,7 +105,6 @@ void FemGuiExport initFemGui()
Base::Interpreter().loadModule("FemCommands");
Base::Interpreter().loadModule("_CommandMechanicalShowResult");
Base::Interpreter().loadModule("_CommandFrequencyAnalysis");
Base::Interpreter().loadModule("_CommandQuickAnalysis");
Base::Interpreter().loadModule("_CommandPurgeFemResults");
Base::Interpreter().loadModule("_CommandMechanicalJobControl");

2
src/Mod/Fem/Gui/Workbench.cpp
View File

@ -72,7 +72,6 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
<< "Separator"
<< "Fem_MechanicalJobControl"
<< "Fem_Quick_Analysis"
<< "Fem_Frequency_Analysis"
<< "Fem_PurgeResults"
<< "Fem_ShowResult";
return root;
@ -102,7 +101,6 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "Separator"
<< "Fem_MechanicalJobControl"
<< "Fem_Quick_Analysis"
<< "Fem_Frequency_Analysis"
<< "Fem_PurgeResults"
<< "Fem_ShowResult";

64
src/Mod/Fem/_CommandFrequencyAnalysis.py
View File

@ -1,64 +0,0 @@
#***************************************************************************
#* *
#* Copyright (c) 2013-2015 - Juergen Riegel <FreeCAD@juergen-riegel.net> *
#* *
#* 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__ = "Command Frequency Analysis"
__author__ = "Juergen Riegel"
__url__ = "http://www.freecadweb.org"
import FreeCAD
from FemCommands import FemCommands
from FemTools import FemTools
if FreeCAD.GuiUp:
import FreeCADGui
from PySide import QtCore, QtGui
class _CommandFrequencyAnalysis(FemCommands):
def __init__(self):
super(_CommandFrequencyAnalysis, self).__init__()
self.resources = {'Pixmap': 'fem-frequency-analysis',
'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_Frequency_Analysis", "Run frequency analysis with CalculiX ccx"),
'Accel': "R, F",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_Frequency_Analysis", "Write .inp file and run frequency analysis with CalculiX ccx")}
self.is_active = 'with_analysis'
def Activated(self):
def load_results(ret_code):
if ret_code == 0:
self.fea.load_results()
else:
print "CalculiX failed ccx finished with error {}".format(ret_code)
self.fea = FemTools()
self.fea.reset_all()
self.fea.set_analysis_type('frequency')
message = self.fea.check_prerequisites()
if message:
QtGui.QMessageBox.critical(None, "Missing prerequisite", message)
return
self.fea.finished.connect(load_results)
QtCore.QThreadPool.globalInstance().start(self.fea)
if FreeCAD.GuiUp:
FreeCADGui.addCommand('Fem_Frequency_Analysis', _CommandFrequencyAnalysis())