- send getVersion as the first command to connected omc.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23326 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 12, 2014 · f51fb0d · f51fb0d
1 parent 4cad513
commit f51fb0d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEditGUI/MainWindow.cpp
@@ -2575,7 +2575,7 @@ AboutOMEditWidget::AboutOMEditWidget(MainWindow *pMainWindow)
   Label *pIntroLabel = new Label(Helper::applicationIntroText);
   pIntroLabel->setFont(QFont(Helper::systemFontInfo.family(), Helper::systemFontInfo.pointSize() + 3 + MAC_FONT_FACTOR));
   // OpenModelica compiler info
-  Label *pConnectedLabel = new Label(QString("Connected to OpenModelica ").append(pMainWindow->getOMCProxy()->getVersion()));
+  Label *pConnectedLabel = new Label(QString("Connected to OpenModelica ").append(Helper::OpenModelicaVersion));
   pConnectedLabel->setFont(QFont(Helper::systemFontInfo.family(), Helper::systemFontInfo.pointSize() - 2 + MAC_FONT_FACTOR));
   // about text
   QString aboutText = QString("Copyright <b>Open Source Modelica Consortium (OSMC)</b>.<br />")

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -452,6 +452,8 @@ bool OMCProxy::startServer()
     mHasInitialized = false;
     return false;
   }
+  // get OpenModelica version
+  Helper::OpenModelicaVersion = getVersion();
   // set OpenModelicaHome variable
   sendCommand("getInstallationDirectoryPath()");
   Helper::OpenModelicaHome = StringHandler::removeFirstLastQuotes(getResult());

diff --git a/OMEdit/OMEditGUI/Util/Helper.cpp b/OMEdit/OMEditGUI/Util/Helper.cpp
@@ -45,6 +45,7 @@ QString Helper::applicationIntroText = "OpenModelica Connection Editor";
 QString Helper::organization = "openmodelica";  /* case-sensitive string. Don't change it. Used by ini settings file. */
 QString Helper::application = "omedit"; /* case-sensitive string. Don't change it. Used by ini settings file. */
 // these two variables are set once we are connected to OMC......in OMCProxy::startServer().
+QString Helper::OpenModelicaVersion = "";
 QString Helper::OpenModelicaHome = "";
 QString Helper::OpenModelicaLibrary = "";
 QString Helper::OMCServerName = "OMEdit";

diff --git a/OMEdit/OMEditGUI/Util/Helper.h b/OMEdit/OMEditGUI/Util/Helper.h
@@ -56,6 +56,7 @@ class Helper : public QObject
   static QString applicationIntroText;
   static QString organization;
   static QString application;
+  static QString OpenModelicaVersion;
   static QString OpenModelicaHome;
   static QString OpenModelicaLibrary;
   static QString OMCServerName;