Restrict unit selector to displayUnit and internal unit, ticket:4031 (#…

…33) This avoids wrong options, like Bq for Hz or sr for rad and V/V.
OpenModelica · Oct 8, 2016 · a03d35a · a03d35a
1 parent f063a54
commit a03d35a
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/OMEdit/OMEditGUI/Component/ComponentProperties.cpp b/OMEdit/OMEditGUI/Component/ComponentProperties.cpp
@@ -106,12 +106,9 @@ Parameter::Parameter(Component *pComponent, bool showStartAttribute, QString tab
   mpUnitComboBox = new QComboBox;
   if (!mUnit.isEmpty()) {
     mpUnitComboBox->addItem(mUnit);
-    mpUnitComboBox->addItems(pOMCProxy->getDerivedUnits(mUnit));
-  }
-  if (mUnit.compare(mDisplayUnit) != 0) {
-    int index = mpUnitComboBox->findText(mDisplayUnit, Qt::MatchExactly);
-    if (index > -1) {
-      mpUnitComboBox->setCurrentIndex(index);
+    if (mDisplayUnit.compare(mUnit) != 0) {
+      mpUnitComboBox->addItem(mDisplayUnit);
+      mpUnitComboBox->setCurrentIndex(1);
     }
   }
   connect(mpUnitComboBox, SIGNAL(currentIndexChanged(QString)), SLOT(unitComboBoxChanged(QString)));