Interactive simulation is only implemented for c-runtime

OpenModelica · Dec 3, 2018 · a078212 · a078212
1 parent 8caab61
commit a078212
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/OMEdit/OMEditGUI/Plotting/VariablesWidget.cpp b/OMEdit/OMEditGUI/Plotting/VariablesWidget.cpp
@@ -569,7 +569,7 @@ void VariablesTreeModel::insertVariablesItems(QString fileName, QString filePath
   endInsertRows();
   // set the newly inserted VariablesTreeItem active
   mpActiveVariablesTreeItem = pTopVariablesTreeItem;
-  if (simulationOptions.isValid()) {
+  if (simulationOptions.isValid() && !simulationOptions.isInteractiveSimulation()) {
     pTopVariablesTreeItem->setActive();
   }
   /* open the model_init.xml file for reading */
@@ -1432,15 +1432,20 @@ void VariablesWidget::reSimulate(bool showSetup)
   pVariablesTreeItem = pVariablesTreeItem->rootParent();
   SimulationOptions simulationOptions = pVariablesTreeItem->getSimulationOptions();
   if (simulationOptions.isValid()) {
-    simulationOptions.setReSimulate(true);
-    updateInitXmlFile(simulationOptions);
-    if (showSetup) {
-      MainWindow::instance()->getSimulationDialog()->show(0, true, simulationOptions);
+    if (simulationOptions.isInteractiveSimulation()) {
+      QMessageBox::information(this, QString("%1 - %2").arg(Helper::applicationName, Helper::information),
+                               tr("You cannot re-simulate an interactive simulation."), Helper::ok);
     } else {
-      MainWindow::instance()->getSimulationDialog()->reSimulate(simulationOptions);
+      simulationOptions.setReSimulate(true);
+      updateInitXmlFile(simulationOptions);
+      if (showSetup) {
+        MainWindow::instance()->getSimulationDialog()->show(0, true, simulationOptions);
+      } else {
+        MainWindow::instance()->getSimulationDialog()->reSimulate(simulationOptions);
+      }
     }
   } else {
-    QMessageBox::information(this, QString(Helper::applicationName).append(" - ").append(Helper::information),
+    QMessageBox::information(this, QString("%1 - %2").arg(Helper::applicationName, Helper::information),
                              tr("You cannot re-simulate this class.<br />This is just a result file loaded via menu <b>File->Open Result File(s)</b>."), Helper::ok);
   }
 }
@@ -2205,7 +2210,9 @@ void VariablesWidget::showContextMenu(QPoint point)
     QAction *pSetResultActiveAction = new QAction(tr("Set Active"), this);
     pSetResultActiveAction->setData(pVariablesTreeItem->getVariableName());
     pSetResultActiveAction->setStatusTip(tr("An active item is used for the visualization"));
-    pSetResultActiveAction->setEnabled(pVariablesTreeItem->getSimulationOptions().isValid() && !pVariablesTreeItem->isActive());
+    pSetResultActiveAction->setEnabled(pVariablesTreeItem->getSimulationOptions().isValid()
+                                       && !pVariablesTreeItem->getSimulationOptions().isInteractiveSimulation()
+                                       && !pVariablesTreeItem->isActive());
     connect(pSetResultActiveAction, SIGNAL(triggered()), mpVariablesTreeModel, SLOT(setVariableTreeItemActive()));
 
     QMenu menu(this);

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp b/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
@@ -758,7 +758,6 @@ void SimulationDialog::initializeFields(bool isReSimulate, SimulationOptions sim
     mpSaveExperimentAnnotationCheckBox->setVisible(true);
     mpSaveSimulationFlagsAnnotationCheckBox->setVisible(true);
     mpSimulateCheckBox->setVisible(true);
-    mpInteractiveSimulationPortNumberTextBox->setEnabled(true);
   } else {
     mIsReSimulate = true;
     mClassName = simulationOptions.getClassName();
@@ -767,13 +766,14 @@ void SimulationDialog::initializeFields(bool isReSimulate, SimulationOptions sim
     mpSimulationHeading->setText(QString(Helper::reSimulation).append(" - ").append(mClassName));
     // apply simulation options
     applySimulationOptions(simulationOptions);
+    mpInteractiveSimulationGroupBox->setChecked(false);
+    mpInteractiveSimulationGroupBox->setEnabled(false);
     mpCflagsTextBox->setDisabled(true);
     mpFileNameTextBox->setDisabled(true);
     // save simulation settings
     mpSaveExperimentAnnotationCheckBox->setVisible(false);
     mpSaveSimulationFlagsAnnotationCheckBox->setVisible(false);
     mpSimulateCheckBox->setVisible(false);
-    mpInteractiveSimulationPortNumberTextBox->setEnabled(false);
   }
 }
 
@@ -828,9 +828,16 @@ void SimulationDialog::applySimulationOptions(SimulationOptions simulationOption
   // Interval
   mpIntervalTextBox->setText(QString::number(simulationOptions.getStepSize()));
   // Interactive simulation
-  mpInteractiveSimulationGroupBox->setChecked(simulationOptions.isInteractiveSimulation());
-  mpInteractiveSimulationPortNumberTextBox->setText(QString::number(simulationOptions.getInteractiveSimulationPortNumber()));
-  mpInteractiveSimulationStepCheckBox->setChecked(simulationOptions.isInteractiveSimulationWithSteps());
+  QString targetLanguage = OptionsDialog::instance()->getSimulationPage()->getTargetLanguageComboBox()->currentText();
+  if (targetLanguage.compare("C") == 0) {
+    mpInteractiveSimulationGroupBox->setEnabled(true);
+    mpInteractiveSimulationGroupBox->setChecked(simulationOptions.isInteractiveSimulation());
+    mpInteractiveSimulationPortNumberTextBox->setText(QString::number(simulationOptions.getInteractiveSimulationPortNumber()));
+    mpInteractiveSimulationStepCheckBox->setChecked(simulationOptions.isInteractiveSimulationWithSteps());
+  } else {
+    mpInteractiveSimulationGroupBox->setChecked(false);
+    mpInteractiveSimulationGroupBox->setEnabled(false);
+  }
   // output format
   bool state = mpOutputFormatComboBox->blockSignals(true);
   currentIndex = mpOutputFormatComboBox->findText(simulationOptions.getOutputFormat(), Qt::MatchExactly);
@@ -849,7 +856,9 @@ void SimulationDialog::applySimulationOptions(SimulationOptions simulationOption
   }
   // Result filename
   mpResultFileNameTextBox->setPlaceholderText(QString("%1_res.%2").arg(mClassName, simulationOptions.getOutputFormat()));
-  mpResultFileNameTextBox->setText(simulationOptions.getResultFileName());
+  if (!simulationOptions.isInteractiveSimulation()) {
+    mpResultFileNameTextBox->setText(simulationOptions.getResultFileName());
+  }
   // Variable filter
   mpVariableFilterTextBox->setText(simulationOptions.getVariableFilter());
   // Protected Variabels