Store display unit.

OpenModelica · Mar 23, 2016 · b657a9f · b657a9f
1 parent 49f69c6
commit b657a9f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/OMPlot/OMPlotGUI/PlotCurve.cpp b/OMPlot/OMPlotGUI/PlotCurve.cpp
@@ -41,14 +41,15 @@
 
 using namespace OMPlot;
 
-PlotCurve::PlotCurve(QString fileName, QString variableName, QString unit, Plot *pParent)
+PlotCurve::PlotCurve(QString fileName, QString variableName, QString unit, QString displayUnit, Plot *pParent)
   : mCustomColor(false)
 {
   mName = variableName;
   mNameStructure = fileName + "." + variableName;
   mFileName = fileName;
   mCustomColor = false;
   setUnit(unit);
+  setDisplayUnit(displayUnit);
   setTitleLocal();
   mpParentPlot = pParent;
   /* set curve width and style */
@@ -67,10 +68,10 @@ PlotCurve::~PlotCurve()
 
 void PlotCurve::setTitleLocal()
 {
-  if (getUnit().isEmpty()) {
+  if (getDisplayUnit().isEmpty()) {
     QwtPlotItem::setTitle(getName());
   } else {
-    QwtPlotItem::setTitle(getName() + " [" + getUnit() + "]");
+    QwtPlotItem::setTitle(getName() + " [" + getDisplayUnit() + "]");
   }
 }
 
@@ -158,6 +159,11 @@ void PlotCurve::addYAxisValue(double value)
   mYAxisVector.push_back(value);
 }
 
+void PlotCurve::updateYAxisValue(int index, double value)
+{
+  mYAxisVector.replace(index, value);
+}
+
 const double* PlotCurve::getYAxisVector() const
 {
   return mYAxisVector.data();

diff --git a/OMPlot/OMPlotGUI/PlotCurve.h b/OMPlot/OMPlotGUI/PlotCurve.h
@@ -50,19 +50,22 @@ class PlotCurve : public QwtPlotCurve
   QString mYVariable;
   bool mCustomColor;
   QString mUnit;
+  QString mDisplayUnit;
   qreal mWidth;
   int mStyle;
 
   Plot *mpParentPlot;
 public:
-  PlotCurve(QString fileName, QString variableName, QString unit, Plot *pParent);
+  PlotCurve(QString fileName, QString variableName, QString unit, QString displayUnit, Plot *pParent);
   ~PlotCurve();
 
   void setTitleLocal();
   Qt::PenStyle getPenStyle(int style);
   QwtPlotCurve::CurveStyle getCurveStyle(int style);
   void setUnit(QString unit) {mUnit = unit;}
   QString getUnit() {return mUnit;}
+  void setDisplayUnit(QString displayUnit) {mDisplayUnit = displayUnit;}
+  QString getDisplayUnit() {return mDisplayUnit;}
   void setCurveWidth(qreal width);
   qreal getCurveWidth() {return mWidth;}
   void setCurveStyle(int style);
@@ -75,6 +78,7 @@ class PlotCurve : public QwtPlotCurve
   void setYAxisVector(QVector<double> vector);
   QVector<double> getYAxisData();
   void addYAxisValue(double value);
+  void updateYAxisValue(int index, double value);
   const double* getYAxisVector() const;
   void clearYAxisVector() {mYAxisVector.clear();}
   int getSize();

diff --git a/OMPlot/OMPlotGUI/PlotWindow.cpp b/OMPlot/OMPlotGUI/PlotWindow.cpp
@@ -104,6 +104,7 @@ void PlotWindow::initializePlot(QStringList arguments)
   setXLabel(QString(arguments[7]));
   setYLabel(QString(arguments[8]));
   setUnit("");
+  setDisplayUnit("");
   setXRange(QString(arguments[9]).toDouble(), QString(arguments[10]).toDouble());
   setYRange(QString(arguments[11]).toDouble(), QString(arguments[12]).toDouble());
   setCurveWidth(QString(arguments[13]).toDouble());
@@ -295,7 +296,7 @@ void PlotWindow::plot(PlotCurve *pPlotCurve)
         {
           variablesPlotted.append(currentVariable);
           if (!editCase) {
-            pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), currentVariable, getUnit(), mpPlot);
+            pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), currentVariable, getUnit(), getDisplayUnit(), mpPlot);
             mpPlot->addPlotCurve(pPlotCurve);
           }
           // clear previous curve data
@@ -310,8 +311,7 @@ void PlotWindow::plot(PlotCurve *pPlotCurve)
             pPlotCurve->addYAxisValue(QString(values[1]).toDouble());
             currentLine = mpTextStream->readLine();
           }
-          pPlotCurve->setData(pPlotCurve->getXAxisVector(), pPlotCurve->getYAxisVector(),
-                              pPlotCurve->getSize());
+          pPlotCurve->setData(pPlotCurve->getXAxisVector(), pPlotCurve->getYAxisVector(), pPlotCurve->getSize());
           pPlotCurve->attach(mpPlot);
           mpPlot->replot();
         }
@@ -357,7 +357,7 @@ void PlotWindow::plot(PlotCurve *pPlotCurve)
         }
 
         if (!editCase) {
-          pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), csvReader->variables[i], getUnit(), mpPlot);
+          pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), csvReader->variables[i], getUnit(), getDisplayUnit(), mpPlot);
           mpPlot->addPlotCurve(pPlotCurve);
         }
         // clear previous curve data
@@ -406,7 +406,7 @@ void PlotWindow::plot(PlotCurve *pPlotCurve)
         variablesPlotted.append(reader.allInfo[i].name);
         // create the plot curve for variable
         if (!editCase) {
-          pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), reader.allInfo[i].name, getUnit(), mpPlot);
+          pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), reader.allInfo[i].name, getUnit(), getDisplayUnit(), mpPlot);
           mpPlot->addPlotCurve(pPlotCurve);
         }
         // read the variable values
@@ -520,7 +520,7 @@ void PlotWindow::plotParametric(PlotCurve *pPlotCurve)
             if (variablesPlotted.size() == 1)
             {
               if (!editCase) {
-                pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), yVariable + " vs " + xVariable, getUnit(), mpPlot);
+                pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), yVariable + " vs " + xVariable, getUnit(), getDisplayUnit(), mpPlot);
                 pPlotCurve->setXVariable(xVariable);
                 pPlotCurve->setYVariable(yVariable);
                 mpPlot->addPlotCurve(pPlotCurve);
@@ -590,7 +590,7 @@ void PlotWindow::plotParametric(PlotCurve *pPlotCurve)
       }
 
       if (!editCase) {
-        pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), yVariable + " vs " + xVariable, getUnit(), mpPlot);
+        pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), yVariable + " vs " + xVariable, getUnit(), getDisplayUnit(), mpPlot);
         pPlotCurve->setXVariable(xVariable);
         pPlotCurve->setYVariable(yVariable);
         mpPlot->addPlotCurve(pPlotCurve);
@@ -624,7 +624,7 @@ void PlotWindow::plotParametric(PlotCurve *pPlotCurve)
         throw PlotException(msg);
 
       if (!editCase) {
-        pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), yVariable + " vs " + xVariable, getUnit(), mpPlot);
+        pPlotCurve = new PlotCurve(QFileInfo(mFile).fileName(), yVariable + " vs " + xVariable, getUnit(), getDisplayUnit(), mpPlot);
         pPlotCurve->setXVariable(xVariable);
         pPlotCurve->setYVariable(yVariable);
         mpPlot->addPlotCurve(pPlotCurve);
@@ -1185,10 +1185,10 @@ void VariablePageWidget::setCurvePickColorButtonIcon()
 
 void VariablePageWidget::resetLabel()
 {
-  if (mpPlotCurve->getUnit().isEmpty()) {
+  if (mpPlotCurve->getDisplayUnit().isEmpty()) {
     mpLegendTextBox->setText(mpPlotCurve->getName());
   } else {
-    mpLegendTextBox->setText(mpPlotCurve->getName() + " [" + mpPlotCurve->getUnit() + "]");
+    mpLegendTextBox->setText(mpPlotCurve->getName() + " [" + mpPlotCurve->getDisplayUnit() + "]");
   }
 
 }

diff --git a/OMPlot/OMPlotGUI/PlotWindow.h b/OMPlot/OMPlotGUI/PlotWindow.h
@@ -78,6 +78,7 @@ class PlotWindow : public QMainWindow
   PlotType mPlotType;
   QString mGridType;
   QString mUnit;
+  QString mDisplayUnit;
   QString mXRangeMin;
   QString mXRangeMax;
   QString mYRangeMin;
@@ -107,6 +108,8 @@ class PlotWindow : public QMainWindow
   void setYLabel(QString label);
   void setUnit(QString unit) {mUnit = unit;}
   QString getUnit() {return mUnit;}
+  void setDisplayUnit(QString displayUnit) {mDisplayUnit = displayUnit;}
+  QString getDisplayUnit() {return mDisplayUnit;}
   void setXRange(double min, double max);
   QString getXRangeMin();
   QString getXRangeMax();