Changeset 14f3280 in OpenModelica

Timestamp:

2016-07-01T00:55:43+02:00 (8 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

612047b

Parents:

4de91514

Message:

Only create dialogs when they are really needed.

File:

• OMEdit/OMEditGUI/MainWindow.cpp (modified) (14 diffs)

OMEdit/OMEditGUI/MainWindow.cpp

@@ -63 +63 @@
    * Don't remove/move the following lines.
    * Because RecentFile, FindTextOM and DebuggerConfiguration structs should be registered before reading the recentFilesList, FindTextOM and
-     DebuggerConfiguration section respectively from the settings file.
+   * DebuggerConfiguration section respectively from the settings file.
    */
   qRegisterMetaTypeStreamOperators<RecentFile>("RecentFile");
@@ -251 +251 @@
   createToolbars();
   createMenus();
-  // Create simulation dialog
-  mpSimulationDialog = new SimulationDialog(this);
-  // Create TLM co-simulation dialog
-  mpTLMCoSimulationDialog = new TLMCoSimulationDialog(this);
+  // Create simulation dialog when needed
+  mpSimulationDialog = 0;
+  // Create TLM co-simulation dialog when needed
+  mpTLMCoSimulationDialog = 0;
   // Create an object of ModelWidgetContainer
   mpModelWidgetContainer = new ModelWidgetContainer(this);
@@ -260 +260 @@
   mpWelcomePageWidget = new WelcomePageWidget(this);
   updateRecentFileActions();
-  // create the OMEdit About widget
-  mpAboutOMEditDialog = new AboutOMEditWidget(this);
-  mpAboutOMEditDialog->hide();
+  // create the OMEdit About widget when needed
+  mpAboutOMEditDialog = 0;
   // create an instance of InfoBar
   mpInfoBar = new InfoBar(this);
@@ -455 +454 @@
   delete mpOMCProxy;
   delete mpModelWidgetContainer;
-  delete mpSimulationDialog;
-  delete mpTLMCoSimulationDialog;
+  if (mpSimulationDialog) {
+    delete mpSimulationDialog;
+  }
+  if (mpTLMCoSimulationDialog) {
+    delete mpTLMCoSimulationDialog;
+  }
+  if (mpAboutOMEditDialog) {
+    delete mpAboutOMEditDialog;
+  }
   /* save the TransformationsWidget last window geometry and splitters state. */
   QSettings *pSettings = Utilities::getApplicationSettings();
@@ -552 +558 @@
 void MainWindow::simulate(LibraryTreeItem *pLibraryTreeItem)
 {
+  if (!mpSimulationDialog) {
+    mpSimulationDialog = new SimulationDialog(this);
+  }
   /* if Modelica text is changed manually by user then validate it before saving. */
   if (pLibraryTreeItem->getModelWidget()) {
@@ -563 +572 @@
 void MainWindow::simulateWithTransformationalDebugger(LibraryTreeItem *pLibraryTreeItem)
 {
+  if (!mpSimulationDialog) {
+    mpSimulationDialog = new SimulationDialog(this);
+  }
   /* if Modelica text is changed manually by user then validate it before saving. */
   if (pLibraryTreeItem->getModelWidget()) {
@@ -574 +586 @@
 void MainWindow::simulateWithAlgorithmicDebugger(LibraryTreeItem *pLibraryTreeItem)
 {
+  if (!mpSimulationDialog) {
+    mpSimulationDialog = new SimulationDialog(this);
+  }
   /* if Modelica text is changed manually by user then validate it before saving. */
   if (pLibraryTreeItem->getModelWidget()) {
@@ -585 +600 @@
 void MainWindow::simulationSetup(LibraryTreeItem *pLibraryTreeItem)
 {
+  if (!mpSimulationDialog) {
+    mpSimulationDialog = new SimulationDialog(this);
+  }
   /* if Modelica text is changed manually by user then validate it before saving. */
   if (pLibraryTreeItem->getModelWidget()) {
@@ -802 +820 @@
 void MainWindow::TLMSimulate(LibraryTreeItem *pLibraryTreeItem)
 {
+  if (!mpTLMCoSimulationDialog) {
+    mpTLMCoSimulationDialog = new TLMCoSimulationDialog(this);
+  }
   /* if MetaModel text is changed manually by user then validate it before starting the TLM co-simulation. */
   if (pLibraryTreeItem->getModelWidget()) {
@@ -2030 +2051 @@
 void MainWindow::openAboutOMEdit()
 {
+  if (!mpAboutOMEditDialog) {
+    mpAboutOMEditDialog = new AboutOMEditWidget(this);
+  }
   mpAboutOMEditDialog->setGeometry(QRect(rect().center() - QPoint(262, 235), rect().center() + QPoint(262, 235)));
   mpAboutOMEditDialog->setFocus(Qt::ActiveWindowFocusReason);
@@ -3293 +3317 @@
 
 /*!
-  \class AboutOMEditWidget
-  \brief Creates a widget that shows the about text of OMEdit.
-
-  Information about OpenModelica Connection Editor. Shows the list of OMEdit contributors.
-  */
-
-/*!
-  \param pParent - pointer to MainWindow
-  */
+ * \class AboutOMEditWidget
+ * \brief Creates a widget that shows the about text of OMEdit.
+ * Information about OpenModelica Connection Editor. Shows the list of OMEdit contributors.
+ */
+/*!
+ * \brief AboutOMEditWidget::AboutOMEditWidget
+ * \param pParent - pointer to MainWindow
+ */
 AboutOMEditWidget::AboutOMEditWidget(MainWindow *pMainWindow)
   : QWidget(pMainWindow)
@@ -3380 +3403 @@
   // set the layout
   QGridLayout *pMainLayout = new QGridLayout;
-  pMainLayout->setContentsMargins(45, 200, 45, 20);
+  pMainLayout->setContentsMargins(25, 200, 25, 20);
   pMainLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
   pMainLayout->addWidget(pScrollArea, 0, 0);
@@ -3388 +3411 @@
 
 /*!
-  Reimplementation of paintEvent.\n
-  Draws the background image.
-  \param event - pointer to QPaintEvent
-  */
+ * \brief AboutOMEditWidget::paintEvent
+ * Reimplementation of paintEvent.\n
+ * Draws the background image.
+ * \param event - pointer to QPaintEvent
+ */
 void AboutOMEditWidget::paintEvent(QPaintEvent *pEvent)
 {
@@ -3401 +3425 @@
 
 /*!
-  Reimplementation of keyPressEvent.\n
-  Hides the widget.
-  */
+ * \brief AboutOMEditWidget::keyPressEvent
+ * Reimplementation of keyPressEvent.\n
+ * Hides the widget when ESC key is pressed.
+ * \param pEvent
+ */
 void AboutOMEditWidget::keyPressEvent(QKeyEvent *pEvent)
 {
-  if (pEvent->key() == Qt::Key_Escape)
+  if (pEvent->key() == Qt::Key_Escape) {
     hide();
+  }
   QWidget::keyPressEvent(pEvent);
 }