Changeset 7094b7c in OpenModelica for OMEdit/OMEditLIB/OMS/OMSSimulationOutputWidget.cpp

Timestamp:

2020-06-12T14:35:32+02:00 (4 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Parents:

327c277

git-author:

Adeel Asghar <adeel.asghar@…> (05/29/20 14:56:19)

git-committer:

Adeel Asghar <adeel.asghar@…> (06/12/20 14:35:32)

Message:

Snapshot based redo undo functionality for OMSimulator models

Create new OMSimulator models by right clicking in the Libraries Browser
Improved the addsubmodel dialog. Let user first select the file and then propose name from filename.
Fixes ticket:5789
Fixes ticket:5984
Disable the text view if its not allowed to edit.
Tabs should be preserved when accepting text changes.
The open nodes of the tree view in the libraries browser should be preserved when accepting text changes.

Handle deletion of multiple components.
Convert dots to underscores in submodel name.
Set background-color to show the read-only ssp editor as disbaled.
Renamed OMSimulator menu item to SSP.
Use the same GUI buttons for simulation.
Separated instantiation from simulation setup.
Disable the changes once the model is in instantiated state.
Get rid of OMSSimulationOptions.h InstantiateDialog.h/.cpp
Accept text changes when user clicks in the libraries browser.
Open directly the file browser when adding a submodel.
Use just one setting for working directory.

File:

• OMEdit/OMEditLIB/OMS/OMSSimulationOutputWidget.cpp (modified) (7 diffs)

OMEdit/OMEditLIB/OMS/OMSSimulationOutputWidget.cpp

@@ -38 +38 @@
 #include "OMSProxy.h"
 #include "Modeling/LibraryTreeWidget.h"
+#include "Options/OptionsDialog.h"
 
 #include <QGridLayout>
 #include <QtCore/qmath.h>
 
-OMSSimulationOutputWidget::OMSSimulationOutputWidget(OMSSimulationOptions omsSimulationOptions, QWidget *pParent)
-  : mOMSSimulationOptions(omsSimulationOptions)
+OMSSimulationOutputWidget::OMSSimulationOutputWidget(const QString &cref, QWidget *pParent)
+  : QWidget(pParent), mCref(cref)
 {
-  Q_UNUSED(pParent);
-  setWindowTitle(QString("%1 - %2 - %3").arg(Helper::applicationName)
-                 .arg(mOMSSimulationOptions.getModelName()).arg(Helper::simulationOutput));
+  setWindowTitle(QString("%1 - %2 - %3").arg(Helper::applicationName, mCref, Helper::simulationOutput));
   resize(640, 120);
   // simulation widget heading
-  mpSimulationHeading = Utilities::getHeadingLabel(QString("%1 - %2")
-                                                   .arg(tr("OMSimulator Simulation"), mOMSSimulationOptions.getModelName()));
+  mpSimulationHeading = Utilities::getHeadingLabel(QString("%1 - %2").arg(tr("OMSimulator Simulation"), mCref));
   mpSimulationHeading->setElideMode(Qt::ElideMiddle);
   // Horizontal separator
   mpHorizontalLine = Utilities::getHeadingLine();
   // progress label
-  mpProgressLabel = new Label(tr("Running simulation of <b>%1</b>. Please wait for a while.").arg(mOMSSimulationOptions.getModelName()));
+  mpProgressLabel = new Label(tr("Running simulation of <b>%1</b>. Please wait for a while.").arg(mCref));
   mpProgressLabel->setTextFormat(Qt::RichText);
   mpCancelSimulationButton = new QPushButton(Helper::cancelSimulation);
@@ -75 +73 @@
   pMainLayout->addWidget(mpCancelSimulationButton, 3, 1);
   setLayout(pMainLayout);
+  // save the model start time
+  OMSProxy::instance()->getStartTime(mCref, &mStartTime);
+  // save the model stop time
+  OMSProxy::instance()->getStopTime(mCref, &mStopTime);
   // create the ArchivedSimulationItem
-  mpArchivedOMSSimulationItem = new ArchivedOMSSimulationItem(mOMSSimulationOptions, this);
+  mpArchivedOMSSimulationItem = new ArchivedOMSSimulationItem(mCref, mStartTime, mStopTime, this);
   MainWindow::instance()->getOMSSimulationDialog()->getArchivedSimulationsTreeWidget()->addTopLevelItem(mpArchivedOMSSimulationItem);
   // save the last modified datetime of result file.
-  QFileInfo resultFileInfo(mOMSSimulationOptions.getWorkingDirectory() + "/" + mOMSSimulationOptions.getResultFileName());
+  char *fileName = (char*)"";
+  int bufferSize;
+  OMSProxy::instance()->getResultFile(mCref, &fileName, &bufferSize);
+  mResultFilePath = QString("%1/%2").arg(OptionsDialog::instance()->getGeneralSettingsPage()->getWorkingDirectory(), QString(fileName));
+  QFileInfo resultFileInfo(mResultFilePath);
   if (resultFileInfo.exists()) {
     mResultFileLastModifiedDateTime = resultFileInfo.lastModified();
@@ -87 +93 @@
   mIsSimulationRunning = false;
   // initialize the model
-  if (OMSProxy::instance()->initialize(mOMSSimulationOptions.getModelName())) {
+  if (OMSProxy::instance()->initialize(mCref)) {
     // start the asynchronous simulation
     qRegisterMetaType<oms_status_enu_t>("oms_status_enu_t");
     connect(this, SIGNAL(sendSimulationProgress(QString,double,oms_status_enu_t)), SLOT(simulationProgress(QString,double,oms_status_enu_t)));
-    if (OMSProxy::instance()->simulate_asynchronous(mOMSSimulationOptions.getModelName())) {
+    if (OMSProxy::instance()->simulate_asynchronous(mCref)) {
       mIsSimulationRunning = true;
       mpCancelSimulationButton->setEnabled(true);
     } else {
-      mpProgressLabel->setText(tr("Simulation using the <b>%1</b> model is failed. %2")
-                               .arg(mOMSSimulationOptions.getModelName())
-                               .arg(GUIMessages::getMessage(GUIMessages::CHECK_MESSAGES_BROWSER)));
+      mpProgressLabel->setText(tr("Simulation using the <b>%1</b> model is failed. %2").arg(mCref).arg(GUIMessages::getMessage(GUIMessages::CHECK_MESSAGES_BROWSER)));
       mpProgressBar->setValue(mpProgressBar->maximum());
       mpArchivedOMSSimulationItem->setStatus(tr("Simulation failed!"));
@@ -103 +107 @@
   } else {
     LibraryTreeItem *pLibraryTreeItem;
-    pLibraryTreeItem = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem(mOMSSimulationOptions.getModelName());
+    pLibraryTreeItem = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItemOneLevel(mCref);
     if (pLibraryTreeItem) {
       MainWindow::instance()->instantiateOMSModel(pLibraryTreeItem, false);
     }
-    mpProgressLabel->setText(tr("Initialization using the <b>%1</b> model is failed. %2")
-                             .arg(mOMSSimulationOptions.getModelName())
-                             .arg(GUIMessages::getMessage(GUIMessages::CHECK_MESSAGES_BROWSER)));
+    mpProgressLabel->setText(tr("Initialization using the <b>%1</b> model is failed. %2").arg(mCref).arg(GUIMessages::getMessage(GUIMessages::CHECK_MESSAGES_BROWSER)));
     mpProgressBar->setValue(mpProgressBar->maximum());
     mpArchivedOMSSimulationItem->setStatus(tr("Initialization failed!"));
@@ -136 +138 @@
 {
   // cancel the simulation
-  if (OMSProxy::instance()->cancelSimulation_asynchronous(mOMSSimulationOptions.getModelName())) {
+  if (OMSProxy::instance()->cancelSimulation_asynchronous(mCref)) {
     LibraryTreeItem *pLibraryTreeItem;
-    pLibraryTreeItem = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem(mOMSSimulationOptions.getModelName());
+    pLibraryTreeItem = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItemOneLevel(mCref);
     if (pLibraryTreeItem) {
       MainWindow::instance()->instantiateOMSModel(pLibraryTreeItem, false);
     }
-    mpProgressLabel->setText(tr("Simulation using the <b>%1</b> model is cancelled.").arg(mOMSSimulationOptions.getModelName()));
+    mpProgressLabel->setText(tr("Simulation using the <b>%1</b> model is cancelled.").arg(mCref));
     mpProgressBar->setValue(mpProgressBar->maximum());
     mIsSimulationRunning = false;
@@ -160 +162 @@
 {
   if (status < oms_status_warning) {
-    int progress = (time * 100) / mOMSSimulationOptions.getStopTime();
+    int progress = (time * 100) / mStopTime;
     mpProgressBar->setValue(progress);
-    if (time >= mOMSSimulationOptions.getStopTime()) {
-      mpProgressLabel->setText(tr("Simulation using the <b>%1</b> model is finished.").arg(mOMSSimulationOptions.getModelName()));
+    if (time >= mStopTime) {
+      mpProgressLabel->setText(tr("Simulation using the <b>%1</b> model is finished.").arg(mCref));
       mpProgressBar->setValue(mpProgressBar->maximum());
       mIsSimulationRunning = false;
@@ -175 +177 @@
       }
       // simulation finished show the results
-      MainWindow::instance()->getOMSSimulationDialog()->simulationFinished(mOMSSimulationOptions, mResultFileLastModifiedDateTime);
+      MainWindow::instance()->getOMSSimulationDialog()->simulationFinished(mResultFilePath, mResultFileLastModifiedDateTime);
     }
   }