Skip to content

Commit

Permalink
Added TLM co-simulation in the Libraries Browser context menu.
Browse files Browse the repository at this point in the history 
Allow opening TLM co-simulation output window from TLM co-simulation setup.
  • Loading branch information
@adeas31
adeas31 committed Jun 4, 2015
1 parent 7bd0645 commit a839e5b
Show file tree
Hide file tree
Showing 12 changed files with 106 additions and 67 deletions.
61 changes: 36 additions & 25 deletions OMEdit/OMEditGUI/MainWindow.cpp
View file
Expand Up @@ -908,6 +908,36 @@ void MainWindow::exportModelFigaro(LibraryTreeNode *pLibraryTreeNode)
pExportFigaroDialog->exec();
}

/*!
* \brief MainWindow::TLMSimulate
* \param pLibraryTreeNode
* Starts the TLM co-simulation.
*/
void MainWindow::TLMSimulate(LibraryTreeNode *pLibraryTreeNode)
{
if (pLibraryTreeNode->isSaved()) {
mpTLMCoSimulationDialog->show(pLibraryTreeNode);
} else {
QMessageBox *pMessageBox = new QMessageBox(this);
pMessageBox->setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::question));
pMessageBox->setIcon(QMessageBox::Question);
pMessageBox->setText(tr("Meta model <b>%1</b> has unsaved changes. Do you want to save?").arg(pLibraryTreeNode->getNameStructure()));
pMessageBox->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
pMessageBox->setDefaultButton(QMessageBox::Yes);
int answer = pMessageBox->exec();
switch (answer) {
case QMessageBox::Yes:
if (mpLibraryTreeWidget->saveLibraryTreeNode(pLibraryTreeNode)) {
mpTLMCoSimulationDialog->show(pLibraryTreeNode);
}
break;
case QMessageBox::No:
default:
break;
}
}
}

void MainWindow::exportModelToOMNotebook(LibraryTreeNode *pLibraryTreeNode)
{
/* if Modelica text is changed manually by user then validate it before saving. */
Expand Down Expand Up @@ -1897,35 +1927,16 @@ void MainWindow::exportToClipboard()

/*!
Slot activated when mpTLMSimulateAction triggered signal is raised.\n
Starts the TLM simulation.
Calls the function that starts the TLM simulation.
*/
void MainWindow::TLMSimulate()
{
ModelWidget *pModelWidget = mpModelWidgetContainer->getCurrentModelWidget();
if (pModelWidget) {
if (pModelWidget)
{
LibraryTreeNode *pLibraryTreeNode = pModelWidget->getLibraryTreeNode();
if (pLibraryTreeNode) {
if (pLibraryTreeNode->isSaved()) {
mpTLMCoSimulationDialog->show(pLibraryTreeNode);
} else {
QMessageBox *pMessageBox = new QMessageBox(this);
pMessageBox->setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::question));
pMessageBox->setIcon(QMessageBox::Question);
pMessageBox->setText(tr("Meta model <b>%1</b> has unsaved changes. Do you want to save?").arg(pLibraryTreeNode->getNameStructure()));
pMessageBox->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
pMessageBox->setDefaultButton(QMessageBox::Yes);
int answer = pMessageBox->exec();
switch (answer) {
case QMessageBox::Yes:
if (mpLibraryTreeWidget->saveLibraryTreeNode(pLibraryTreeNode)) {
mpTLMCoSimulationDialog->show(pLibraryTreeNode);
}
break;
case QMessageBox::No:
default:
break;
}
}
TLMSimulate(pLibraryTreeNode);
}
}
}
Expand Down Expand Up @@ -2517,8 +2528,8 @@ void MainWindow::createActions()
mpExportToClipboardAction->setEnabled(false);
connect(mpExportToClipboardAction, SIGNAL(triggered()), SLOT(exportToClipboard()));
// TLM simulate actions
mpTLMCoSimulationAction = new QAction(QIcon(":/Resources/icons/tlm-simulate.svg"), Helper::tlmCoSimulation, this);
mpTLMCoSimulationAction->setStatusTip(tr("starts the TLM co-simulation"));
mpTLMCoSimulationAction = new QAction(QIcon(":/Resources/icons/tlm-simulate.svg"), Helper::tlmCoSimulationSetup, this);
mpTLMCoSimulationAction->setStatusTip(Helper::tlmCoSimulationSetupTip);
mpTLMCoSimulationAction->setEnabled(false);
connect(mpTLMCoSimulationAction, SIGNAL(triggered()), SLOT(TLMSimulate()));
}
Expand Down
1 change: 1 addition & 0 deletions OMEdit/OMEditGUI/MainWindow.h
View file
Expand Up @@ -157,6 +157,7 @@ class MainWindow : public QMainWindow
void exportModelFMU(LibraryTreeNode *pLibraryTreeNode);
void exportModelXML(LibraryTreeNode *pLibraryTreeNode);
void exportModelFigaro(LibraryTreeNode *pLibraryTreeNode);
void TLMSimulate(LibraryTreeNode *pLibraryTreeNode);
void exportModelToOMNotebook(LibraryTreeNode *pLibraryTreeNode);
void createOMNotebookTitleCell(LibraryTreeNode *pLibraryTreeNode, QDomDocument xmlDocument, QDomElement domElement);
void createOMNotebookImageCell(LibraryTreeNode *pLibraryTreeNode, QDomDocument xmlDocument, QDomElement domElement, QString filePath);
Expand Down
18 changes: 18 additions & 0 deletions OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
View file
Expand Up @@ -585,6 +585,10 @@ void LibraryTreeWidget::createActions()
mpExportFigaroAction = new QAction(QIcon(":/Resources/icons/console.svg"), Helper::exportFigaro, this);
mpExportFigaroAction->setStatusTip(Helper::exportFigaroTip);
connect(mpExportFigaroAction, SIGNAL(triggered()), SLOT(exportModelFigaro()));
// TLM co-simulation action
mpTLMCoSimulationAction = new QAction(QIcon(":/Resources/icons/tlm-simulate.svg"), Helper::tlmCoSimulationSetup, this);
mpTLMCoSimulationAction->setStatusTip(Helper::tlmCoSimulationSetupTip);
connect(mpTLMCoSimulationAction, SIGNAL(triggered()), SLOT(TLMSimulate()));
}

//! Let the user add the OM Standard Library to library widget.
Expand Down Expand Up @@ -1598,6 +1602,8 @@ void LibraryTreeWidget::showContextMenu(QPoint point)
menu.addAction(mpUnloadTextFileAction);
break;
case LibraryTreeNode::TLM:
menu.addAction(mpTLMCoSimulationAction);
menu.addSeparator();
menu.addAction(mpUnloadTLMFileAction);
break;
}
Expand Down Expand Up @@ -1791,6 +1797,18 @@ void LibraryTreeWidget::exportModelFigaro()
mpMainWindow->exportModelFigaro(pLibraryTreeNode);
}

void LibraryTreeWidget::TLMSimulate()
{
QList<QTreeWidgetItem*> selectedItemsList = selectedItems();
if (selectedItemsList.isEmpty()) {
return;
}
LibraryTreeNode *pLibraryTreeNode = dynamic_cast<LibraryTreeNode*>(selectedItemsList.at(0));
if (pLibraryTreeNode) {
mpMainWindow->TLMSimulate(pLibraryTreeNode);
}
}

void LibraryTreeWidget::openFile(QString fileName, QString encoding, bool showProgress, bool checkFileExists)
{
/* if the file doesn't exist then remove it from the recent files list. */
Expand Down
2 changes: 2 additions & 0 deletions OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h
View file
Expand Up @@ -213,6 +213,7 @@ class LibraryTreeWidget : public QTreeWidget
QAction *mpExportFMUAction;
QAction *mpExportXMLAction;
QAction *mpExportFigaroAction;
QAction *mpTLMCoSimulationAction;
bool saveModelicaLibraryTreeNode(LibraryTreeNode *pLibraryTreeNode);
bool saveTextLibraryTreeNode(LibraryTreeNode *pLibraryTreeNode);
bool saveTLMLibraryTreeNode(LibraryTreeNode *pLibraryTreeNode);
Expand Down Expand Up @@ -244,6 +245,7 @@ public slots:
void exportModelFMU();
void exportModelXML();
void exportModelFigaro();
void TLMSimulate();
void openFile(QString fileName, QString encoding = Helper::utf8, bool showProgress = true, bool checkFileExists = false);
void openModelicaFile(QString fileName, QString encoding = Helper::utf8, bool showProgress = true);
void openTLMFile(QFileInfo fileInfo, bool showProgress = true);
Expand Down
4 changes: 2 additions & 2 deletions OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
View file
Expand Up @@ -542,8 +542,8 @@ void SimulationDialog::initializeFields(bool isReSimulate, SimulationOptions sim
mIsReSimulate = false;
mClassName = mpLibraryTreeNode->getNameStructure();
mFileName = mpLibraryTreeNode->getFileName();
setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::simulation).append(" - ").append(mClassName));
mpSimulationHeading->setText(QString(Helper::simulation).append(" - ").append(mClassName));
setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::simulationSetup).append(" - ").append(mClassName));
mpSimulationHeading->setText(QString(Helper::simulationSetup).append(" - ").append(mClassName));
// if the class has experiment annotation then read it.
if (mpMainWindow->getOMCProxy()->isExperiment(mClassName)) {
// get the simulation options....
Expand Down
55 changes: 32 additions & 23 deletions OMEdit/OMEditGUI/Simulation/TLMCoSimulationDialog.cpp
View file
Expand Up @@ -90,9 +90,6 @@ TLMCoSimulationDialog::TLMCoSimulationDialog(MainWindow *pMainWindow)
mpMonitorPortLabel = new Label(tr("Monitor Port:"));
mpMonitorPortLabel->setToolTip(tr("Set the port for monitoring connections"));
mpMonitorPortTextBox = new QLineEdit("12111");
// interface request mode
mpInterfaceRequestModeCheckBox = new QCheckBox(tr("Interface Request Mode"));
mpInterfaceRequestModeCheckBox->setToolTip(tr("Run manager in interface request mode, get information about interface locations"));
// tlm manager debug mode
mpManagerDebugModeCheckBox = new QCheckBox(tr("Debug Mode"));
// tlm manager layout
Expand All @@ -104,8 +101,7 @@ TLMCoSimulationDialog::TLMCoSimulationDialog(MainWindow *pMainWindow)
pTLMManagerGridLayout->addWidget(mpServerPortTextBox, 1, 1, 1, 2);
pTLMManagerGridLayout->addWidget(mpMonitorPortLabel, 2, 0);
pTLMManagerGridLayout->addWidget(mpMonitorPortTextBox, 2, 1, 1, 2);
pTLMManagerGridLayout->addWidget(mpInterfaceRequestModeCheckBox, 3, 0, 1, 3);
pTLMManagerGridLayout->addWidget(mpManagerDebugModeCheckBox, 4, 0, 1, 3);
pTLMManagerGridLayout->addWidget(mpManagerDebugModeCheckBox, 3, 0, 1, 3);
mpTLMManagerGroupBox->setLayout(pTLMManagerGridLayout);
// tlm monitor groupBox
mpTLMMonitorGroupBox = new QGroupBox(tr("TLM Monitor"));
Expand All @@ -129,15 +125,21 @@ TLMCoSimulationDialog::TLMCoSimulationDialog(MainWindow *pMainWindow)
pTLMMonitorGridLayout->addWidget(mpMonitorDebugModeCheckBox, 3, 0, 1, 3);
mpTLMMonitorGroupBox->setLayout(pTLMMonitorGridLayout);
// Create the buttons
mpSimulateButton = new QPushButton(Helper::simulate);
mpSimulateButton->setAutoDefault(true);
connect(mpSimulateButton, SIGNAL(clicked()), this, SLOT(simulate()));
// show TLM Co-simulation output window button
mpShowTLMCoSimulationOutputWindowButton = new QPushButton(tr("Show TLM Co-Simulation Output Window"));
mpShowTLMCoSimulationOutputWindowButton->setAutoDefault(false);
connect(mpShowTLMCoSimulationOutputWindowButton, SIGNAL(clicked()), this, SLOT(showTLMCoSimulationOutputWindow()));
// run TLM co-simulation button.
mpRunButton = new QPushButton(Helper::simulate);
mpRunButton->setAutoDefault(true);
connect(mpRunButton, SIGNAL(clicked()), this, SLOT(runTLMCoSimulation()));
// cancel TLM co-simulation dialog button.
mpCancelButton = new QPushButton(Helper::cancel);
mpCancelButton->setAutoDefault(false);
connect(mpCancelButton, SIGNAL(clicked()), this, SLOT(reject()));
// adds buttons to the button box
mpButtonBox = new QDialogButtonBox(Qt::Horizontal);
mpButtonBox->addButton(mpSimulateButton, QDialogButtonBox::ActionRole);
mpButtonBox->addButton(mpRunButton, QDialogButtonBox::ActionRole);
mpButtonBox->addButton(mpCancelButton, QDialogButtonBox::ActionRole);
// validators
QIntValidator *pIntegerValidator = new QIntValidator(this);
Expand All @@ -158,7 +160,8 @@ TLMCoSimulationDialog::TLMCoSimulationDialog(MainWindow *pMainWindow)
pMainLayout->addWidget(mpBrowseTLMPluginPathButton, 2, 2);
pMainLayout->addWidget(mpTLMManagerGroupBox, 3, 0, 1, 3);
pMainLayout->addWidget(mpTLMMonitorGroupBox, 4, 0, 1, 3);
pMainLayout->addWidget(mpButtonBox, 5, 0, 1, 3, Qt::AlignRight);
pMainLayout->addWidget(mpShowTLMCoSimulationOutputWindowButton, 5, 0, 1, 3);
pMainLayout->addWidget(mpButtonBox, 6, 0, 1, 3, Qt::AlignRight);
setLayout(pMainLayout);
// create TLMCoSimulationOutputWidget
mpTLMCoSimulationOutputWidget = new TLMCoSimulationOutputWidget(mpMainWindow);
Expand All @@ -179,8 +182,8 @@ TLMCoSimulationDialog::~TLMCoSimulationDialog()
void TLMCoSimulationDialog::show(LibraryTreeNode *pLibraryTreeNode)
{
mpLibraryTreeNode = pLibraryTreeNode;
setWindowTitle(QString("%1 - %2 - %3").arg(Helper::applicationName).arg(Helper::tlmCoSimulation).arg(mpLibraryTreeNode->getNameStructure()));
mpHeadingLabel->setText(QString("%1 - %2").arg(Helper::tlmCoSimulation).arg(mpLibraryTreeNode->getNameStructure()));
setWindowTitle(QString("%1 - %2 - %3").arg(Helper::applicationName).arg(Helper::tlmCoSimulationSetup).arg(mpLibraryTreeNode->getNameStructure()));
mpHeadingLabel->setText(QString("%1 - %2").arg(Helper::tlmCoSimulationSetup).arg(mpLibraryTreeNode->getNameStructure()));
// if user has nothing in TLM plugin path then read from OptionsDialog
if (mpTLMPluginPathTextBox->text().isEmpty()) {
mpTLMPluginPathTextBox->setText(mpMainWindow->getOptionsDialog()->getTLMPage()->getTLMPluginPathTextBox()->text());
Expand Down Expand Up @@ -258,7 +261,6 @@ TLMCoSimulationOptions TLMCoSimulationDialog::createTLMCoSimulationOptions()
tlmCoSimulationOptions.setManagerProcess(mpManagerProcessTextBox->text());
tlmCoSimulationOptions.setServerPort(mpServerPortTextBox->text());
tlmCoSimulationOptions.setMonitorPort(mpMonitorPortTextBox->text());
tlmCoSimulationOptions.setInterfaceRequestMode(mpInterfaceRequestModeCheckBox->isChecked());
tlmCoSimulationOptions.setManagerDebugMode(mpManagerDebugModeCheckBox->isChecked());
tlmCoSimulationOptions.setMonitorProcess(mpMonitorProcessTextBox->text());
tlmCoSimulationOptions.setNumberOfSteps(mpNumberOfStepsTextBox->text().toInt());
Expand Down Expand Up @@ -301,9 +303,6 @@ TLMCoSimulationOptions TLMCoSimulationDialog::createTLMCoSimulationOptions()
managerArgs.append("-p");
managerArgs.append(mpServerPortTextBox->text());
}
if (mpInterfaceRequestModeCheckBox->isChecked()) {
managerArgs.append("-r");
}
if (mpMonitorDebugModeCheckBox->isChecked()) {
monitorArgs.append("-d");
}
Expand Down Expand Up @@ -350,7 +349,7 @@ void TLMCoSimulationDialog::browseTLMPluginPath()
void TLMCoSimulationDialog::browseManagerProcess()
{
mpManagerProcessTextBox->setText(StringHandler::getOpenFileName(this, QString(Helper::applicationName).append(" - ").append(Helper::chooseFile),
NULL, Helper::exeFileTypes, NULL));
NULL, Helper::exeFileTypes, NULL));
}

/*!
Expand All @@ -360,14 +359,26 @@ void TLMCoSimulationDialog::browseManagerProcess()
void TLMCoSimulationDialog::browseMonitorProcess()
{
mpMonitorProcessTextBox->setText(StringHandler::getOpenFileName(this, QString(Helper::applicationName).append(" - ").append(Helper::chooseFile),
NULL, Helper::exeFileTypes, NULL));
NULL, Helper::exeFileTypes, NULL));
}

/*!
* \brief TLMCoSimulationDialog::showTLMCoSimulationOutputWindow
* Shows the TLM co-simulation output window.
*/
void TLMCoSimulationDialog::showTLMCoSimulationOutputWindow()
{
mpTLMCoSimulationOutputWidget->show();
mpTLMCoSimulationOutputWidget->raise();
mpTLMCoSimulationOutputWidget->activateWindow();
mpTLMCoSimulationOutputWidget->setWindowState(mpTLMCoSimulationOutputWidget->windowState() & (~Qt::WindowMinimized | Qt::WindowActive));
}

/*!
* \brief TLMCoSimulationDialog::simulate
* Starts the TLM co-simulation
*/
void TLMCoSimulationDialog::simulate()
void TLMCoSimulationDialog::runTLMCoSimulation()
{
if (isTLMCoSimulationRunning()) {
QMessageBox::information(this, QString(Helper::applicationName).append(" - ").append(Helper::information),
Expand All @@ -378,10 +389,8 @@ void TLMCoSimulationDialog::simulate()
TLMCoSimulationOptions tlmCoSimulationOptions = createTLMCoSimulationOptions();
if (tlmCoSimulationOptions.isValid()) {
setIsTLMCoSimulationRunning(true);
mpTLMCoSimulationOutputWidget->show(tlmCoSimulationOptions);
mpTLMCoSimulationOutputWidget->raise();
mpTLMCoSimulationOutputWidget->activateWindow();
mpTLMCoSimulationOutputWidget->setWindowState(mpTLMCoSimulationOutputWidget->windowState() & (~Qt::WindowMinimized | Qt::WindowActive));
mpTLMCoSimulationOutputWidget->showTLMCoSimulationOutputWidget(tlmCoSimulationOptions);
showTLMCoSimulationOutputWindow();
accept();
}
}
Expand Down
7 changes: 4 additions & 3 deletions OMEdit/OMEditGUI/Simulation/TLMCoSimulationDialog.h
View file
Expand Up @@ -72,7 +72,6 @@ class TLMCoSimulationDialog : public QDialog
QLineEdit *mpServerPortTextBox;
Label *mpMonitorPortLabel;
QLineEdit *mpMonitorPortTextBox;
QCheckBox *mpInterfaceRequestModeCheckBox;
QCheckBox *mpManagerDebugModeCheckBox;
QGroupBox *mpTLMMonitorGroupBox;
Label *mpMonitorProcessLabel;
Expand All @@ -83,7 +82,8 @@ class TLMCoSimulationDialog : public QDialog
Label *mpTimeStepSizeLabel;
QLineEdit *mpTimeStepSizeTextBox;
QCheckBox *mpMonitorDebugModeCheckBox;
QPushButton *mpSimulateButton;
QPushButton *mpShowTLMCoSimulationOutputWindowButton;
QPushButton *mpRunButton;
QPushButton *mpCancelButton;
QDialogButtonBox *mpButtonBox;
TLMCoSimulationOutputWidget *mpTLMCoSimulationOutputWidget;
Expand All @@ -94,7 +94,8 @@ private slots:
void browseTLMPluginPath();
void browseManagerProcess();
void browseMonitorProcess();
void simulate();
void showTLMCoSimulationOutputWindow();
void runTLMCoSimulation();
};

#endif // TLMCOSIMULATIONDIALOG_H
4 changes: 0 additions & 4 deletions OMEdit/OMEditGUI/Simulation/TLMCoSimulationOptions.h
View file
Expand Up @@ -50,7 +50,6 @@ class TLMCoSimulationOptions
setManagerProcess("");
setServerPort("11111");
setMonitorPort("");
setInterfaceRequestMode(false);
setManagerDebugMode(false);
setMonitorProcess("");
setNumberOfSteps(1000);
Expand All @@ -72,8 +71,6 @@ class TLMCoSimulationOptions
QString getServerPort() {return mServerPort;}
void setMonitorPort(QString monitorPort) {mMonitorPort = monitorPort;}
QString getMonitorPort() {return mMonitorPort;}
void setInterfaceRequestMode(bool interfaceRequestMode) {mInterfaceRequestMode = interfaceRequestMode;}
bool getInterfaceRequestMode() {return mInterfaceRequestMode;}
void setManagerDebugMode(bool managerDebugMode) {mManagerDebugMode = managerDebugMode;}
bool getManagerDebugMode() {return mManagerDebugMode;}
QString getMonitorProcess() {return mMonitorProcess;}
Expand All @@ -97,7 +94,6 @@ class TLMCoSimulationOptions
QString mManagerProcess;
QString mServerPort;
QString mMonitorPort;
bool mInterfaceRequestMode;
bool mManagerDebugMode;
QString mMonitorProcess;
int mNumberOfSteps;
Expand Down
10 changes: 3 additions & 7 deletions OMEdit/OMEditGUI/Simulation/TLMCoSimulationOutputWidget.cpp
View file
Expand Up @@ -61,6 +61,7 @@ TLMCoSimulationOutputWidget::TLMCoSimulationOutputWidget(MainWindow *pMainWindow
connect(mpStopManagerButton, SIGNAL(clicked()), SLOT(stopManager()));
// open manager log button
mpOpenManagerLogFileButton = new QPushButton(tr("Open Manager Log File"));
mpOpenManagerLogFileButton->setEnabled(false);
connect(mpOpenManagerLogFileButton, SIGNAL(clicked()), SLOT(openManagerLogFile()));
// manager buttons layout
QHBoxLayout *pManagerButtonsHorizontalLayout = new QHBoxLayout;
Expand All @@ -77,6 +78,7 @@ TLMCoSimulationOutputWidget::TLMCoSimulationOutputWidget(MainWindow *pMainWindow
connect(mpStopMonitorButton, SIGNAL(clicked()), SLOT(stopMonitor()));
// open monitor log button
mpOpenMonitorLogFileButton = new QPushButton(tr("Open Monitor Log File"));
mpOpenMonitorLogFileButton->setEnabled(false);
connect(mpOpenMonitorLogFileButton, SIGNAL(clicked()), SLOT(openMonitorLogFile()));
// monitor buttons layout
QHBoxLayout *pMonitorButtonsHorizontalLayout = new QHBoxLayout;
Expand Down Expand Up @@ -117,7 +119,7 @@ TLMCoSimulationOutputWidget::~TLMCoSimulationOutputWidget()
clear();
}

void TLMCoSimulationOutputWidget::show(TLMCoSimulationOptions tlmCoSimulationOptions)
void TLMCoSimulationOutputWidget::showTLMCoSimulationOutputWidget(TLMCoSimulationOptions tlmCoSimulationOptions)
{
mTLMCoSimulationOptions = tlmCoSimulationOptions;
setWindowTitle(QString("%1 - %2 %3").arg(Helper::applicationName).arg(mTLMCoSimulationOptions.getClassName()).arg(Helper::tlmCoSimulation));
Expand All @@ -139,12 +141,6 @@ void TLMCoSimulationOutputWidget::clear()
mpMainWindow->getTLMCoSimulationDialog()->setIsTLMCoSimulationRunning(false);
}

void TLMCoSimulationOutputWidget::closeEvent(QCloseEvent *event)
{
clear();
event->accept();
}

/*!
Slot activated when mpStopManagerButton clicked signal is raised.\n
Kills the manager process.
Expand Down
3 changes: 1 addition & 2 deletions OMEdit/OMEditGUI/Simulation/TLMCoSimulationOutputWidget.h
View file
Expand Up @@ -51,9 +51,8 @@ class TLMCoSimulationOutputWidget : public QWidget
TLMCoSimulationOutputWidget(MainWindow *pMainWindow);
~TLMCoSimulationOutputWidget();
TLMCoSimulationOptions getTLMCoSimulationOptions() {return mTLMCoSimulationOptions;}
void show(TLMCoSimulationOptions tlmCoSimulationOptions);
void showTLMCoSimulationOutputWidget(TLMCoSimulationOptions tlmCoSimulationOptions);
void clear();
void closeEvent(QCloseEvent *event);
private:
TLMCoSimulationOptions mTLMCoSimulationOptions;
MainWindow *mpMainWindow;
Expand Down

0 comments on commit a839e5b

Please sign in to comment.