SimulationExperiment view: make sure that our graph panels are proper…

…ly reinitialised when reloading a SED-ML file (#1426).
opencor · Nov 14, 2017 · d788feb · d788feb
1 parent 8082eff
commit d788feb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/...lationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.cpp b/...lationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.cpp
@@ -765,6 +765,16 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::setGraphPanel
 
 //==============================================================================
 
+void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::reinitialize(GraphPanelWidget::GraphPanelWidget *pGraphPanel)
+{
+    // Reinitialise ourselves
+
+    finalize(pGraphPanel);
+    initialize(pGraphPanel);
+}
+
+//==============================================================================
+
 void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::showGraphPanelContextMenu(const QPoint &pPosition) const
 {
     Q_UNUSED(pPosition);

diff --git a/...mulationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.h b/...mulationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.h
@@ -106,6 +106,8 @@ class SimulationExperimentViewInformationGraphPanelAndGraphsWidget : public QSta
 
     void setGraphPanelSectionExpanded(const int &pSection, const bool &pExpanded);
 
+    void reinitialize(GraphPanelWidget::GraphPanelWidget *pGraphPanel);
+
 private:
     Mode mMode;
 

diff --git a/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp b/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp
@@ -2454,11 +2454,13 @@ bool SimulationExperimentViewSimulationWidget::furtherInitialize()
 
         libsedml::SedPlot2D *sedmlPlot2d = static_cast<libsedml::SedPlot2D *>(sedmlDocument->getOutput(i));
         GraphPanelWidget::GraphPanelWidget *graphPanel = graphPanelsWidget->graphPanels()[i];
+        SimulationExperimentViewInformationGraphPanelAndGraphsWidget *graphPanelAndGraphsWidget = mContentsWidget->informationWidget()->graphPanelAndGraphsWidget();
+
+        graphPanelAndGraphsWidget->reinitialize(graphPanel);
 
         annotation = sedmlPlot2d->getAnnotation();
 
         if (annotation) {
-            SimulationExperimentViewInformationGraphPanelAndGraphsWidget *graphPanelAndGraphsWidget = mContentsWidget->informationWidget()->graphPanelAndGraphsWidget();
             Core::Properties graphPanelProperties = graphPanelAndGraphsWidget->graphPanelProperties(graphPanel);
 
             for (uint i = 0, iMax = annotation->getNumChildren(); i < iMax; ++i) {