Skip to content

Commit

Permalink
Fixed the conditional operator (#9600)
Browse files Browse the repository at this point in the history
Save translation flags states when saving the settings
  • Loading branch information
adeas31 committed Oct 26, 2022
1 parent acb08e9 commit 91ed15a
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion OMEdit/OMEditLIB/Options/OptionsDialog.cpp
Expand Up @@ -2296,6 +2296,7 @@ void OptionsDialog::saveSimulationSettings()
// save matching algorithm
QString matchingAlgorithm = mpSimulationPage->getTranslationFlagsWidget()->getMatchingAlgorithmComboBox()->currentText();
if (mMatchingAlgorithm.compare(matchingAlgorithm) != 0) {
mMatchingAlgorithm = matchingAlgorithm;
changed = true;
}
if (matchingAlgorithm.compare(simulationOptions.getMatchingAlgorithm()) == 0) {
Expand All @@ -2306,6 +2307,7 @@ void OptionsDialog::saveSimulationSettings()
// save index reduction
QString indexReduction = mpSimulationPage->getTranslationFlagsWidget()->getIndexReductionMethodComboBox()->currentText();
if (mIndexReductionMethod.compare(indexReduction) != 0) {
mIndexReductionMethod = indexReduction;
changed = true;
}
if (indexReduction.compare(simulationOptions.getIndexReductionMethod()) == 0) {
Expand All @@ -2316,6 +2318,7 @@ void OptionsDialog::saveSimulationSettings()
// save initialization
bool initialization = mpSimulationPage->getTranslationFlagsWidget()->getInitializationCheckBox()->isChecked();
if (mInitialization != initialization) {
mInitialization = initialization;
changed = true;
}
if (initialization == simulationOptions.getInitialization()) {
Expand All @@ -2326,6 +2329,7 @@ void OptionsDialog::saveSimulationSettings()
// save evaluate all parameters
bool evaluateAllParameters = mpSimulationPage->getTranslationFlagsWidget()->getEvaluateAllParametersCheckBox()->isChecked();
if (mEvaluateAllParameters != evaluateAllParameters) {
mEvaluateAllParameters = evaluateAllParameters;
changed = true;
}
if (evaluateAllParameters == simulationOptions.getEvaluateAllParameters()) {
Expand All @@ -2336,6 +2340,7 @@ void OptionsDialog::saveSimulationSettings()
// save NLS analytic jacobian
bool NLSanalyticJacobian = mpSimulationPage->getTranslationFlagsWidget()->getNLSanalyticJacobianCheckBox()->isChecked();
if (mNLSanalyticJacobian != NLSanalyticJacobian) {
mNLSanalyticJacobian = NLSanalyticJacobian;
changed = true;
}
if (NLSanalyticJacobian == simulationOptions.getNLSanalyticJacobian()) {
Expand All @@ -2346,6 +2351,7 @@ void OptionsDialog::saveSimulationSettings()
// save parmodauto
bool parmodauto = mpSimulationPage->getTranslationFlagsWidget()->getParmodautoCheckBox()->isChecked();
if (mParmodauto != parmodauto) {
mParmodauto = parmodauto;
changed = true;
}
if (parmodauto == simulationOptions.getParmodauto()) {
Expand All @@ -2356,6 +2362,7 @@ void OptionsDialog::saveSimulationSettings()
// save old instantiation
bool newInst = !mpSimulationPage->getTranslationFlagsWidget()->getOldInstantiationCheckBox()->isChecked();
if (mOldInstantiation != newInst) {
mOldInstantiation = newInst;
changed = true;
}
if (newInst == !simulationOptions.getOldInstantiation()) {
Expand All @@ -2365,7 +2372,8 @@ void OptionsDialog::saveSimulationSettings()
}
// save enable FMU Import
bool enableFMUImport = mpSimulationPage->getTranslationFlagsWidget()->getEnableFMUImportCheckBox()->isChecked();
if (mEnableFMUImport = enableFMUImport) {
if (mEnableFMUImport != enableFMUImport) {
mEnableFMUImport = enableFMUImport;
changed = true;
}
if (enableFMUImport == simulationOptions.getEnableFMUImport()) {
Expand All @@ -2377,6 +2385,7 @@ void OptionsDialog::saveSimulationSettings()
QString additionalFlags = mpSimulationPage->getTranslationFlagsWidget()->getAdditionalTranslationFlagsTextBox()->text();
if (mpSimulationPage->getTranslationFlagsWidget()->applyFlags()) {
if (mAdditionalTranslationFlags.compare(additionalFlags) != 0) {
mAdditionalTranslationFlags = additionalFlags;
changed = true;
}
if (additionalFlags.compare(simulationOptions.getAdditionalTranslationFlags()) == 0) {
Expand Down

0 comments on commit 91ed15a

Please sign in to comment.