#1540

- Handle quoted identifiers simulation. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25615 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 19, 2015 · 7146485 · 7146485
1 parent 1aa60b7
commit 7146485
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp b/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
@@ -735,7 +735,11 @@ SimulationOptions SimulationDialog::createSimulationOptions()
   qreal stopTime = mpStopTimeTextBox->text().toDouble();
   simulationOptions.setStepSize((stopTime - startTime)/mpNumberofIntervalsSpinBox->value());
   simulationOptions.setOutputFormat(mpOutputFormatComboBox->currentText());
-  simulationOptions.setFileNamePrefix(mpFileNameTextBox->text());
+  if (!mpFileNameTextBox->text().isEmpty()) {
+    simulationOptions.setFileNamePrefix(mpFileNameTextBox->text());
+  } else if (mClassName.contains('\'')) {
+    simulationOptions.setFileNamePrefix("_omcQuot_" + QByteArray(mClassName.toStdString().c_str()).toHex());
+  }
   simulationOptions.setVariableFilter(mpVariableFilterTextBox->text());
   simulationOptions.setProtectedVariables(mpProtectedVariablesCheckBox->isChecked());
   simulationOptions.setEquidistantTimeGrid(mpEquidistantTimeGridCheckBox->isChecked());
@@ -1144,6 +1148,8 @@ void SimulationDialog::simulate()
     simulationParameters.append(", outputFormat=").append("\"").append(mpOutputFormatComboBox->currentText()).append("\"");
     if (!mpFileNameTextBox->text().isEmpty()) {
       simulationParameters.append(", fileNamePrefix=").append("\"").append(mpFileNameTextBox->text()).append("\"");
+    } else if (mClassName.contains('\'')) {
+      simulationParameters.append(", fileNamePrefix=").append("\"_omcQuot_").append(QByteArray(mClassName.toStdString().c_str()).toHex()).append("\"");
     }
     if (!mpVariableFilterTextBox->text().isEmpty()) {
       simulationParameters.append(", variableFilter=").append("\"").append(mpVariableFilterTextBox->text()).append("\"");

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationProcessThread.cpp b/OMEdit/OMEditGUI/Simulation/SimulationProcessThread.cpp
@@ -70,7 +70,6 @@ void SimulationProcessThread::compileModel()
   QString numProcs;
   SimulationOptions simulationOptions = mpSimulationOutputWidget->getSimulationOptions();
   if (simulationOptions.getNumberOfProcessors() == 0) {
-    //numProcs = mpSimulationOutputWidget->getMainWindow()->getOMCProxy()->sendCommand();->numProcessors();
     numProcs = QString::number(simulationOptions.getNumberOfProcessors());
   } else {
     numProcs = QString::number(simulationOptions.getNumberOfProcessors());

diff --git a/OMEdit/OMEditGUI/Util/StringHandler.cpp b/OMEdit/OMEditGUI/Util/StringHandler.cpp
@@ -801,7 +801,7 @@ QString StringHandler::getFirstWordBeforeDot(QString value)
   int pos;
   if (value.startsWith('\'')) {
     int i = 1;
-    while (value[i] != '\'' && i<value.size()-2 && value[i+1] != '\\') {
+    while (value[i] != '\'' && i<value.size()-1 && value[i+1] != '\\') {
       i++;
     }
     pos = i+1;