- Adapt to new exportToFigaro API structure.

- Updated exportToFigaro to use scripting API. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24776 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 25, 2015 · 18b2b15 · 18b2b15
1 parent 511d028
commit 18b2b15
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp b/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp
@@ -1289,6 +1289,11 @@ ExportFigaroDialog::ExportFigaroDialog(MainWindow *pMainWindow, LibraryTreeNode
   mpFigaroModeComboBox = new QComboBox;
   mpFigaroModeComboBox->addItem("figaro0", "figaro0");
   mpFigaroModeComboBox->addItem("fault-tree", "fault-tree");
+  // working directory
+  mpWorkingDirectoryLabel = new Label(Helper::workingDirectory);
+  mpWorkingDirectoryTextBox = new QLineEdit(OpenModelica::tempDirectory());
+  mpWorkingDirectoryBrowseButton = new QPushButton(Helper::browse);
+  connect(mpWorkingDirectoryBrowseButton, SIGNAL(clicked()), SLOT(browseWorkingDirectory()));
   // create the export button
   mpExportFigaroButton = new QPushButton(Helper::exportFigaro);
   mpExportFigaroButton->setAutoDefault(true);
@@ -1305,11 +1310,19 @@ ExportFigaroDialog::ExportFigaroDialog(MainWindow *pMainWindow, LibraryTreeNode
   QGridLayout *pMainGridLayout = new QGridLayout;
   pMainGridLayout->setAlignment(Qt::AlignTop);
   pMainGridLayout->addWidget(mpFigaroModeLabel, 0, 0);
-  pMainGridLayout->addWidget(mpFigaroModeComboBox, 0, 1);
-  pMainGridLayout->addWidget(mpButtonBox, 1, 0, 2, Qt::AlignRight);
+  pMainGridLayout->addWidget(mpFigaroModeComboBox, 0, 1, 1, 2);
+  pMainGridLayout->addWidget(mpWorkingDirectoryLabel, 1, 0);
+  pMainGridLayout->addWidget(mpWorkingDirectoryTextBox, 1, 1);
+  pMainGridLayout->addWidget(mpWorkingDirectoryBrowseButton, 1, 2);
+  pMainGridLayout->addWidget(mpButtonBox, 2, 0, 1, 3, Qt::AlignRight);
   setLayout(pMainGridLayout);
 }
 
+void ExportFigaroDialog::browseWorkingDirectory()
+{
+  mpWorkingDirectoryTextBox->setText(StringHandler::getExistingDirectory(this, QString(Helper::applicationName).append(" - ").append(Helper::chooseDirectory), NULL));
+}
+
 void ExportFigaroDialog::exportModelFigaro()
 {
   // set the status message.
@@ -1318,11 +1331,12 @@ void ExportFigaroDialog::exportModelFigaro()
   mpMainWindow->getProgressBar()->setRange(0, 0);
   mpMainWindow->showProgressBar();
   FigaroPage *pFigaroPage = mpMainWindow->getOptionsDialog()->getFigaroPage();
+  QString directory = mpWorkingDirectoryTextBox->text();
   QString library = pFigaroPage->getFigaroDatabaseFileTextBox()->text();
   QString mode = mpFigaroModeComboBox->currentText();
   QString options = pFigaroPage->getFigaroOptionsTextBox()->text();
   QString processor = pFigaroPage->getFigaroProcessTextBox()->text();
-  if (mpMainWindow->getOMCProxy()->exportToFigaro(mpLibraryTreeNode->getNameStructure(), library, mode, options, processor)) {
+  if (mpMainWindow->getOMCProxy()->exportToFigaro(mpLibraryTreeNode->getNameStructure(), directory, library, mode, options, processor)) {
     mpMainWindow->getMessagesWidget()->addGUIMessage(new MessageItem("", false, 0, 0, 0, 0,
                                                                      GUIMessages::getMessage(GUIMessages::FIGARO_GENERATED),
                                                                      Helper::scriptingKind, Helper::notificationLevel, 0));

diff --git a/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.h b/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.h
@@ -260,10 +260,14 @@ class ExportFigaroDialog : public QDialog
   LibraryTreeNode *mpLibraryTreeNode;
   Label *mpFigaroModeLabel;
   QComboBox *mpFigaroModeComboBox;
+  Label *mpWorkingDirectoryLabel;
+  QLineEdit *mpWorkingDirectoryTextBox;
+  QPushButton *mpWorkingDirectoryBrowseButton;
   QPushButton *mpExportFigaroButton;
   QPushButton *mpCancelButton;
   QDialogButtonBox *mpButtonBox;
 public slots:
+  void browseWorkingDirectory();
   void exportModelFigaro();
 };
 

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -2242,10 +2242,9 @@ bool OMCProxy::setDebugFlags(QString debugFlags)
   return StringHandler::unparseBool(getResult());
 }
 
-bool OMCProxy::exportToFigaro(QString className, QString database, QString mode, QString options, QString processor)
+bool OMCProxy::exportToFigaro(QString className, QString directory, QString database, QString mode, QString options, QString processor)
 {
-  sendCommand("exportToFigaro(" + className + ",\"" + database + "\",\"" + mode + "\",\"" + options + "\",\"" + processor + "\")");
-  bool result = StringHandler::unparseBool(getResult());
+  bool result = mpOMCInterface->exportToFigaro(className, directory, database, mode, options, processor);
   if (!result) printMessagesStringInternal();
   return result;
 }

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.h b/OMEdit/OMEditGUI/OMC/OMCProxy.h
@@ -205,7 +205,7 @@ class OMCProxy : public QObject
   QString help(QString topic);
   QStringList getConfigFlagValidOptions(QString topic, QString *mainDescription = 0, QStringList *descriptions = 0);
   bool setDebugFlags(QString flags);
-  bool exportToFigaro(QString className, QString database, QString mode, QString options, QString processor);
+  bool exportToFigaro(QString className, QString directory, QString database, QString mode, QString options, QString processor);
   bool copyClass(QString className, QString newClassName, QString withIn);
   QStringList getEnumerationLiterals(QString className);
 signals: