Merge fab2b64 into 19c712b

opencor · Jan 20, 2019 · a4803e3 · a4803e3
2 parents 19c712b + fab2b64
commit a4803e3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -41,6 +41,7 @@ var jsonData = { "versions": [
                        { "change": "<strong>COMBINE support:</strong> now recognise files that have a master attribute of \"1\" rather than \"true\" (see issue <a href=\"https://github.com/opencor/opencor/issues/1912\">#1912</a>)." },
                        { "change": "<strong>Graph Panel widget:</strong> fixed a small problem with the scale range of an axis in some cases (see issue <a href=\"https://github.com/opencor/opencor/issues/1941\">#1941</a>)." },
                        { "change": "<strong>CellML Text view:</strong> improved Unicode support (see issue <a href=\"https://github.com/opencor/opencor/issues/1926\">#1926</a>)." },
+                       { "change": "<strong>Simulation Experiment view:</strong> ensure that graph panels are always properly aligned (see issue <a href=\"https://github.com/opencor/opencor/issues/1956\">#1956</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 7.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1917\">#1917</a>). Upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 4.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1929\">#1929</a>). Upgraded the <a href=\"http://qwt.sourceforge.net/\">Qwt</a> library to version 6.1.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/1933\">#1933</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.2.8 (see issue <a href=\"https://github.com/opencor/opencor/issues/1945\">#1945</a>)." }
                      ]
                    },

diff --git a/doc/whatIsNew.js b/doc/whatIsNew.js
@@ -14,6 +14,7 @@ var jsonData = { "versions": [
                          "entries": [
                            { "type": "subCategory", "name": "Simulation Experiment view",
                              "entries": [
+                               { "type": "improved", "description": "Rendering of the <a href=\"https://en.wikipedia.org/wiki/Graphical_user_interface\">GUI</a>." },
                                { "type": "improved", "description": "Plotting of simulations." }
                              ]
                            }

diff --git a/...lationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.cpp b/...lationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.cpp
@@ -1370,7 +1370,7 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::updateGraphIn
     //       title being also changed...
 
     if (newTitle.compare(oldTitle) || graphSymbolUpdated)
-        graph->plot()->updateGui();
+        graph->plot()->updateGui(false, graph->plot()->isLegendActive());
 
     if (   (oldParameterX != graph->parameterX())
         || (oldParameterY != graph->parameterY())) {
@@ -1481,7 +1481,7 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::graphPanelPro
         graphPanelPlot->setZoomRegionFilled(zoomRegionProperties[4]->booleanValue());
         graphPanelPlot->setZoomRegionFillColor(zoomRegionProperties[5]->colorValue());
 
-        graphPanelPlot->updateGui();
+        graphPanelPlot->updateGui(false, true);
     graphPanelPlot->setUpdatesEnabled(true);
 }
 

diff --git a/src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.cpp b/src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.cpp
@@ -3542,7 +3542,7 @@ bool GraphPanelPlotWidget::removeGraph(GraphPanelPlotGraph *pGraph)
     // To remove a graph may affect our GUI (and that of our neighbours), so
     // update it
 
-    updateGui();
+    updateGui(false, isLegendActive());
 
     return true;
 }