Bug 3267: Fixed saving of option.

copasi · Nov 20, 2024 · 5721276 · 5721276
1 parent 057a758
commit 5721276
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/copasi/UI/CQFittingWidget.cpp b/copasi/UI/CQFittingWidget.cpp
@@ -217,6 +217,12 @@ bool CQFittingWidget::saveTaskProtected()
       pProblem->setCalculateStatistics(mpCheckStatistics->isChecked());
     }
 
+  if (mpCheckDisplayPopulation->isChecked() != pProblem->getParameter("DisplayPoplations")->getValue< bool >())
+    {
+      mChanged = true;
+      pProblem->getParameter("DisplayPoplations")->setValue(mpCheckStatistics->isChecked());
+    }
+
   if (mpUseTimeSens->isChecked() != pProblem->getUseTimeSens())
     {
       mChanged = true;
@@ -273,6 +279,7 @@ bool CQFittingWidget::loadTaskProtected()
   mpCheckRandomize->setChecked(pProblem->getRandomizeStartValues());
   mpCreateParameterSets->setChecked(pProblem->getCreateParameterSets());
   mpCheckStatistics->setChecked(pProblem->getCalculateStatistics());
+  mpCheckDisplayPopulation->setChecked(pProblem->getParameter("DisplayPoplations")->getValue< bool >());
   mpUseTimeSens->setChecked(pProblem->getUseTimeSens());
 
   mpParameters->load(mpDataModel, pProblem->getGroup("OptimizationItemList"), &mExperimentKeyMap, &mCrossValidationKeyMap);
@@ -283,8 +290,6 @@ bool CQFittingWidget::loadTaskProtected()
   mpConstraints->setExperimentSet(const_cast<const CExperimentSet *&>(mpExperimentSet));
   mpConstraints->setCrossValidationSet(const_cast<const CCrossValidationSet *&>(mpCrossValidationSet));
 
-  mpCheckDisplayPopulation->setChecked(pTask->getProblem()->getParameter("DisplayPoplations")->getValue< bool >());
-
   mChanged = false;
 
   return true;
@@ -299,8 +304,6 @@ bool CQFittingWidget::runTask()
 
   mnParamterSetsBeforeRun = pTask->getObjectDataModel()->getModel()->getModelParameterSets().size();
 
-  pTask->getProblem()->getParameter("DisplayPoplations")->setValue(mpCheckDisplayPopulation->isChecked());
-
   if (!commonBeforeRunTask()) return false;
 
   bool success = commonRunTask();
@@ -395,7 +398,6 @@ void CQFittingWidget::init()
   pGroupLayout->setContentsMargins(0, 0, 0, 0);
 
   mpTabWidget->setCornerWidget(pGroup);
-
 }
 
 void CQFittingWidget::slotIncreaseTabHeight()
@@ -405,12 +407,13 @@ void CQFittingWidget::slotIncreaseTabHeight()
   mpTabWidget->setMinimumHeight(height);
 }
 
-
 void CQFittingWidget::slotDecreaseTabHeight()
 {
   auto height = mpTabWidget->height();
+
   if (height < 300)
     return;
+
   height -= 100;
   mpTabWidget->setMinimumHeight(height);
 }

diff --git a/copasi/UI/CQOptimizationWidget.cpp b/copasi/UI/CQOptimizationWidget.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2022 by Pedro Mendes, Rector and Visitors of the
+// Copyright (C) 2019 - 2024 by Pedro Mendes, Rector and Visitors of the
 // University of Virginia, University of Heidelberg, and University
 // of Connecticut School of Medicine.
 // All rights reserved.
@@ -115,6 +115,12 @@ bool CQOptimizationWidget::saveTaskProtected()
       pProblem->setCalculateStatistics(mpCheckStatistics->isChecked());
     }
 
+  if (mpCheckDisplayPopulation->isChecked() != pProblem->getParameter("DisplayPoplations")->getValue< bool >())
+    {
+      mChanged = true;
+      pProblem->getParameter("DisplayPoplations")->setValue(mpCheckStatistics->isChecked());
+    }
+
   mChanged |= mpParameters->save(NULL, NULL);
   mChanged |= mpConstraints->save(NULL, NULL);
 
@@ -150,15 +156,14 @@ bool CQOptimizationWidget::loadTaskProtected()
 
   mpCheckRandomize->setChecked(pProblem->getRandomizeStartValues());
   mpCheckStatistics->setChecked(pProblem->getCalculateStatistics());
+  mpCheckDisplayPopulation->setChecked(pProblem->getParameter("DisplayPoplations")->getValue< bool >());
 
   mpBoxSubtask->setCurrentIndex(mpBoxSubtask->findText(FROM_UTF8(CTaskEnum::TaskName[pProblem->getSubtaskType()])));
 
   mpParameters->load(mpDataModel, pProblem->getGroup("OptimizationItemList"), NULL, NULL);
 
   mpConstraints->load(mpDataModel, pProblem->getGroup("OptimizationConstraintList"), NULL, NULL);
 
-  mpCheckDisplayPopulation->setChecked(pTask->getProblem()->getParameter("DisplayPoplations")->getValue< bool >());
-
   mChanged = false;
 
   return true;
@@ -177,8 +182,6 @@ bool CQOptimizationWidget::runTask()
 
   if (!pTask) return false;
 
-  pTask->getProblem()->getParameter("DisplayPoplations")->setValue(mpCheckDisplayPopulation->isChecked());
-
   if (!commonBeforeRunTask()) return false;
 
   return commonRunTask();
@@ -256,14 +259,13 @@ void CQOptimizationWidget::init()
   QObject::connect(tb, SIGNAL(clicked()), this, SLOT(slotIncreaseTabHeight()));
   pGroupLayout->addWidget(tb);
 
-
   tb = new QToolButton();
   tb->setText("-");
   QObject::connect(tb, SIGNAL(clicked()), this, SLOT(slotDecreaseTabHeight()));
   pGroupLayout->addWidget(tb);
-  
+
   pGroupLayout->setContentsMargins(0, 0, 0, 0);
-  
+
   mpTabWidget->setCornerWidget(pGroup);
 }
 
@@ -277,13 +279,14 @@ void CQOptimizationWidget::slotIncreaseTabHeight()
 void CQOptimizationWidget::slotDecreaseTabHeight()
 {
   auto height = mpTabWidget->height();
+
   if (height < 300)
     return;
+
   height -= 100;
   mpTabWidget->setMinimumHeight(height);
 }
 
-
 void CQOptimizationWidget::destroy()
 {}