Changeset b0383b2 in OpenModelica

Timestamp:

2018-05-09T10:45:21+02:00 (6 years ago)

Author:

Adeel Asghar <adeas31@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

57f144b7

Parents:

a86472e (diff), afcb6057 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into oms

Location:

OMEdit/OMEditGUI

Files:

• OMC/OMCProxy.cpp (modified) (1 diff)
• Plotting/VariablesWidget.cpp (modified) (5 diffs)

OMEdit/OMEditGUI/OMC/OMCProxy.cpp

@@ -2501 +2501 @@
   // go through the list of links and convert them if needed.
   foreach (QString attribute, attributeMatches) {
-    if (attribute.startsWith("modelica://")) {
+    // ticket:4923 Modelica specification allows both modelica:// and Modelica://
+    if (attribute.startsWith("modelica://") || attribute.startsWith("Modelica://")) {
       QString fileName = uriToFilename(attribute);
 #ifdef WIN32

OMEdit/OMEditGUI/Plotting/VariablesWidget.cpp

@@ -1501 +1501 @@
         }
       }
-    } else if (pPlotWindow->getPlotType() == PlotWindow::PLOTPARAMETRIC) {  // if plottype is PLOTPARAMETRIC then
+    } else if (pPlotWindow->getPlotType() == PlotWindow::PLOTPARAMETRIC || pPlotWindow->getPlotType() == PlotWindow::PLOTARRAYPARAMETRIC) {  // if plottype is PLOTPARAMETRIC or PLOTARRAYPARAMETRIC then
       // check the item checkstate
       if (pVariablesTreeItem->isChecked()) {
@@ -1535 +1535 @@
             if (pPlotWindow->getPlotType() == PlotWindow::PLOTPARAMETRIC)
                 pPlotWindow->plotParametric(pPlotCurve);
-            else/* ie. (pPlotWindow->getPlotType() == PlotWindow::PLOTARRAYPARAMETRIC)*/{
+            else /* ie. (pPlotWindow->getPlotType() == PlotWindow::PLOTARRAYPARAMETRIC)*/{
               double timePercent = mpSimulationTimeSlider->value();
               pPlotWindow->plotArrayParametric(timePercent,pPlotCurve);
@@ -1772 +1772 @@
   PlotWindow *pPlotWindow = MainWindow::instance()->getPlotWindowContainer()->getCurrentWindow();
   if (pPlotWindow) {
-    //PLOT, PLOTALL, PLOTPARAMETRIC, PLOTARRAY, PLOTARRAYPARAMETRIC}
     PlotWindow::PlotType plotType = pPlotWindow->getPlotType();
-    if (plotType == PlotWindow::PLOT ||
-        plotType == PlotWindow::PLOTALL ||
-        plotType == PlotWindow::PLOTPARAMETRIC) {
-      return;
-    }
-    QList<PlotCurve*> curves = pPlotWindow->getPlot()->getPlotCurvesList();
     if (plotType == PlotWindow::PLOTARRAY) {
+      QList<PlotCurve*> curves = pPlotWindow->getPlot()->getPlotCurvesList();
       foreach (PlotCurve* curve, curves) {
         QString varName = curve->getYVariable();
@@ -1787 +1781 @@
       }
     } else if (plotType == PlotWindow::PLOTARRAYPARAMETRIC) {
+      QList<PlotCurve*> curves = pPlotWindow->getPlot()->getPlotCurvesList();
       foreach (PlotCurve* curve, curves) {
         QString xVarName = curve->getXVariable();
@@ -1793 +1788 @@
         pPlotWindow->plotArrayParametric(timePercent, curve);
       }
+    } else {
+      return;
     }
   }