Merge pull request #38 from rfranke/t4081

Add modified displayUnit to unit selector, ticket:4081
OpenModelica · Oct 20, 2016 · 1543682 · 1543682
2 parents 02e5b67 + 6e2a856
commit 1543682
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/OMEdit/OMEditGUI/Component/ComponentProperties.cpp b/OMEdit/OMEditGUI/Component/ComponentProperties.cpp
@@ -896,6 +896,15 @@ void ComponentParameters::fetchComponentModifiers()
       if (modifiersIterator.key().compare(parameterName + ".displayUnit") == 0) {
         QString displayUnit = StringHandler::removeFirstLastQuotes(modifiersIterator.value());
         int index = pParameter->getUnitComboBox()->findText(displayUnit, Qt::MatchExactly);
+        if (index < 0) {
+          // add modifier as additional display unit if compatible
+          index = pParameter->getUnitComboBox()->count() - 1;
+          if (index > -1 &&
+              (pOMCProxy->convertUnits(pParameter->getUnitComboBox()->itemText(0), displayUnit)).unitsCompatible) {
+            pParameter->getUnitComboBox()->addItem(displayUnit);
+            index ++;
+          }
+        }
         if (index > -1) {
           pParameter->getUnitComboBox()->setCurrentIndex(index);
           pParameter->setDisplayUnit(displayUnit);