Add more units to parameters unit drop down (#9007)

Fixes #8758
Added Wh unit for J in unit parser

Author: adeas31

OMCompiler/Compiler/runtime/unitparser.cpp

@@ -1179,6 +1179,9 @@ void UnitParser::initSIUnits() {
       Rational(3141592, 30000000), Rational(0), true);
 #endif
 
+  addDerived("Energy", "watt hour", "Wh", "J",Rational(0),
+      Rational(3600), Rational(0), true);
+
   addDerived("velocity", "knot", "kn", "m/s", Rational(0),
       Rational(1852, 3600), Rational(0), true);
 

OMEdit/OMEditLIB/Element/ElementProperties.cpp

@@ -37,6 +37,7 @@
 #include "Modeling/MessagesWidget.h"
 #include "Modeling/Commands.h"
 #include "Options/OptionsDialog.h"
+#include "OMPlot.h"
 
 #include <QApplication>
 #include <QMenu>
@@ -101,23 +102,41 @@ Parameter::Parameter(Element *pComponent, bool showStartAttribute, QString tab,
   setSaveSelectorCaption("-");
   createValueWidget();
   // Get unit value
-  QString unit = mpComponent->getDerivedClassModifierValue("unit");
-  mUnit = unit;
+  mUnit = mpComponent->getDerivedClassModifierValue("unit");;
   // Get displayUnit value
   QString displayUnit = mpComponent->getDerivedClassModifierValue("displayUnit");
   if (displayUnit.isEmpty()) {
-    displayUnit = unit;
+    displayUnit = mUnit;
   }
   mDisplayUnit = StringHandler::removeFirstLastQuotes(displayUnit);
   mPreviousUnit = mDisplayUnit;
-  mpUnitComboBox = new QComboBox;
+  QStringList units;
   if (!mUnit.isEmpty()) {
-    mpUnitComboBox->addItem(Utilities::convertUnitToSymbol(mUnit), mUnit);
+    units << mUnit;
     if (mDisplayUnit.compare(mUnit) != 0) {
-      mpUnitComboBox->addItem(Utilities::convertUnitToSymbol(mDisplayUnit), mDisplayUnit);
-      mpUnitComboBox->setCurrentIndex(1);
+      units << mDisplayUnit;
+    }
+    Utilities::addDefaultDisplayUnit(mUnit, units);
+    // add unit prefixes
+    if (OMPlot::Plot::prefixableUnit(mUnit)) {
+      units << QString("k%1").arg(mUnit)
+            << QString("M%1").arg(mUnit)
+            << QString("G%1").arg(mUnit)
+            << QString("T%1").arg(mUnit)
+            << QString("m%1").arg(mUnit)
+            << QString("u%1").arg(mUnit)
+            << QString("n%1").arg(mUnit)
+            << QString("p%1").arg(mUnit);
     }
   }
+  mpUnitComboBox = new QComboBox;
+  units.removeDuplicates();
+  foreach (QString unit, units) {
+    mpUnitComboBox->addItem(Utilities::convertUnitToSymbol(unit), unit);
+  }
+  if (mDisplayUnit.compare(mUnit) != 0) {
+    mpUnitComboBox->setCurrentIndex(1);
+  }
   connect(mpUnitComboBox, SIGNAL(currentIndexChanged(int)), SLOT(unitComboBoxChanged(int)));
   mpCommentLabel = new Label(mpComponent->getComponentInfo()->getComment());
 }

OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp

@@ -930,15 +930,7 @@ bool VariablesTreeModel::insertVariablesItems(QString fileName, QString filePath
         } else { /* use unit as displayUnit */
           variableData[VariableItemData::DISPLAYUNIT] = unit;
         }
-        /* Issue #5447
-         * For angular speeds always add in the menu in the unit column, in addition to the standard "rad/s" also "rpm"
-         * For energies always add in the menu in the Display Unit column, in addition to standard "J", also "Wh" (prefixes such as kWh, MWh, GWh will be obtained automatically)
-         */
-        if (unit.compare(QStringLiteral("rad/s")) == 0) {
-          displayUnitOptions << "rpm";
-        } else if (unit.compare(QStringLiteral("J")) == 0) {
-          displayUnitOptions << "Wh";
-        }
+        Utilities::addDefaultDisplayUnit(unit, displayUnitOptions);
         displayUnitOptions.removeDuplicates();
         displayUnits << displayUnitOptions;
         variableData << displayUnits;

OMEdit/OMEditLIB/Util/Utilities.cpp

@@ -1262,6 +1262,29 @@ QStringList Utilities::variantListToStringList(const QVariantList lst)
   return strs;
 }
 
+/*!
+ * \brief Utilities::addDefaultDisplayUnit
+ * \param unit
+ * \param displayUnit
+ */
+void Utilities::addDefaultDisplayUnit(const QString &unit, QStringList &displayUnit)
+{
+  /* Issue #5447
+   * For angular speeds always add in the menu in the unit column, in addition to the standard "rad/s" also "rpm"
+   * For energies always add in the menu in the Display Unit column, in addition to standard "J", also "Wh" (prefixes such as kWh, MWh, GWh will be obtained automatically)
+   */
+  /* Issue #8758
+   * Whenever unit = "K", we also add "degC" even if it is not defined as displayUnits.
+   */
+  if (unit.compare(QStringLiteral("rad/s")) == 0) {
+    displayUnit << "rpm";
+  } else if (unit.compare(QStringLiteral("J")) == 0) {
+    displayUnit << "Wh";
+  } else if (unit.compare(QStringLiteral("K")) == 0) {
+    displayUnit << "degC";
+  }
+}
+
 /*!
  * \brief Utilities::convertUnitToSymbol
  * Converts the unit to a symbol.

OMEdit/OMEditLIB/Util/Utilities.h

@@ -542,6 +542,7 @@ namespace Utilities {
   void removeDirectoryRecursivly(QString path);
   qreal mapToCoOrdinateSystem(qreal value, qreal startA, qreal endA, qreal startB, qreal endB);
   QStringList variantListToStringList(const QVariantList lst);
+  void addDefaultDisplayUnit(const QString &unit, QStringList &displayUnit);
   QString convertUnitToSymbol(const QString displayUnit);
   QString convertSymbolToUnit(const QString symbol);
   QRectF adjustSceneRectangle(const QRectF sceneRectangle, const qreal factor);