Changeset 4ed1a225 in OpenModelica

Timestamp:

2020-10-16T14:10:30+02:00 (4 years ago)

Author:

arun3688 <rain100falls@…>

Children:

5960d7d

Parents:

1ab1803

git-author:

arun3688 <rain100falls@…> (10/15/20 17:01:45)

git-committer:

arun3688 <rain100falls@…> (10/16/20 14:10:30)

Message:

allow causality=parameter and delete start values

Location:

OMEdit/OMEditLIB/OMS

Files:

• ElementPropertiesDialog.cpp (modified) (1 diff)
• ModelDialog.cpp (modified) (1 diff)

OMEdit/OMEditLIB/OMS/ElementPropertiesDialog.cpp

@@ -352 +352 @@
         QString parameterValue = mParameterLineEdits.at(parametersIndex)->text();
         parametersIndex++;
-        if (pInterfaces[i]->type == oms_signal_type_real) {
-          OMSProxy::instance()->setReal(nameStructure, parameterValue.toDouble());
-        } else if (pInterfaces[i]->type == oms_signal_type_integer) {
-          OMSProxy::instance()->setInteger(nameStructure, parameterValue.toInt());
-        } else if (pInterfaces[i]->type == oms_signal_type_boolean) {
-          OMSProxy::instance()->setBoolean(nameStructure, parameterValue.toInt());
-        } else if (pInterfaces[i]->type == oms_signal_type_string) {
-          qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_string not implemented yet.";
-        } else if (pInterfaces[i]->type == oms_signal_type_enum) {
-          qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_enum not implemented yet.";
-        } else if (pInterfaces[i]->type == oms_signal_type_bus) {
-          qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_bus not implemented yet.";
-        } else {
-          qDebug() << "ElementPropertiesDialog::updateProperties() unknown oms_signal_type_enu_t.";
+        if (parameterValue.isEmpty()) {
+          // delete start values only
+          OMSProxy::instance()->omsDelete(nameStructure + ":start");
+        }
+        else {
+          if (pInterfaces[i]->type == oms_signal_type_real) {
+            OMSProxy::instance()->setReal(nameStructure, parameterValue.toDouble());
+          } else if (pInterfaces[i]->type == oms_signal_type_integer) {
+            OMSProxy::instance()->setInteger(nameStructure, parameterValue.toInt());
+          } else if (pInterfaces[i]->type == oms_signal_type_boolean) {
+            OMSProxy::instance()->setBoolean(nameStructure, parameterValue.toInt());
+          } else if (pInterfaces[i]->type == oms_signal_type_string) {
+            qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_string not implemented yet.";
+          } else if (pInterfaces[i]->type == oms_signal_type_enum) {
+            qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_enum not implemented yet.";
+          } else if (pInterfaces[i]->type == oms_signal_type_bus) {
+            qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_bus not implemented yet.";
+          } else {
+            qDebug() << "ElementPropertiesDialog::updateProperties() unknown oms_signal_type_enu_t.";
+          }
         }
       } else if (pInterfaces[i]->causality == oms_causality_input) {
         QString inputValue = mInputLineEdits.at(inputsIndex)->text();
         inputsIndex++;
-        if (pInterfaces[i]->type == oms_signal_type_real) {
-          OMSProxy::instance()->setReal(nameStructure, inputValue.toDouble());
-        } else if (pInterfaces[i]->type == oms_signal_type_integer) {
-          OMSProxy::instance()->setInteger(nameStructure, inputValue.toInt());
-        } else if (pInterfaces[i]->type == oms_signal_type_boolean) {
-          OMSProxy::instance()->setBoolean(nameStructure, inputValue.toInt());
-        } else if (pInterfaces[i]->type == oms_signal_type_string) {
-          qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_string not implemented yet.";
-        } else if (pInterfaces[i]->type == oms_signal_type_enum) {
-          qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_enum not implemented yet.";
-        } else if (pInterfaces[i]->type == oms_signal_type_bus) {
-          qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_bus not implemented yet.";
-        } else {
-          qDebug() << "ElementPropertiesDialog::updateProperties() unknown oms_signal_type_enu_t.";
+        if (inputValue.isEmpty()){
+          // delete start values only
+          OMSProxy::instance()->omsDelete(nameStructure + ":start");
+        }
+        else{
+          if (pInterfaces[i]->type == oms_signal_type_real) {
+            OMSProxy::instance()->setReal(nameStructure, inputValue.toDouble());
+          } else if (pInterfaces[i]->type == oms_signal_type_integer) {
+            OMSProxy::instance()->setInteger(nameStructure, inputValue.toInt());
+          } else if (pInterfaces[i]->type == oms_signal_type_boolean) {
+            OMSProxy::instance()->setBoolean(nameStructure, inputValue.toInt());
+          } else if (pInterfaces[i]->type == oms_signal_type_string) {
+            qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_string not implemented yet.";
+          } else if (pInterfaces[i]->type == oms_signal_type_enum) {
+            qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_enum not implemented yet.";
+          } else if (pInterfaces[i]->type == oms_signal_type_bus) {
+            qDebug() << "ElementPropertiesDialog::updateProperties() oms_signal_type_bus not implemented yet.";
+          } else {
+            qDebug() << "ElementPropertiesDialog::updateProperties() unknown oms_signal_type_enu_t.";
+          }
         }
       }

OMEdit/OMEditLIB/OMS/ModelDialog.cpp

@@ -534 +534 @@
   mpCausalityComboBox->addItem("Input", oms_causality_input);
   mpCausalityComboBox->addItem("Output", oms_causality_output);
+  mpCausalityComboBox->addItem("Parameter", oms_causality_parameter);
+
   // type
   mpTypeLabel = new Label(Helper::type);