kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fem: Remove unnecessary type check for active analysis

Browse Source
This commit is contained in:
marioalexis
2023-03-24 22:32:33 -03:00
committed by wwmayer
parent 99f15b37c1
commit f1fc505955
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/Fem/Gui/Command.cpp
View File

@@ -68,17 +68,14 @@ using namespace std;
// helpers
bool getConstraintPrerequisits(Fem::FemAnalysis** Analysis)
{
Fem::FemAnalysis* ActiveAnalysis =
FemGui::ActiveAnalysisObserver::instance()->getActiveObject();
if (!ActiveAnalysis
|| !ActiveAnalysis->getTypeId().isDerivedFrom(Fem::FemAnalysis::getClassTypeId())) {
if (!FemGui::ActiveAnalysisObserver::instance()->hasActiveObject()) {
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("No active Analysis"),
QObject::tr("You need to create or activate a Analysis"));
return true;
}
*Analysis = static_cast<Fem::FemAnalysis*>(ActiveAnalysis);
*Analysis = FemGui::ActiveAnalysisObserver::instance()->getActiveObject();
// return with no error
return false;
@@ -1241,13 +1238,7 @@ void CmdFemCompEmConstraints::languageChange()
bool CmdFemCompEmConstraints::isActive()
{
// only if there is an active analysis
Fem::FemAnalysis* ActiveAnalysis =
FemGui::ActiveAnalysisObserver::instance()->getActiveObject();
if (!ActiveAnalysis
|| !ActiveAnalysis->getTypeId().isDerivedFrom(Fem::FemAnalysis::getClassTypeId()))
return false;
return true;
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}