- issue 3206: ensure that result widgets are available

copasi · Nov 29, 2023 · ab1b86f · ab1b86f
1 parent bd83159
commit ab1b86f
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 21 deletions.
diff --git a/copasi/UI/CQAnalyticsWidget.cpp b/copasi/UI/CQAnalyticsWidget.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2020 by Pedro Mendes, Rector and Visitors of the
+// 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.
@@ -103,7 +103,7 @@ void CQAnalyticsWidget::init()
   mpTxtOutTime->setValidator(mpValidatorOutTime);
 
   CQTimeSeriesWidget * pResult =
-    dynamic_cast< CQTimeSeriesWidget * >(mpListView->findWidgetFromId(ListViews::WidgetType::AnalyticsResult));
+    dynamic_cast< CQTimeSeriesWidget * >(mpListView->createWidgetFromId(ListViews::WidgetType::AnalyticsResult));
 
   if (pResult != NULL)
     pResult->setTitle("<h2>Analytics Result</h2>");
@@ -193,7 +193,7 @@ bool CQAnalyticsWidget::taskFinishedEvent()
   // We need to load the result here as this is the only place where
   // we know that it is correct.
   CQTimeSeriesWidget * pResult =
-    dynamic_cast< CQTimeSeriesWidget * >(mpListView->findWidgetFromId(ListViews::WidgetType::AnalyticsResult));
+    dynamic_cast< CQTimeSeriesWidget * >(mpListView->createWidgetFromId(ListViews::WidgetType::AnalyticsResult));
 
   if (pResult == NULL)
     return false;

diff --git a/copasi/UI/CQCrossSectionTaskWidget.cpp b/copasi/UI/CQCrossSectionTaskWidget.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2020 by Pedro Mendes, Rector and Visitors of the
+// 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.
@@ -119,7 +119,7 @@ void CQCrossSectionTaskWidget::init()
   mpTxtOutConvergence->setValidator(mpValidatorOutTolerance);
 
   CQTimeSeriesWidget * pResult =
-    dynamic_cast< CQTimeSeriesWidget * >(mpListView->findWidgetFromId(ListViews::WidgetType::CrossSectionResult));
+    dynamic_cast< CQTimeSeriesWidget * >(mpListView->createWidgetFromId(ListViews::WidgetType::CrossSectionResult));
 
   if (pResult != NULL)
     pResult->setTitle("<h2>Cross Section Result</h2>");
@@ -227,7 +227,7 @@ bool CQCrossSectionTaskWidget::taskFinishedEvent()
   // We need to load the result here as this is the only place where
   // we know that it is correct.
   CQTimeSeriesWidget * pResult =
-    dynamic_cast< CQTimeSeriesWidget * >(mpListView->findWidgetFromId(ListViews::WidgetType::CrossSectionResult));
+    dynamic_cast< CQTimeSeriesWidget * >(mpListView->createWidgetFromId(ListViews::WidgetType::CrossSectionResult));
 
   if (pResult == NULL)
     return false;

diff --git a/copasi/UI/CQEFMWidget.cpp b/copasi/UI/CQEFMWidget.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2020 by Pedro Mendes, Rector and Visitors of the
+// 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.
@@ -75,7 +75,7 @@ bool CQEFMWidget::taskFinishedEvent()
   // We need to load the result here as this is the only place where
   // we know that it is correct.
   CQEFMResultWidget * pResult =
-    dynamic_cast< CQEFMResultWidget * >(CopasiWidget::mpListView->findWidgetFromId(ListViews::WidgetType::ElementaryModesResult));
+    dynamic_cast< CQEFMResultWidget * >(CopasiWidget::mpListView->createWidgetFromId(ListViews::WidgetType::ElementaryModesResult));
 
   if (pResult == NULL)
     return false;

diff --git a/copasi/UI/CQLNAWidget.cpp b/copasi/UI/CQLNAWidget.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2020 by Pedro Mendes, Rector and Visitors of the
+// 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.
@@ -92,7 +92,7 @@ bool CQLNAWidget::runTask()
 bool CQLNAWidget::taskFinishedEvent()
 {
   bool success = true;
-  CLNAResultWidget *pResult = dynamic_cast< CLNAResultWidget * >(mpListView->findWidgetFromId(ListViews::WidgetType::LinearNoiseApproximationResult));
+  CLNAResultWidget *pResult = dynamic_cast< CLNAResultWidget * >(mpListView->createWidgetFromId(ListViews::WidgetType::LinearNoiseApproximationResult));
 
   if (pResult) pResult->loadFromBackend();
 

diff --git a/copasi/UI/CQMCAWidget.cpp b/copasi/UI/CQMCAWidget.cpp
@@ -102,7 +102,7 @@ bool CQMCAWidget::runTask()
 bool CQMCAWidget::taskFinishedEvent()
 {
   bool success = true;
-  CMCAResultWidget *pResult = dynamic_cast< CMCAResultWidget * >(mpListView->findWidgetFromId(ListViews::WidgetType::MetabolicControlAnalysisResult));
+  CMCAResultWidget *pResult = dynamic_cast< CMCAResultWidget * >(mpListView->createWidgetFromId(ListViews::WidgetType::MetabolicControlAnalysisResult));
 
   if (pResult) pResult->loadFromBackend();
 

diff --git a/copasi/UI/CQTSSAWidget.cpp b/copasi/UI/CQTSSAWidget.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2020 by Pedro Mendes, Rector and Visitors of the
+// 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.
@@ -244,7 +244,7 @@ bool CQTSSAWidget::taskFinishedEvent()
   // We need to load the result here as this is the only place where
   // we know that it is correct.
   CQTSSAResultWidget * pResult =
-    dynamic_cast< CQTSSAResultWidget * >(mpListView->findWidgetFromId(ListViews::WidgetType::TimeScaleSeparationAnalysisResult));
+    dynamic_cast< CQTSSAResultWidget * >(mpListView->createWidgetFromId(ListViews::WidgetType::TimeScaleSeparationAnalysisResult));
 
   if (pResult == NULL)
     {
@@ -270,7 +270,7 @@ bool CQTSSAWidget::updateProtected(ListViews::ObjectType objectType, ListViews::
     {
       // need to clear annotated matrices, as otherwise they will hold pointers to non-existing things.
       CQTSSAResultWidget * pResult =
-        dynamic_cast< CQTSSAResultWidget * >(mpListView->findWidgetFromId(ListViews::WidgetType::TimeScaleSeparationAnalysisResult));
+        dynamic_cast< CQTSSAResultWidget * >(mpListView->createWidgetFromId(ListViews::WidgetType::TimeScaleSeparationAnalysisResult));
 
       if (pResult == NULL)
         {

diff --git a/copasi/UI/CQTimeSensWidget.cpp b/copasi/UI/CQTimeSensWidget.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2021 by Pedro Mendes, Rector and Visitors of the
+// 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.
@@ -428,7 +428,7 @@ bool CQTimeSensWidget::taskFinishedEvent()
   // We need to load the result here as this is the only place where
   // we know that it is correct.
   CQTimeSeriesWidget * pResult =
-    dynamic_cast< CQTimeSeriesWidget * >(mpListView->findWidgetFromId(ListViews::WidgetType::TimeScaleSeparationAnalysisResult));
+    dynamic_cast< CQTimeSeriesWidget * >(mpListView->createWidgetFromId(ListViews::WidgetType::TimeCourseSensitivitiesResult));
 
   if (pResult == NULL)
     return false;

diff --git a/copasi/UI/CQTrajectoryWidget.cpp b/copasi/UI/CQTrajectoryWidget.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2020 by Pedro Mendes, Rector and Visitors of the
+// 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.
@@ -398,7 +398,7 @@ bool CQTrajectoryWidget::taskFinishedEvent()
   // We need to load the result here as this is the only place where
   // we know that it is correct.
   CQTimeSeriesWidget * pResult =
-    dynamic_cast< CQTimeSeriesWidget * >(mpListView->findWidgetFromId(ListViews::WidgetType::TimeCourseResult));
+    dynamic_cast< CQTimeSeriesWidget * >(mpListView->createWidgetFromId(ListViews::WidgetType::TimeCourseResult));
 
   if (pResult == NULL)
     return false;

diff --git a/copasi/UI/SensitivitiesWidget.cpp b/copasi/UI/SensitivitiesWidget.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 - 2021 by Pedro Mendes, Rector and Visitors of the
+// 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.
@@ -198,7 +198,7 @@ bool SensitivitiesWidget::taskFinishedEvent()
   bool success = true;
   //setup the result widget
   CQSensResultWidget *pResult =
-    dynamic_cast<CQSensResultWidget *>(mpListView->findWidgetFromId(ListViews::WidgetType::SensitivitiesResult));
+    dynamic_cast<CQSensResultWidget *>(mpListView->createWidgetFromId(ListViews::WidgetType::SensitivitiesResult));
 
   if (pResult) pResult->newResult();
 

diff --git a/copasi/UI/SteadyStateWidget.cpp b/copasi/UI/SteadyStateWidget.cpp
@@ -123,7 +123,7 @@ bool SteadyStateWidget::taskFinishedEvent()
     }
 
   CQSteadyStateResult *pResult =
-    dynamic_cast< CQSteadyStateResult * >(mpListView->findWidgetFromId(ListViews::WidgetType::SteadyStateResult));
+    dynamic_cast< CQSteadyStateResult * >(mpListView->createWidgetFromId(ListViews::WidgetType::SteadyStateResult));
 
   if (pResult)
     pResult->loadResult();