Bug 3209: CCopasiParameter::setValue call CCopasiParameterGroup::sign…

…alChanged.
copasi · Mar 14, 2024 · 3d75e03 · 3d75e03
1 parent ae5207e
commit 3d75e03
Show file tree

Hide file tree

Showing 31 changed files with 143 additions and 100 deletions.
diff --git a/copasi/MIRIAM/CMIRIAMResource.h b/copasi/MIRIAM/CMIRIAMResource.h
@@ -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.
@@ -30,7 +30,6 @@
 #define COPASI_CMIRIAMResource
 
 #include "copasi/utilities/CCopasiParameter.h"
-#include "copasi/utilities/CCopasiParameterGroup.h"
 #include <time.h>
 #include <string>
 #include "copasi/utilities/CProcessReport.h"

diff --git a/copasi/UI/CQMmlScrollView.cpp b/copasi/UI/CQMmlScrollView.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2020 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.
@@ -26,14 +26,15 @@
 #include <QApplication>
 
 #include "copasi/copasi.h"
-#include "qtUtilities.h"
 
 #ifdef HAVE_MML
 # include <qtmmlwidget.h>
 #endif // HAVE_MML
 
 #include "CQMmlScrollView.h"
 
+#include "qtUtilities.h"
+
 ///  Constructor
 CQMmlScrollView::CQMmlScrollView(QWidget* parent, const char* /* name */, Qt::WindowFlags /* fl */)
   : QScrollArea(parent)

diff --git a/copasi/UI/CQParameterGroupDM.cpp b/copasi/UI/CQParameterGroupDM.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 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.
@@ -24,7 +24,7 @@
 
 #include "qtUtilities.h"
 
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 #include "copasi/resourcesUI/CQIconResource.h"
 
 #define COL_NAME       0

diff --git a/copasi/UI/CQParameterGroupView.cpp b/copasi/UI/CQParameterGroupView.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2021 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.
@@ -25,7 +25,7 @@
 #include "copasi/copasi.h"
 #include "copasi/UI/qtUtilities.h"
 
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 
 #include "copasi/CopasiDataModel/CDataModel.h"
 #include "copasi/UI/CQParameterGroupDM.h"

diff --git a/copasi/UI/CQSimpleSelectionTree.cpp b/copasi/UI/CQSimpleSelectionTree.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2023 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.
@@ -22,7 +22,6 @@
 #include "copasi/model/CMetab.h"
 #include "copasi/model/CReaction.h"
 #include "copasi/utilities/CCopasiParameter.h"
-#include "copasi/utilities/CCopasiParameterGroup.h"
 #include "copasi/utilities/CExpressionGenerator.h"
 #include "copasi/core/CDataObject.h"
 #include "copasi/core/CDataContainer.h"

diff --git a/copasi/UI/CQTabWidget.cpp b/copasi/UI/CQTabWidget.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2020 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.
@@ -18,12 +18,13 @@
 #include "CQTabWidget.h"
 
 #include "CQMessageBox.h"
-#include "qtUtilities.h"
 #include "CQNotes.h"
 
 #include "copasi/MIRIAMUI/CQMiriamWidget.h"
 #include "copasi/MIRIAMUI/CQRDFTreeView.h"
 
+#include "qtUtilities.h"
+
 #include "copasi/CopasiDataModel/CDataModel.h"
 #include "copasi/core/CRootContainer.h"
 #include "copasi/function/CFunction.h"

diff --git a/copasi/UI/CScanItemData.cpp b/copasi/UI/CScanItemData.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 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.
@@ -15,7 +15,7 @@
 
 #include "copasi/copasi.h"
 #include "CScanItemData.h"
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 
 CScanItemData::CScanItemData() :
   mType(CScanProblem::SCAN_BREAK),

diff --git a/copasi/UI/CScanWidgetTask.cpp b/copasi/UI/CScanWidgetTask.cpp
@@ -31,7 +31,7 @@
 
 #include "copasi/copasi.h"
 
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 #include "copasi/core/CRegisteredCommonName.h"
 #include "copasi/scan/CScanProblem.h"
 

diff --git a/copasi/UI/qtUtilities.cpp b/copasi/UI/qtUtilities.cpp
@@ -1,26 +1,26 @@
-// Copyright (C) 2019 - 2023 by Pedro Mendes, Rector and Visitors of the 
-// University of Virginia, University of Heidelberg, and University 
-// of Connecticut School of Medicine. 
-// All rights reserved. 
-
-// Copyright (C) 2017 - 2018 by Pedro Mendes, Virginia Tech Intellectual 
-// Properties, Inc., University of Heidelberg, and University of 
-// of Connecticut School of Medicine. 
-// All rights reserved. 
-
-// Copyright (C) 2010 - 2016 by Pedro Mendes, Virginia Tech Intellectual 
-// Properties, Inc., University of Heidelberg, and The University 
-// of Manchester. 
-// All rights reserved. 
-
-// Copyright (C) 2008 - 2009 by Pedro Mendes, Virginia Tech Intellectual 
-// Properties, Inc., EML Research, gGmbH, University of Heidelberg, 
-// and The University of Manchester. 
-// All rights reserved. 
-
-// Copyright (C) 2003 - 2007 by Pedro Mendes, Virginia Tech Intellectual 
-// Properties, Inc. and EML Research, gGmbH. 
-// All rights reserved. 
+// 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.
+
+// Copyright (C) 2017 - 2018 by Pedro Mendes, Virginia Tech Intellectual
+// Properties, Inc., University of Heidelberg, and University of
+// of Connecticut School of Medicine.
+// All rights reserved.
+
+// Copyright (C) 2010 - 2016 by Pedro Mendes, Virginia Tech Intellectual
+// Properties, Inc., University of Heidelberg, and The University
+// of Manchester.
+// All rights reserved.
+
+// Copyright (C) 2008 - 2009 by Pedro Mendes, Virginia Tech Intellectual
+// Properties, Inc., EML Research, gGmbH, University of Heidelberg,
+// and The University of Manchester.
+// All rights reserved.
+
+// Copyright (C) 2003 - 2007 by Pedro Mendes, Virginia Tech Intellectual
+// Properties, Inc. and EML Research, gGmbH.
+// All rights reserved.
 
 #include <QtCore/QString>
 #include <QtCore/QFileInfo>
@@ -38,7 +38,7 @@
 #include <copasi/commandline/CConfigurationFile.h>
 #include "qtUtilities.h"
 #include "CQMessageBox.h"
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 #include "copasi/utilities/CDirEntry.h"
 #include "copasiWidget.h"
 #include "CQCopasiApplication.h"
@@ -109,14 +109,18 @@ QVariant getParameterValue(const CCopasiParameter * pParameter)
       case CCopasiParameter::Type::GROUP:
       {
         const CCopasiParameterGroup * pGroup = dynamic_cast<const CCopasiParameterGroup *>(pParameter);
+
         if (pGroup != NULL)
-        { 
-          QList<QVariant> group;
-          for (size_t i = 0; i < pGroup->size(); ++i)
-            group.append(getParameterValue(pGroup->getParameter(i)));
-          return QVariant(group);
-        }
+          {
+            QList<QVariant> group;
+
+            for (size_t i = 0; i < pGroup->size(); ++i)
+              group.append(getParameterValue(pGroup->getParameter(i)));
+
+            return QVariant(group);
+          }
       }
+
       case CCopasiParameter::Type::INVALID:
         break;
     }
@@ -394,7 +398,6 @@ QString toTsvString(QAbstractItemView* pWidget,
   return toTsvString(pModel, writeColumnHeaders, writeRowHeaders);
 }
 
-
 bool isDarkMode()
 {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
@@ -410,5 +413,5 @@ bool isDarkMode()
 
 bool isLightMode()
 {
-    return !isDarkMode();
+  return !isDarkMode();
 }
diff --git a/copasi/bindings/swig/CCopasiParameterGroup.i b/copasi/bindings/swig/CCopasiParameterGroup.i
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 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. 
@@ -25,7 +25,7 @@
 
 %{
 
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 
 %}
 

diff --git a/copasi/commandline/CConfigurationFile.h b/copasi/commandline/CConfigurationFile.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2021 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.
@@ -25,7 +25,7 @@
 #ifndef COPASI_CConfigurationFile
 #define COPASI_CConfigurationFile
 
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 #include "copasi/MIRIAM/CMIRIAMResource.h"
 #include "copasi/xml/CCopasiXMLInterface.h"
 

diff --git a/copasi/model/CReaction.h b/copasi/model/CReaction.h
@@ -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.
@@ -43,7 +43,7 @@
 #include "copasi/model/CCompartment.h"
 
 #include "copasi/core/CDataVector.h"
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 #include "copasi/function/CFunction.h"
 #include "copasi/function/CCallParameters.h"
 #include "copasi/function/CFunctionParameters.h"

diff --git a/copasi/optimization/COptItem.cpp b/copasi/optimization/COptItem.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.
@@ -37,7 +37,7 @@
 #include "copasi/core/CDataContainer.h"
 #include "copasi/CopasiDataModel/CDataModel.h"
 #include "copasi/core/CRegisteredCommonName.h"
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 #include "copasi/utilities/CCopasiMessage.h"
 #include "copasi/utilities/utility.h"
 

diff --git a/copasi/optimization/COptItem.h b/copasi/optimization/COptItem.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2023 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.
@@ -25,7 +25,7 @@
 #ifndef COPASI_COptItem
 #define COPASI_COptItem
 
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 #include "copasi/math/CMathUpdateSequence.h"
 
 class CCommonName;

diff --git a/copasi/parameterFitting/CExperiment.h b/copasi/parameterFitting/CExperiment.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2023 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.
@@ -30,7 +30,7 @@
 #include "copasi/core/CDataVector.h"
 #include "copasi/core/CMatrix.h"
 #include "copasi/core/CVector.h"
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 #include "copasi/utilities/CCopasiTask.h"
 
 class CExperimentObjectMap;

diff --git a/copasi/parameterFitting/CExperimentObjectMap.h b/copasi/parameterFitting/CExperimentObjectMap.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2023 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.
@@ -28,7 +28,7 @@
 #include "copasi/core/CVector.h"
 #include "copasi/parameterFitting/CExperiment.h"
 
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 
 class CMathContainer;
 

diff --git a/copasi/parameterFitting/CExperimentSet.h b/copasi/parameterFitting/CExperimentSet.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 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.
@@ -28,7 +28,7 @@
 #include <string>
 
 #include "copasi/core/CMatrix.h"
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 #include "copasi/utilities/CCopasiTask.h"
 
 class CExperiment;

diff --git a/copasi/parameterFitting/CFitItem.cpp b/copasi/parameterFitting/CFitItem.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.
@@ -30,7 +30,7 @@
 #include "CFitItem.h"
 
 #include "copasi/report/CKeyFactory.h"
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 #include "copasi/CopasiDataModel/CDataModel.h"
 #include "copasi/core/CRootContainer.h"
 

diff --git a/copasi/plot/CPlotItem.h b/copasi/plot/CPlotItem.h
@@ -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.
@@ -33,7 +33,7 @@
 #include <vector>
 #include "copasi/copasi.h"
 
-#include "copasi/utilities/CCopasiParameterGroup.h"
+#include "copasi/utilities/CCopasiParameter.h"
 #include "copasi/core/CRegisteredCommonName.h"
 #include "copasi/output/COutputHandler.h"