Bug 3221: Renaming is only performed in the model the change occurs.

copasi · Mar 19, 2024 · 356adb4 · 356adb4
1 parent 6286e96
commit 356adb4
Show file tree

Hide file tree

Showing 180 changed files with 1,042 additions and 992 deletions.
diff --git a/copasi/CopasiDataModel/CDataModel.cpp b/copasi/CopasiDataModel/CDataModel.cpp
diff --git a/copasi/MIRIAMUI/CQMiriamWidget.cpp b/copasi/MIRIAMUI/CQMiriamWidget.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.
@@ -120,8 +120,8 @@ CQMiriamWidget::CQMiriamWidget(QWidget *parent, const char *name)
 
       connect((*itDM), SIGNAL(signalNotifyChanges(const CUndoData::CChangeSet &)),
               this, SLOT(slotNotifyChanges(const CUndoData::CChangeSet &)));
-      connect((*itDM), SIGNAL(notifyGUI(ListViews::ObjectType, ListViews::Action, const CCommonName &)),
-              this, SLOT(protectedNotify(ListViews::ObjectType, ListViews::Action, const CCommonName &)));
+      connect((*itDM), SIGNAL(notifyGUI(ListViews::ObjectType, ListViews::Action, const CRegisteredCommonName &)),
+              this, SLOT(protectedNotify(ListViews::ObjectType, ListViews::Action, const CRegisteredCommonName &)));
       connect((*itDM), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
               this, SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
     }
@@ -313,7 +313,7 @@ void CQMiriamWidget::slotBtnClearClicked()
     }
 }
 
-bool CQMiriamWidget::updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CCommonName & cn)
+bool CQMiriamWidget::updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CRegisteredCommonName & cn)
 {
   // Assure that the pointer is still valid;
   mpAnnotation = CAnnotation::castObject(mpObject);
@@ -327,7 +327,7 @@ bool CQMiriamWidget::updateProtected(ListViews::ObjectType objectType, ListViews
       mpModifiedDM->setMIRIAMInfo(NULL);
 
       mpMIRIAMInfo = NULL;
-      mObjectCN = CCommonName("");
+      mObjectCN = CRegisteredCommonName();
 
       return true;
     }

diff --git a/copasi/MIRIAMUI/CQMiriamWidget.h b/copasi/MIRIAMUI/CQMiriamWidget.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.
@@ -49,7 +49,7 @@ class CQMiriamWidget : public CopasiWidget, public Ui::CQMiriamWidget
 
 protected:
   virtual bool enterProtected();
-  virtual bool updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CCommonName & cn);
+  virtual bool updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CRegisteredCommonName & cn) override;
   virtual bool leaveProtected();
   virtual void showEvent(QShowEvent * event);
 

diff --git a/copasi/MIRIAMUI/CQRDFTreeView.cpp b/copasi/MIRIAMUI/CQRDFTreeView.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.
@@ -54,7 +54,7 @@ CQRDFTreeView::~CQRDFTreeView()
 
 bool CQRDFTreeView::updateProtected(ListViews::ObjectType /* objectType */,
                                     ListViews::Action /* action */,
-                                    const CCommonName & cn)
+                                    const CRegisteredCommonName & cn)
 {
   // Assure that the pointer is still valid;
   mpAnnotation = CAnnotation::castObject(mpObject);

diff --git a/copasi/MIRIAMUI/CQRDFTreeView.h b/copasi/MIRIAMUI/CQRDFTreeView.h
@@ -1,4 +1,9 @@
-// Copyright (C) 2017 by Pedro Mendes, Virginia Tech Intellectual
+// 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.
@@ -35,7 +40,7 @@ class CQRDFTreeView : public CopasiWidget, public Ui::CQRDFTreeView
   CQRDFTreeView(QWidget* parent = 0, const char* name = 0);
   virtual ~CQRDFTreeView();
 
-  virtual bool updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CCommonName & cn);
+  virtual bool updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CRegisteredCommonName & cn) override;
 
 protected:
   virtual bool enterProtected();

diff --git a/copasi/UI/CLNAResultWidget.cpp b/copasi/UI/CLNAResultWidget.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.
@@ -69,7 +69,7 @@ bool CLNAResultWidget::saveToBackend()
 
 bool CLNAResultWidget::updateProtected(ListViews::ObjectType objectType,
                                        ListViews::Action action,
-                                       const CCommonName & cn)
+                                       const CRegisteredCommonName & cn)
 {
   if (objectType == ListViews::ObjectType::MODEL && action == ListViews::ADD)
     mCentralWidget->loadAll(NULL);

diff --git a/copasi/UI/CLNAResultWidget.h b/copasi/UI/CLNAResultWidget.h
@@ -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.
@@ -35,7 +35,7 @@ protected slots:
 
 protected:
   virtual bool enterProtected();
-  virtual bool updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CCommonName & cn);
+  virtual bool updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CRegisteredCommonName & cn) override;
   virtual bool leaveProtected();
 
   bool saveToBackend();

diff --git a/copasi/UI/CMCAResultWidget.cpp b/copasi/UI/CMCAResultWidget.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.
@@ -81,7 +81,7 @@ bool CMCAResultWidget::saveToBackend()
 
 bool CMCAResultWidget::updateProtected(ListViews::ObjectType objectType,
                                        ListViews::Action action,
-                                       const CCommonName & cn)
+                                       const CRegisteredCommonName & cn)
 {
   if (objectType == ListViews::ObjectType::MODEL && action == ListViews::ADD)
     mCentralWidget->loadAll(NULL);

diff --git a/copasi/UI/CMCAResultWidget.h b/copasi/UI/CMCAResultWidget.h
@@ -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.
@@ -45,7 +45,7 @@ protected slots:
 
 protected:
   virtual bool enterProtected();
-  virtual bool updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CCommonName & cn);
+  virtual bool updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CRegisteredCommonName & cn) override;
   virtual bool leaveProtected();
 
   bool saveToBackend();

diff --git a/copasi/UI/CQAnalyticsWidget.cpp b/copasi/UI/CQAnalyticsWidget.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.
@@ -363,7 +363,7 @@ void CQAnalyticsWidget::updateValues()
 }
 
 // virtual
-bool CQAnalyticsWidget::updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CCommonName & cn)
+bool CQAnalyticsWidget::updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CRegisteredCommonName & cn)
 {
   TaskWidget::updateProtected(objectType, action, cn);
 

diff --git a/copasi/UI/CQAnalyticsWidget.h b/copasi/UI/CQAnalyticsWidget.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.
@@ -45,7 +45,7 @@ class CQAnalyticsWidget : public TaskWidget, public Ui::CQAnalyticsWidget
   virtual bool saveTaskProtected();
   virtual bool loadTaskProtected();
   virtual bool taskFinishedEvent();
-  virtual bool updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CCommonName & cn);
+  virtual bool updateProtected(ListViews::ObjectType objectType, ListViews::Action action, const CRegisteredCommonName & cn) override;
 
 protected slots:
 

diff --git a/copasi/UI/CQBaseDataModel.h b/copasi/UI/CQBaseDataModel.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.
@@ -76,7 +76,7 @@ public slots:
   bool mFetchDisabled;
 
 signals:
-  void notifyGUI(ListViews::ObjectType objectType, ListViews::Action action, const CCommonName & cn);
+  void notifyGUI(ListViews::ObjectType objectType, ListViews::Action action, const CRegisteredCommonName & cn);
   void signalNotifyChanges(const CUndoData::CChangeSet & changes);
 };
 

diff --git a/copasi/UI/CQBaseTreeDataModel.h b/copasi/UI/CQBaseTreeDataModel.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 by Pedro Mendes, Rector and Visitors of the
+// Copyright (C) 2020 - 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.
@@ -53,7 +53,7 @@ public slots:
   int mFramework;
 
 signals:
-  void notifyGUI(ListViews::ObjectType objectType, ListViews::Action action, const CCommonName & cn);
+  void notifyGUI(ListViews::ObjectType objectType, ListViews::Action action, const CRegisteredCommonName & cn);
   void signalNotifyChanges(const CUndoData::CChangeSet & changes);
 };