Merge 44b10f4 into fd80a0b

opencor · Oct 3, 2019 · 0682af5 · 0682af5
2 parents fd80a0b + 44b10f4
commit 0682af5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 24 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -38,7 +38,7 @@ var jsonData = { "versions": [
                      ],
                      "changes": [
                        { "change": "<strong>SED-ML support:</strong> added support left and right triangle symbols (see issue <a href=\"https://github.com/opencor/opencor/issues/2173\">#2173</a>)." },
-                       { "change": "<strong>Simulation Experiment view:</strong> properly handle the Graph Panel properties (see issue <a href=\"https://github.com/opencor/opencor/issues/2171\">#2171</a>)." },
+                       { "change": "<strong>Simulation Experiment view:</strong> properly handle the Graph Panel properties (see issue <a href=\"https://github.com/opencor/opencor/issues/2171\">#2171</a>). Make sure that curves are plotted with all of their original settings when reloading a SED-ML file (see issue <a href=\"https://github.com/opencor/opencor/issues/2176\">#2176</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded the <a href=\"https://www.openssl.org/\">OpenSSL</a> library to version 1.1.1d (see issue <a href=\"https://github.com/opencor/opencor/issues/2157\">#2157</a>). Upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 9.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2161\">#2161</a>)." }
                      ]
                    },

diff --git a/scripts/genericclean b/scripts/genericclean
@@ -9,11 +9,7 @@ fi
 rm -fr build/.clang-tidy build/.ninja* build/* > /dev/null 2>&1
 
 if [ "$1" = "all" ]; then
-    extPath=ext
-else
-    extPath=ext/doc
+    rm -fr ext/* > /dev/null 2>&1
 fi
 
-rm -fr $extPath/* > /dev/null 2>&1
-
 echo "\033[42;37;1mAll done!\033[0m"
diff --git a/scripts/genericclean.bat b/scripts/genericclean.bat
@@ -17,16 +17,12 @@ IF EXIST %CurrentPath%\build (
 )
 
 IF "%1" == "all" (
-    SET ExtPath=%CurrentPath%\ext
-) ELSE (
-    SET ExtPath=%CurrentPath%\ext\doc
-)
-
-IF EXIST %ExtPath% (
-    CD %ExtPath%
+    IF EXIST %CurrentPath%\ext (
+        CD %CurrentPath%\ext
 
-    FOR /D %%I IN (*.*) DO RMDIR /S /Q "%%I"
-    FOR    %%I IN (*.*) DO IF NOT "%%I" == ".gitignore" DEL /Q "%%I"
+        FOR /D %%I IN (*.*) DO RMDIR /S /Q "%%I"
+        FOR    %%I IN (*.*) DO IF NOT "%%I" == ".gitignore" DEL /Q "%%I"
+    )
 )
 
 CD %CurrentPath%
diff --git a/src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.cpp b/src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.cpp
@@ -1782,15 +1782,19 @@ void GraphPanelPlotWidget::changeEvent(QEvent *pEvent)
 
                     setGridLinesColor(mEnabledGridLinesColor);
 
+                    int index = -1;
+
                     for (auto graph : mGraphs) {
                         const QwtSymbol *graphSymbol = graph->symbol();
                         QwtSymbol::Style graphSymbolStyle = graphSymbol->style();
                         QSize graphSymbolSize = graphSymbol->size();
 
-                        graph->setPen(mEnabledGraphPens.value(graph));
+                        ++index;
+
+                        graph->setPen(mEnabledGraphPens[index]);
                         graph->setSymbol(graphSymbolStyle,
-                                         mEnabledGraphSymbolBrushes.value(graph),
-                                         mEnabledGraphSymbolPens.value(graph),
+                                         mEnabledGraphSymbolBrushes[index],
+                                         mEnabledGraphSymbolPens[index],
                                          graphSymbolSize);
                     }
 
@@ -1818,9 +1822,9 @@ void GraphPanelPlotWidget::changeEvent(QEvent *pEvent)
                 for (auto graph : mGraphs) {
                     const QwtSymbol *graphSymbol = graph->symbol();
 
-                    mEnabledGraphPens.insert(graph, graph->pen());
-                    mEnabledGraphSymbolBrushes.insert(graph, graphSymbol->brush());
-                    mEnabledGraphSymbolPens.insert(graph, graphSymbol->pen());
+                    mEnabledGraphPens << graph->pen();
+                    mEnabledGraphSymbolBrushes << graphSymbol->brush();
+                    mEnabledGraphSymbolPens << graphSymbol->pen();
                 }
 
                 // Use a disabled looking colour for different things

diff --git a/src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.h b/src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.h
@@ -588,9 +588,9 @@ class GRAPHPANELWIDGET_EXPORT GraphPanelPlotWidget : public QwtPlot,
 
     QColor mEnabledGridLinesColor;
 
-    QMap<GraphPanelPlotGraph *, QPen> mEnabledGraphPens;
-    QMap<GraphPanelPlotGraph *, QBrush> mEnabledGraphSymbolBrushes;
-    QMap<GraphPanelPlotGraph *, QPen> mEnabledGraphSymbolPens;
+    QList<QPen> mEnabledGraphPens;
+    QList<QBrush> mEnabledGraphSymbolBrushes;
+    QList<QPen> mEnabledGraphSymbolPens;
 
     Action mAction = Action::None;