Merge remote-tracking branch 'origin/master' into oms

OpenModelica · May 15, 2018 · 57f144b · 57f144b
2 parents b0383b2 + da1155a
commit 57f144b
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 11 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp b/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp
@@ -748,16 +748,6 @@ DuplicateClassDialog::DuplicateClassDialog(bool saveAs, LibraryTreeItem *pLibrar
   connect(mpPathBrowseButton, SIGNAL(clicked()), SLOT(browsePath()));
   // save contents in one file
   mpSaveContentsInOneFileCheckBox = new QCheckBox(Helper::saveContentsInOneFile);
-  if (mpLibraryTreeItem->getRestriction() == StringHandler::Package) {
-    mpSaveContentsInOneFileCheckBox->setVisible(true);
-    if (mpLibraryTreeItem->getSaveContentsType() == LibraryTreeItem::SaveInOneFile) {
-      mpSaveContentsInOneFileCheckBox->setChecked(true);
-    } else {
-      mpSaveContentsInOneFileCheckBox->setChecked(false);
-    }
-  } else {
-    mpSaveContentsInOneFileCheckBox->setVisible(false);
-  }
   // Create the buttons
   mpOkButton = new QPushButton(Helper::ok);
   mpOkButton->setAutoDefault(true);
@@ -798,6 +788,26 @@ void DuplicateClassDialog::setSaveContentsTypeAsFolderStructure(LibraryTreeItem
   }
 }
 
+/*!
+ * \brief DuplicateClassDialog::exec
+ * Reimplementation of QDialog::exec
+ * \return
+ */
+int DuplicateClassDialog::exec()
+{
+  if (mpLibraryTreeItem->getRestriction() == StringHandler::Package) {
+    mpSaveContentsInOneFileCheckBox->setVisible(true);
+    if (mpLibraryTreeItem->getSaveContentsType() == LibraryTreeItem::SaveInOneFile) {
+      mpSaveContentsInOneFileCheckBox->setChecked(true);
+    } else {
+      mpSaveContentsInOneFileCheckBox->setChecked(false);
+    }
+  } else {
+    mpSaveContentsInOneFileCheckBox->setVisible(false);
+  }
+  return QDialog::exec();
+}
+
 void DuplicateClassDialog::browsePath()
 {
   LibraryBrowseDialog *pLibraryBrowseDialog = new LibraryBrowseDialog(tr("Select Path"), mpPathTextBox, MainWindow::instance()->getLibraryWidget());

diff --git a/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.h b/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.h
@@ -172,6 +172,7 @@ class DuplicateClassDialog : public QDialog
 
   void setSaveContentsTypeAsFolderStructure(LibraryTreeItem *pLibraryTreeItem);
 public slots:
+  int exec();
   void browsePath();
   void duplicateClass();
 };

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -2170,6 +2170,19 @@ bool OMCProxy::translateModel(QString className, QString simualtionParameters)
   return res;
 }
 
+/*!
+ * \brief OMCProxy::readSimulationResultSize
+ * Reads the simulation result size.
+ * \param fileName
+ * \return
+ */
+int OMCProxy::readSimulationResultSize(QString fileName)
+{
+  int size = mpOMCInterface->readSimulationResultSize(fileName);
+  getErrorString();
+  return size;
+}
+
 /*!
  * \brief OMCProxy::readSimulationResultVars
  * Reads the simulation result variables from the result file.

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.h b/OMEdit/OMEditGUI/OMC/OMCProxy.h
@@ -199,6 +199,7 @@ class OMCProxy : public QObject
   bool simulate(QString className, QString simualtionParameters);
   bool buildModel(QString className, QString simualtionParameters);
   bool translateModel(QString className, QString simualtionParameters);
+  int readSimulationResultSize(QString fileName);
   QStringList readSimulationResultVars(QString fileName);
   bool closeSimulationResultFile();
   QString checkModel(QString className);

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp b/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
@@ -1694,8 +1694,12 @@ void SimulationDialog::simulationProcessFinished(SimulationOptions simulationOpt
   // read the result file
   QFileInfo resultFileInfo(QString(workingDirectory).append("/").append(simulationOptions.getResultFileName()));
   QRegExp regExp("\\b(mat|plt|csv)\\b");
+  /* ticket:4935 Check the simulation result size via readSimulationResultSize
+   * If the result size is zero then don't switch to the plotting view.
+   */
   if (regExp.indexIn(simulationOptions.getResultFileName()) != -1 &&
-      resultFileInfo.exists() && resultFileLastModifiedDateTime <= resultFileInfo.lastModified()) {
+      resultFileInfo.exists() && resultFileLastModifiedDateTime <= resultFileInfo.lastModified() &&
+      MainWindow::instance()->getOMCProxy()->readSimulationResultSize(resultFileInfo.absoluteFilePath()) > 0) {
     VariablesWidget *pVariablesWidget = MainWindow::instance()->getVariablesWidget();
     OMCProxy *pOMCProxy = MainWindow::instance()->getOMCProxy();
     QStringList list = pOMCProxy->readSimulationResultVars(resultFileInfo.absoluteFilePath());