Highlight oms:TlmMaster keyword

OpenModelica · Nov 28, 2018 · b753795 · b753795
1 parent 2a71c2e
commit b753795
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/OMEdit/OMEditGUI/Editors/OMSimulatorEditor.cpp b/OMEdit/OMEditGUI/Editors/OMSimulatorEditor.cpp
@@ -239,7 +239,7 @@ void OMSimulatorHighlighter::initializeSettings()
                   << "\\bssd:SimulationInformation\\b"
                   << "\\bssd:Annotations\\b"
                   << "\\bssd:Annotation\\b"
-                  << "\\btlm:Master\\b"
+                  << "\\boms:TlmMaster\\b"
                   << "\\bssd:Elements\\b"
                   << "\\boms:Bus\\b"
                   << "\\boms:Signals\\b"

diff --git a/OMEdit/OMEditGUI/OMS/OMSProxy.cpp b/OMEdit/OMEditGUI/OMS/OMSProxy.cpp
@@ -1114,19 +1114,6 @@ bool OMSProxy::setElementGeometry(QString cref, const ssd_element_geometry_t* pG
   return statusToBool(status);
 }
 
-/*!
- * \brief OMSProxy::setLoggingCallback
- * Sets the logging callback.
- */
-void OMSProxy::setLoggingCallback()
-{
-  QString command = "oms3_setLoggingCallback";
-  QStringList args;
-  LOG_COMMAND(command, args);
-  oms3_setLoggingCallback(loggingCallback);
-  logResponse(command, oms_status_ok, &commandTime);
-}
-
 /*!
  * \brief OMSProxy::setLogFile
  * Sets the log file.
@@ -1142,6 +1129,19 @@ void OMSProxy::setLogFile(QString filename)
   logResponse(command, status, &commandTime);
 }
 
+/*!
+ * \brief OMSProxy::setLoggingCallback
+ * Sets the logging callback.
+ */
+void OMSProxy::setLoggingCallback()
+{
+  QString command = "oms3_setLoggingCallback";
+  QStringList args;
+  LOG_COMMAND(command, args);
+  oms3_setLoggingCallback(loggingCallback);
+  logResponse(command, oms_status_ok, &commandTime);
+}
+
 /*!
  * \brief OMSProxy::setLoggingInterval
  * Sets the logging interval.

diff --git a/OMEdit/OMEditGUI/OMS/OMSProxy.h b/OMEdit/OMEditGUI/OMS/OMSProxy.h
@@ -114,8 +114,8 @@ class OMSProxy : public QObject
   bool setConnectorGeometry(QString cref, const ssd_connector_geometry_t* pGeometry);
   bool setFixedStepSize(QString cref, double stepSize);
   bool setElementGeometry(QString cref, const ssd_element_geometry_t* pGeometry);
-  void setLoggingCallback();
   void setLogFile(QString filename);
+  void setLoggingCallback();
   bool setLoggingInterval(QString cref, double loggingInterval);
   void setLoggingLevel(int logLevel);
   bool setInteger(QString signal, int value);