- align profiling combo box.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20546 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 11, 2014 · e5be1a2 · e5be1a2
1 parent 8093aab
commit e5be1a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/OMEdit/OMEditGUI/GUI/Dialogs/SimulationDialog.cpp b/OMEdit/OMEditGUI/GUI/Dialogs/SimulationDialog.cpp
@@ -253,11 +253,11 @@ void SimulationDialog::setUpForm()
   mpOutputVariablesTextBox = new QLineEdit;
   // measure simulation time checkbox
   QLabel *mpProfilingLabel = new Label(tr("Profiling (enable performance measurements)"));
-  mpProfilingCheckBox = new QComboBox();
+  mpProfilingComboBox = new QComboBox;
   QStringList profilingOptions = mpMainWindow->getOMCProxy()->getConfigFlagValidOptions("profiling");
-  mpProfilingCheckBox->addItems(profilingOptions);
-  mpProfilingCheckBox->setCurrentIndex(0);
-  mpProfilingCheckBox->setToolTip(mpMainWindow->getOMCProxy()->help("profiling"));
+  mpProfilingComboBox->addItems(profilingOptions);
+  mpProfilingComboBox->setCurrentIndex(0);
+  mpProfilingComboBox->setToolTip(mpMainWindow->getOMCProxy()->help("profiling"));
   // cpu-time checkbox
   mpCPUTimeCheckBox = new QCheckBox(tr("CPU Time"));
   // enable all warnings
@@ -352,7 +352,7 @@ void SimulationDialog::setUpForm()
   pSimulationFlagsTabLayout->addWidget(mpOutputVariablesLabel, 9, 0);
   pSimulationFlagsTabLayout->addWidget(mpOutputVariablesTextBox, 9, 1, 1, 2);
   pSimulationFlagsTabLayout->addWidget(mpProfilingLabel, 10, 0);
-  pSimulationFlagsTabLayout->addWidget(mpProfilingCheckBox, 10, 1);
+  pSimulationFlagsTabLayout->addWidget(mpProfilingComboBox, 10, 1, 1, 2);
   pSimulationFlagsTabLayout->addWidget(mpCPUTimeCheckBox, 11, 0);
   pSimulationFlagsTabLayout->addWidget(mpEnableAllWarningsCheckBox, 12, 0);
   pSimulationFlagsTabLayout->addWidget(mpLoggingGroupBox, 13, 0, 1, 3);
@@ -925,7 +925,7 @@ void SimulationDialog::simulate()
       mSimulationParameters.append(", variableFilter=").append("\"").append(mpVariableFilterTextBox->text()).append("\"");
     if (!mpCflagsTextBox->text().isEmpty())
       mSimulationParameters.append(", cflags=").append("\"").append(mpCflagsTextBox->text()).append("\"");
-    mpMainWindow->getOMCProxy()->setCommandLineOptions("+profiling=" + mpProfilingCheckBox->currentText());
+    mpMainWindow->getOMCProxy()->setCommandLineOptions("+profiling=" + mpProfilingComboBox->currentText());
     // setup simulation flags
     // setup Model Setup file flag
     if (!mpModelSetupFileTextBox->text().isEmpty())
@@ -1101,7 +1101,7 @@ void SimulationDialog::compilationProcessFinished(int exitCode, QProcess::ExitSt
     }
     SimulationOptions simulationOptions(mpLibraryTreeNode->getNameStructure(), fileNamePrefix, outputFormat, mSimulationFlags,
                                         mpShowGeneratedFilesCheckBox->isChecked(),
-                                        mpProfilingCheckBox->currentText() != "none",
+                                        mpProfilingComboBox->currentText() != "none",
                                         mpMainWindow->getOMCProxy()->changeDirectory());
     /* show the Transformational Debugger */
     if (mpMainWindow->getOptionsDialog()->getSimulationPage()->getAlwaysShowTransformationsCheckBox()->isChecked())
@@ -1181,7 +1181,6 @@ void SimulationDialog::simulationProcessFinished(int exitCode, QProcess::ExitSta
   {
     if (mSimulationOptions.isProfiling())
     {
-      QString fileName = QString(mSimulationOptions.getOutputFileName()).remove(QRegExp("(_res.mat|_res.plt|_res.csv)"));
       mpMainWindow->showTransformationsWidget(mSimulationOptions.getWorkingDirectory() + "/" + mSimulationOptions.getFileNamePrefix() + "_info.xml");
     }
   }

diff --git a/OMEdit/OMEditGUI/GUI/Dialogs/SimulationDialog.h b/OMEdit/OMEditGUI/GUI/Dialogs/SimulationDialog.h
@@ -177,7 +177,7 @@ class SimulationDialog : public QDialog
   QLineEdit *mpLinearizationTimeTextBox;
   Label *mpOutputVariablesLabel;
   QLineEdit *mpOutputVariablesTextBox;
-  QComboBox *mpProfilingCheckBox;
+  QComboBox *mpProfilingComboBox;
   QCheckBox *mpCPUTimeCheckBox;
   QCheckBox *mpEnableAllWarningsCheckBox;
   QGroupBox *mpLoggingGroupBox;