Replace measureTime=true with +d=measureTime in buildModel/etc

- Fix code generation for profiling of function calls (was disabled)
- Fix the counter for number of profiling blocks so the profiling now includes the measured blocks again


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20251 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

OMEdit/OMEditGUI/GUI/Dialogs/SimulationDialog.cpp

@@ -919,8 +919,11 @@ void SimulationDialog::simulate()
       mSimulationParameters.append(", variableFilter=").append("\"").append(mpVariableFilterTextBox->text()).append("\"");
     if (!mpCflagsTextBox->text().isEmpty())
       mSimulationParameters.append(", cflags=").append("\"").append(mpCflagsTextBox->text()).append("\"");
-    if (mpProfilingCheckBox->isChecked())
-      mSimulationParameters.append(", measureTime=true");
+    if (mpProfilingCheckBox->isChecked()) {
+      mpMainWindow->getOMCProxy()->setDebugFlags("measureTime");
+    } else {
+      mpMainWindow->getOMCProxy()->setDebugFlags("nomeasureTime");
+    }
     // setup simulation flags
     // setup Model Setup file flag
     if (!mpModelSetupFileTextBox->text().isEmpty())

OMEdit/OMEditGUI/OMC/OMCProxy.cpp

@@ -2428,3 +2428,9 @@ void CustomExpressionBox::keyPressEvent(QKeyEvent *event)
       QLineEdit::keyPressEvent(event);
   }
 }
+
+bool OMCProxy::setDebugFlags(QString debugFlags)
+{
+  sendCommand("setDebugFlags(\"" + debugFlags + "\")");
+  return StringHandler::unparseBool(getResult());
+}

OMEdit/OMEditGUI/OMC/OMCProxy.h

@@ -211,6 +211,7 @@ class OMCProxy : public QObject
   QString getDerivedClassModifierValue(QString className, QString modifierName);
   bool getDocumentationClassAnnotation(QString className);
   QString numProcessors();
+  bool setDebugFlags(QString flags);
 signals:
   void commandFinished();
 public slots: