- updated loadFile & loadString to scripting API.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24463 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 6, 2015 · a887df1 · a887df1
1 parent b9a3354
commit a887df1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -1642,11 +1642,10 @@ bool OMCProxy::loadModel(QString className, QString priorityVersion, bool notify
   \param fileName - the file to load.
   \return true on success
   */
-bool OMCProxy::loadFile(QString fileName, QString encoding)
+bool OMCProxy::loadFile(QString fileName, QString encoding, bool uses)
 {
   fileName = fileName.replace('\\', '/');
-  sendCommand("loadFile(\"" + fileName + "\",\"" + encoding + "\")");
-  bool result = StringHandler::unparseBool(getResult());
+  bool result = mpOMCInterface->loadFile(fileName, encoding, uses);
   printMessagesStringInternal();
   return result;
 }
@@ -1656,10 +1655,9 @@ bool OMCProxy::loadFile(QString fileName, QString encoding)
   \param value - the string to load.
   \return true on success
   */
-bool OMCProxy::loadString(QString value, QString fileName, bool checkError)
+bool OMCProxy::loadString(QString value, QString fileName, QString encoding, bool checkError)
 {
-  sendCommand("loadString(\"" + value.replace("\"", "\\\"") + "\", \"" + fileName + "\")");
-  bool result = StringHandler::unparseBool(getResult());
+  bool result = mpOMCInterface->loadString(value.replace("\"", "\\\""), fileName, encoding);
   if (checkError) {
     printMessagesStringInternal();
   }
@@ -1711,7 +1709,7 @@ bool OMCProxy::createClass(QString type, QString className, QString extendsClass
   } else {
     expression = type + " " + className + " extends " + extendsClass + "; end " + className + ";";
   }
-  return loadString(StringHandler::escapeString(expression), className, false);
+  return loadString(StringHandler::escapeString(expression), className, Helper::utf8, false);
 }
 
 /*!
@@ -1729,7 +1727,7 @@ bool OMCProxy::createSubClass(QString type, QString className, QString parentCla
   } else {
     expression = "within " + parentClassName + "; " + type + " " + className + " extends " + extendsClass + "; end " + className + ";";
   }
-  return loadString(StringHandler::escapeString(expression), parentClassName + "." + className, false);
+  return loadString(StringHandler::escapeString(expression), parentClassName + "." + className, Helper::utf8, false);
 }
 
 /*!

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.h b/OMEdit/OMEditGUI/OMC/OMCProxy.h
@@ -161,8 +161,8 @@ class OMCProxy : public QObject
   QString changeDirectory(QString directory = QString(""));
   bool loadModel(QString className, QString priorityVersion = QString("default"), bool notify = false, QString languageStandard = QString(""),
                  bool requireExactVersion = false);
-  bool loadFile(QString fileName, QString encoding = Helper::utf8);
-  bool loadString(QString value, QString fileName, bool checkError = true);
+  bool loadFile(QString fileName, QString encoding = Helper::utf8, bool uses = true);
+  bool loadString(QString value, QString fileName, QString encoding = Helper::utf8, bool checkError = true);
   bool parseFile(QString fileName, QString encoding = Helper::utf8);
   QStringList parseString(QString value, QString fileName);
   bool createClass(QString type, QString className, QString extendsClass);