Changeset a1b67a1 in OpenModelica

Timestamp:

2021-11-24T10:16:45+01:00 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

15cb3945, cb10fe1, cd360922

Parents:

7bb55ae

git-author:

Adeel Asghar <adeel.asghar@…> (11/24/21 10:16:45)

git-committer:

GitHub <noreply@…> (11/24/21 10:16:45)

Message:

Convert the parameters to base unit when exporting to csv (#8212)

Fixes #8206

File:

• OMEdit/OMEditLIB/Plotting/PlotWindowContainer.cpp (modified) (1 diff)

OMEdit/OMEditLIB/Plotting/PlotWindowContainer.cpp

@@ -582 +582 @@
     data << QString::number(timeVector.at(i));
     foreach (PlotCurve *pPlotCurve, pPlotWindow->getPlot()->getPlotCurvesList()) {
+      double value;
       if (pPlotCurve && pPlotCurve->mYAxisVector.size() > i) { // parameters have just start and stop points in the dataset
-        OMCInterface::convertUnits_res convertUnit = MainWindow::instance()->getOMCProxy()->convertUnits(pPlotCurve->getYDisplayUnit(), pPlotCurve->getYUnit());
-        if (convertUnit.unitsCompatible) {
-          data << StringHandler::number(Utilities::convertUnit(pPlotCurve->mYAxisVector.at(i), convertUnit.offset, convertUnit.scaleFactor));
-        } else {
-          data << StringHandler::number(pPlotCurve->mYAxisVector.at(i));
-        }
+        value = pPlotCurve->mYAxisVector.at(i);
       } else if (pPlotCurve && pPlotCurve->mYAxisVector.size() > 0) { // Set last value to have constant values for parameters
-        data << StringHandler::number(pPlotCurve->mYAxisVector.last());
-      } else { // otherwise set value to 0. But perhaps we should never reach there.
-        data << StringHandler::number(0);
+        value = pPlotCurve->mYAxisVector.last();
+      } else { // otherwise set value to 0.0 but perhaps we should never reach there.
+        value = 0.0;
+      }
+      OMCInterface::convertUnits_res convertUnit = MainWindow::instance()->getOMCProxy()->convertUnits(pPlotCurve->getYDisplayUnit(), pPlotCurve->getYUnit());
+      if (convertUnit.unitsCompatible) {
+        data << StringHandler::number(Utilities::convertUnit(value, convertUnit.offset, convertUnit.scaleFactor));
+      } else {
+        data << StringHandler::number(value);
       }
     }