Fallback to base unit if conversion fails.

Show the error message if we are unable to convert to display unit.
OpenModelica · Apr 12, 2016 · efb215b · efb215b
1 parent 47b45e5
commit efb215b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -2314,6 +2314,10 @@ OMCInterface::convertUnits_res OMCProxy::convertUnits(QString from, QString to)
   unitConverion.mToUnit = to;
   unitConverion.mConvertUnits = convertUnits_res;
   mUnitConversionList.append(unitConverion);
+  // show error if units are not compatible
+  if (!convertUnits_res.unitsCompatible) {
+    printMessagesStringInternal();
+  }
   return convertUnits_res;
 }
 

diff --git a/OMEdit/OMEditGUI/Plotting/VariablesWidget.cpp b/OMEdit/OMEditGUI/Plotting/VariablesWidget.cpp
@@ -1086,6 +1086,9 @@ void VariablesWidget::plotVariables(const QModelIndex &index, qreal curveThickne
             }
             pPlotCurve->setData(pPlotCurve->getXAxisVector(), pPlotCurve->getYAxisVector(), pPlotCurve->getSize());
             pPlotWindow->getPlot()->replot();
+          } else {
+            pPlotCurve->setDisplayUnit(pVariablesTreeItem->getUnit());
+            pPlotCurve->setTitleLocal();
           }
         }
         if (pPlotWindow->getAutoScaleButton()->isChecked()) {