ticket:4262 Adapted to new output of translateModelFMU and translateModelXML.

Author: adeas31

OMEdit/OMEditGUI/MainWindow.cpp

@@ -770,13 +770,14 @@ void MainWindow::exportModelFMU(LibraryTreeItem *pLibraryTreeItem)
   QSettings *pSettings = Utilities::getApplicationSettings();
   QList<QString> platforms = pSettings->value("FMIExport/Platforms").toStringList();
   int index = platforms.indexOf("none");
-  if (index > -1)
+  if (index > -1) {
     platforms.removeAt(index);
-  if (mpOMCProxy->buildModelFMU(pLibraryTreeItem->getNameStructure(), version, type, FMUName, platforms)) {
-    MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0, GUIMessages::getMessage(GUIMessages::FMU_GENERATED)
-                                                .arg(FMUName.isEmpty() ? pLibraryTreeItem->getNameStructure() : FMUName)
-                                                .arg(OptionsDialog::instance()->getGeneralSettingsPage()->getWorkingDirectory()), Helper::scriptingKind,
-                                                Helper::notificationLevel));
+  }
+  QString fmuFileName = mpOMCProxy->buildModelFMU(pLibraryTreeItem->getNameStructure(), version, type, FMUName, platforms);
+  if (!fmuFileName.isEmpty()) {
+    MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0,
+                                                          GUIMessages::getMessage(GUIMessages::FMU_GENERATED).arg(fmuFileName),
+                                                          Helper::scriptingKind, Helper::notificationLevel));
   }
   // hide progress bar
   hideProgressBar();
@@ -797,10 +798,11 @@ void MainWindow::exportModelXML(LibraryTreeItem *pLibraryTreeItem)
   // show the progress bar
   mpProgressBar->setRange(0, 0);
   showProgressBar();
-  if (mpOMCProxy->translateModelXML(pLibraryTreeItem->getNameStructure())) {
-    MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0, GUIMessages::getMessage(GUIMessages::XML_GENERATED)
-                                                .arg(OptionsDialog::instance()->getGeneralSettingsPage()->getWorkingDirectory()).arg(pLibraryTreeItem->getNameStructure()),
-                                                Helper::scriptingKind, Helper::notificationLevel));
+  QString xmlFileName = mpOMCProxy->translateModelXML(pLibraryTreeItem->getNameStructure());
+  if (!xmlFileName.isEmpty()) {
+    MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0,
+                                                          GUIMessages::getMessage(GUIMessages::XML_GENERATED).arg(xmlFileName),
+                                                          Helper::scriptingKind, Helper::notificationLevel));
   }
   // hide progress bar
   hideProgressBar();

OMEdit/OMEditGUI/OMC/OMCProxy.cpp

@@ -2076,34 +2076,32 @@ OMCInterface::getSimulationOptions_res OMCProxy::getSimulationOptions(QString cl
  * \param platforms
  * \return
  */
-bool OMCProxy::buildModelFMU(QString className, double version, QString type, QString fileNamePrefix, QList<QString> platforms)
+QString OMCProxy::buildModelFMU(QString className, double version, QString type, QString fileNamePrefix, QList<QString> platforms)
 {
-  bool result = false;
   fileNamePrefix = fileNamePrefix.isEmpty() ? "<default>" : fileNamePrefix;
-  QString res = mpOMCInterface->buildModelFMU(className, QString::number(version), type, fileNamePrefix, platforms);
-  if (res.compare("SimCode: The model " + className + " has been translated to FMU") == 0) {
-    result = true;
+  QString fmuFileName = mpOMCInterface->buildModelFMU(className, QString::number(version), type, fileNamePrefix, platforms);
+  if (!fmuFileName.isEmpty()) {
     MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->loadDependentLibraries(getClassNames());
   }
   printMessagesStringInternal();
-  return result;
+  return fmuFileName;
 }
 
 /*!
-  Creates the XML of the model.
-  \param className - the name of the class.
-  \return the created XML location
-  */
-bool OMCProxy::translateModelXML(QString className)
+ * \brief OMCProxy::translateModelXML
+ * Creates the XML of the model.
+ * \param className - the name of the class.
+ * \return the created XML location
+ */
+QString OMCProxy::translateModelXML(QString className)
 {
-  bool result = false;
   sendCommand("translateModelXML(" + className + ")");
-  if (StringHandler::unparse(getResult()).compare("SimCode: The model " + className + " has been translated to XML") == 0) {
-    result = true;
+  QString xmlFileName = StringHandler::unparse(getResult());
+  if (!xmlFileName.isEmpty()) {
     MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->loadDependentLibraries(getClassNames());
   }
   printMessagesStringInternal();
-  return result;
+  return xmlFileName;
 }
 
 /*!

OMEdit/OMEditGUI/OMC/OMCProxy.h

@@ -191,8 +191,8 @@ class OMCProxy : public QObject
   QString checkAllModelsRecursive(QString className);
   bool isExperiment(QString className);
   OMCInterface::getSimulationOptions_res getSimulationOptions(QString className, double defaultTolerance = 1e-6);
-  bool buildModelFMU(QString className, double version, QString type, QString fileNamePrefix, QList<QString> platforms);
-  bool translateModelXML(QString className);
+  QString buildModelFMU(QString className, double version, QString type, QString fileNamePrefix, QList<QString> platforms);
+  QString translateModelXML(QString className);
   QString importFMU(QString fmuName, QString outputDirectory, int logLevel, bool debugLogging, bool generateInputConnectors, bool generateOutputConnectors);
   QString importFMUModelDescription(QString fmuModelDescriptionName, QString outputDirectory, int logLevel, bool debugLogging, bool generateInputConnectors, bool generateOutputConnectors);
   QString getMatchingAlgorithm();

OMEdit/OMEditGUI/Util/Helper.cpp

@@ -634,9 +634,9 @@ QString GUIMessages::getMessage(int type)
     case INNER_MODEL_NAME_CHANGED:
       return tr("A component with the name <b>%1</b> already exists. The name is changed from <b>%1</b> to <b>%2</b>.<br /><br />This is probably wrong because the component is declared as <b>inner</b>.");
     case FMU_GENERATED:
-      return tr("The FMU %1.fmu is generated at %2");
+      return tr("The FMU is generated at <b>%1</b>.");
     case XML_GENERATED:
-      return tr("The XML is generated at %1/%2.xml");
+      return tr("The XML is generated at <b>%1</b>.");
     case FIGARO_GENERATED:
       return tr("The FIGARO is generated.");
     case UNLOAD_CLASS_MSG: