Merge pull request #58 from adeas31/optim

Make the OMEdit compilation faster.

OMEdit/OMEditGUI/Animation/AnimationWindow.cpp

@@ -33,11 +33,19 @@
  */
 
 #include "AnimationWindow.h"
+#include "MainWindow.h"
+#include "Options/OptionsDialog.h"
+#include "Modeling/MessagesWidget.h"
+#include "Plotting/PlotWindowContainer.h"
+#include "Visualizer.h"
+#include "VisualizerMAT.h"
+#include "VisualizerCSV.h"
+#include "VisualizerFMU.h"
 
 /*!
-  \class AnimationWindow
-  \brief A QMainWindow for animation.
-  */
+ * \class AnimationWindow
+ * \brief A QMainWindow for animation.
+ */
 /*!
  * \brief AnimationWindow::AnimationWindow
  * \param pPlotWindowContainer
@@ -73,7 +81,7 @@ AnimationWindow::AnimationWindow(PlotWindowContainer *pPlotWindowContainer)
   QObject::connect(&mRenderFrameTimer, SIGNAL(timeout()), this, SLOT(renderFrame()));
   mRenderFrameTimer.start();
   // actions and widgets for the toolbar
-  int toolbarIconSize = mpPlotWindowContainer->getMainWindow()->getOptionsDialog()->getGeneralSettingsPage()->getToolbarIconSizeSpinBox()->value();
+  int toolbarIconSize = MainWindow::instance()->getOptionsDialog()->getGeneralSettingsPage()->getToolbarIconSizeSpinBox()->value();
   mpAnimationChooseFileAction = new QAction(QIcon(":/Resources/icons/open.svg"), Helper::animationChooseFile, this);
   mpAnimationChooseFileAction->setStatusTip(Helper::animationChooseFileTip);
   mpAnimationInitializeAction = new QAction(QIcon(":/Resources/icons/initialize.svg"), Helper::animationInitialize, this);
@@ -92,7 +100,7 @@ AnimationWindow::AnimationWindow(PlotWindowContainer *pPlotWindowContainer)
   mpAnimationSlider->setEnabled(false);
   QDoubleValidator *pDoubleValidator = new QDoubleValidator(this);
   pDoubleValidator->setBottom(0);
-  mpAnimationTimeLabel = new QLabel();
+  mpAnimationTimeLabel = new Label;
   mpAnimationTimeLabel->setText(tr("Time [s]:"));
   mpTimeTextBox = new QLineEdit("0.0", this);
   mpTimeTextBox->setMaximumSize(QSize(toolbarIconSize*2, toolbarIconSize));
@@ -263,9 +271,9 @@ void AnimationWindow::loadVisualization()
   } else if (isCSV(mFileName)) {
     visType = VisType::CSV;
   } else {
-    mpPlotWindowContainer->getMainWindow()->getMessagesWidget()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0,
-                                                                                           tr("Unknown visualization type."),
-                                                                                           Helper::scriptingKind, Helper::errorLevel));
+    MainWindow::instance()->getMessagesWidget()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0,
+                                                                           tr("Unknown visualization type."),
+                                                                           Helper::scriptingKind, Helper::errorLevel));
   }
   //init visualizer
   if (visType == VisType::MAT) {
@@ -276,15 +284,15 @@ void AnimationWindow::loadVisualization()
     mpVisualizer = new VisualizerFMU(mFileName, mPathName);
   } else {
     QString msg = tr("Could not init %1 %2.").arg(QString(mPathName.c_str())).arg(QString(mFileName.c_str()));
-    mpPlotWindowContainer->getMainWindow()->getMessagesWidget()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0, msg,
-                                                                                           Helper::scriptingKind, Helper::errorLevel));
+    MainWindow::instance()->getMessagesWidget()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0, msg,
+                                                                           Helper::scriptingKind, Helper::errorLevel));
   }
   //load the XML File, build osgTree, get initial values for the shapes
   bool xmlExists = checkForXMLFile(mFileName, mPathName);
   if (!xmlExists) {
     QString msg = tr("Could not find the visual XML file %1.").arg(QString(assembleXMLFileName(mFileName, mPathName).c_str()));
-    mpPlotWindowContainer->getMainWindow()->getMessagesWidget()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0, msg,
-                                                                                           Helper::scriptingKind, Helper::errorLevel));
+    MainWindow::instance()->getMessagesWidget()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0, msg,
+                                                                           Helper::scriptingKind, Helper::errorLevel));
   } else {
     connect(mpVisualizer->getTimeManager()->getUpdateSceneTimer(), SIGNAL(timeout()), SLOT(updateScene()));
     mpVisualizer->initData();

OMEdit/OMEditGUI/Animation/AnimationWindow.h

@@ -48,19 +48,18 @@
 #include <osgViewer/CompositeViewer>
 #include <osgViewer/View>
 #include <osgViewer/ViewerEventHandlers>
-#include "MainWindow.h"
 #include <../../osgQt/OMEdit_GraphicsWindowQt.h>
 
-#include "Utilities.h"
-#include "AnimationUtil.h"
-#include "OMPlot.h"
-#include "Visualizer.h"
-#include "VisualizerMAT.h"
-#include "VisualizerCSV.h"
-#include "VisualizerFMU.h"
+#include <QMainWindow>
+#include <QToolBar>
+#include <QSlider>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QTimer>
 
-class MainWindow;
 class PlotWindowContainer;
+class VisualizerAbstract;
+class Label;
 
 class AnimationWindow : public QMainWindow, public osgViewer::CompositeViewer
 {
@@ -106,7 +105,7 @@ public slots:
   QTimer mRenderFrameTimer;
   QToolBar* mpAnimationToolBar;
   QSlider* mpAnimationSlider;
-  QLabel *mpAnimationTimeLabel;
+  Label *mpAnimationTimeLabel;
   QLineEdit *mpTimeTextBox;
   Label *mpAnimationSpeedLabel;
   QComboBox *mpSpeedComboBox;

OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp

@@ -32,9 +32,8 @@
  * @author Adeel Asghar <adeel.asghar@liu.se>
  */
 
-#include "MainWindow.h"
 #include "BitmapAnnotation.h"
-#include "Commands.h"
+#include "Modeling/Commands.h"
 
 BitmapAnnotation::BitmapAnnotation(QString classFileName, QString annotation, GraphicsView *pGraphicsView)
   : ShapeAnnotation(false, pGraphicsView, 0)
@@ -92,7 +91,7 @@ void BitmapAnnotation::parseShapeAnnotation(QString annotation)
       mExtents.replace(i, QPointF(extentPoints.at(0).toFloat(), extentPoints.at(1).toFloat()));
   }
   // 5th item is the fileName
-  setFileName(StringHandler::removeFirstLastQuotes(list.at(4)), mpComponent);
+  setFileName(StringHandler::removeFirstLastQuotes(list.at(4)));
   // 6th item is the imageSource
   if (list.size() >= 6) {
     mImageSource = StringHandler::removeFirstLastQuotes(list.at(5));

OMEdit/OMEditGUI/Annotations/BitmapAnnotation.h

@@ -36,10 +36,8 @@
 #define BITMAPANNOTATION_H
 
 #include "ShapeAnnotation.h"
-#include "Component.h"
-
-class OMCProxy;
 
+class Component;
 class BitmapAnnotation : public ShapeAnnotation
 {
   Q_OBJECT

OMEdit/OMEditGUI/Annotations/EllipseAnnotation.cpp

@@ -32,9 +32,8 @@
  * @author Adeel Asghar <adeel.asghar@liu.se>
  */
 
-#include "MainWindow.h"
 #include "EllipseAnnotation.h"
-#include "Commands.h"
+#include "Modeling/Commands.h"
 
 EllipseAnnotation::EllipseAnnotation(QString annotation, GraphicsView *pGraphicsView)
   : ShapeAnnotation(false, pGraphicsView, 0)

OMEdit/OMEditGUI/Annotations/EllipseAnnotation.h

@@ -36,10 +36,8 @@
 #define ELLIPSEANNOTATION_H
 
 #include "ShapeAnnotation.h"
-#include "Component.h"
 
 class Component;
-
 class EllipseAnnotation : public ShapeAnnotation
 {
   Q_OBJECT

OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp

@@ -34,7 +34,7 @@
 
 #include "MainWindow.h"
 #include "LineAnnotation.h"
-#include "Commands.h"
+#include "Modeling/Commands.h"
 
 LineAnnotation::LineAnnotation(QString annotation, GraphicsView *pGraphicsView)
   : ShapeAnnotation(false, pGraphicsView, 0)
@@ -772,7 +772,7 @@ void LineAnnotation::updateConnectionAnnotation()
     // get the connection line annotation.
     QString annotationString = QString("annotate=").append(getShapeAnnotation());
     // update the connection
-    OMCProxy *pOMCProxy = mpGraphicsView->getModelWidget()->getModelWidgetContainer()->getMainWindow()->getOMCProxy();
+    OMCProxy *pOMCProxy = MainWindow::instance()->getOMCProxy();
     pOMCProxy->updateConnection(getStartComponentName(), getEndComponentName(),
                                 mpGraphicsView->getModelWidget()->getLibraryTreeItem()->getNameStructure(), annotationString);
   }

OMEdit/OMEditGUI/Annotations/LineAnnotation.h

@@ -36,10 +36,13 @@
 #define LINEANNOTATION_H
 
 #include "ShapeAnnotation.h"
-#include "Component.h"
 
-class Component;
+#include <QTreeView>
+#include <QSortFilterProxyModel>
+#include <QSpinBox>
 
+class Label;
+class Component;
 class LineAnnotation : public ShapeAnnotation
 {
   Q_OBJECT

OMEdit/OMEditGUI/Annotations/PolygonAnnotation.cpp

@@ -32,9 +32,8 @@
  * @author Adeel Asghar <adeel.asghar@liu.se>
  */
 
-#include "MainWindow.h"
 #include "PolygonAnnotation.h"
-#include "Commands.h"
+#include "Modeling/Commands.h"
 
 PolygonAnnotation::PolygonAnnotation(QString annotation, GraphicsView *pGraphicsView)
   : ShapeAnnotation(false, pGraphicsView, 0)

OMEdit/OMEditGUI/Annotations/PolygonAnnotation.h

@@ -36,10 +36,8 @@
 #define POLYGONANNOTATION_H
 
 #include "ShapeAnnotation.h"
-#include "Component.h"
 
 class Component;
-
 class PolygonAnnotation : public ShapeAnnotation
 {
   Q_OBJECT

OMEdit/OMEditGUI/Annotations/RectangleAnnotation.cpp

@@ -32,9 +32,8 @@
  * @author Adeel Asghar <adeel.asghar@liu.se>
  */
 
-#include "MainWindow.h"
 #include "RectangleAnnotation.h"
-#include "Commands.h"
+#include "Modeling/Commands.h"
 
 RectangleAnnotation::RectangleAnnotation(QString annotation, GraphicsView *pGraphicsView)
   : ShapeAnnotation(false, pGraphicsView, 0)

OMEdit/OMEditGUI/Annotations/RectangleAnnotation.h

@@ -36,10 +36,8 @@
 #define RECTANGLEANNOTATION_H
 
 #include "ShapeAnnotation.h"
-#include "Component.h"
 
 class Component;
-
 class RectangleAnnotation : public ShapeAnnotation
 {
   Q_OBJECT

OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp

@@ -32,14 +32,16 @@
  * @author Adeel Asghar <adeel.asghar@liu.se>
  */
 
-#include "MainWindow.h"
 #include "ShapeAnnotation.h"
-#include "ModelWidgetContainer.h"
+#include "Util/Helper.h"
+#include "MainWindow.h"
+#include "Options/OptionsDialog.h"
+#include "Modeling/ModelWidgetContainer.h"
 #include "ShapePropertiesDialog.h"
-#include "Commands.h"
-#include "ComponentProperties.h"
-#include "FetchInterfaceDataDialog.h"
-#include "VariablesWidget.h"
+#include "Modeling/Commands.h"
+#include "Component/ComponentProperties.h"
+#include "TLM/FetchInterfaceDataDialog.h"
+#include "Plotting/VariablesWidget.h"
 
 /*!
  * \brief GraphicItem::setDefaults
@@ -395,28 +397,23 @@ void ShapeAnnotation::setDefaults(ShapeAnnotation *pShapeAnnotation)
   */
 void ShapeAnnotation::setUserDefaults()
 {
-  OptionsDialog *pOptionsDialog = mpGraphicsView->getModelWidget()->getModelWidgetContainer()->getMainWindow()->getOptionsDialog();
+  OptionsDialog *pOptionsDialog = MainWindow::instance()->getOptionsDialog();
   /* Set user Line Style settings */
-  if (pOptionsDialog->getLineStylePage()->getLineColor().isValid())
-  {
+  if (pOptionsDialog->getLineStylePage()->getLineColor().isValid()) {
     mLineColor = pOptionsDialog->getLineStylePage()->getLineColor();
   }
   mLinePattern = StringHandler::getLinePatternType(pOptionsDialog->getLineStylePage()->getLinePattern());
   mLineThickness = pOptionsDialog->getLineStylePage()->getLineThickness();
   mArrow.replace(0, StringHandler::getArrowType(pOptionsDialog->getLineStylePage()->getLineStartArrow()));
   mArrow.replace(1, StringHandler::getArrowType(pOptionsDialog->getLineStylePage()->getLineEndArrow()));
   mArrowSize = pOptionsDialog->getLineStylePage()->getLineArrowSize();
-  if (pOptionsDialog->getLineStylePage()->getLineSmooth())
-  {
+  if (pOptionsDialog->getLineStylePage()->getLineSmooth()) {
     mSmooth = StringHandler::SmoothBezier;
-  }
-  else
-  {
+  } else {
     mSmooth = StringHandler::SmoothNone;
   }
   /* Set user Fill Style settings */
-  if (pOptionsDialog->getFillStylePage()->getFillColor().isValid())
-  {
+  if (pOptionsDialog->getFillStylePage()->getFillColor().isValid()) {
     mFillColor = pOptionsDialog->getFillStylePage()->getFillColor();
   }
   mFillPattern = StringHandler::getFillPatternType(pOptionsDialog->getFillStylePage()->getFillPattern());
@@ -701,28 +698,20 @@ void ShapeAnnotation::setTextString(QString textString)
  * \brief ShapeAnnotation::setFileName
  * Sets the file name.
  * \param fileName
- * \param pComponent
  */
-void ShapeAnnotation::setFileName(QString fileName, Component *pComponent)
+void ShapeAnnotation::setFileName(QString fileName)
 {
   if (fileName.isEmpty()) {
     mOriginalFileName = fileName;
     mFileName = fileName;
     return;
   }
 
-  OMCProxy *pOMCProxy = 0;
-  if (pComponent) {
-    pOMCProxy = pComponent->getGraphicsView()->getModelWidget()->getModelWidgetContainer()->getMainWindow()->getOMCProxy();
-  } else {
-    pOMCProxy = mpGraphicsView->getModelWidget()->getModelWidgetContainer()->getMainWindow()->getOMCProxy();
-  }
-
+  OMCProxy *pOMCProxy = MainWindow::instance()->getOMCProxy();
   mOriginalFileName = fileName;
   QUrl fileUrl(mOriginalFileName);
   QFileInfo fileInfo(mOriginalFileName);
   QFileInfo classFileInfo(mClassFileName);
-
   /* if its a modelica:// link then make it absolute path */
   if (fileUrl.scheme().toLower().compare("modelica") == 0) {
     mFileName = pOMCProxy->uriToFilename(mOriginalFileName);
@@ -790,7 +779,7 @@ QVariant ShapeAnnotation::getDynamicValue(QString name)
     ModelWidget *pModelWidget = mpParentComponent->getGraphicsView()->getModelWidget();
     if (!pModelWidget->getResultFileName().isEmpty()) {
       QString fullName = pModelWidget->getResultFileName() + "." + mpParentComponent->getComponentInfo()->getName() + "." + name;
-      MainWindow *pMainWindow = pModelWidget->getModelWidgetContainer()->getMainWindow();
+      MainWindow *pMainWindow = MainWindow::instance();
       VariablesTreeModel *pVariablesTreeModel = pMainWindow->getVariablesWidget()->getVariablesTreeModel();
       VariablesTreeItem *pVariablesTreeItem = pVariablesTreeModel->findVariablesTreeItem(fullName, pVariablesTreeModel->getRootVariablesTreeItem());
       if (pVariablesTreeItem != NULL) {
@@ -1542,7 +1531,7 @@ void ShapeAnnotation::showShapeProperties()
   if (!mpGraphicsView || mpGraphicsView->getModelWidget()->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::MetaModel) {
     return;
   }
-  MainWindow *pMainWindow = mpGraphicsView->getModelWidget()->getModelWidgetContainer()->getMainWindow();
+  MainWindow *pMainWindow = MainWindow::instance();
   ShapePropertiesDialog *pShapePropertiesDialog = new ShapePropertiesDialog(this, pMainWindow);
   pShapePropertiesDialog->exec();
 }
@@ -1556,10 +1545,9 @@ void ShapeAnnotation::showShapeAttributes()
   if (!mpGraphicsView) {
     return;
   }
-  MainWindow *pMainWindow = mpGraphicsView->getModelWidget()->getModelWidgetContainer()->getMainWindow();
   LineAnnotation *pConnectionLineAnnotation = dynamic_cast<LineAnnotation*>(this);
   MetaModelConnectionAttributes *pMetaModelConnectionAttributes;
-  pMetaModelConnectionAttributes = new MetaModelConnectionAttributes(mpGraphicsView, pConnectionLineAnnotation, pMainWindow, true);
+  pMetaModelConnectionAttributes = new MetaModelConnectionAttributes(mpGraphicsView, pConnectionLineAnnotation, true, MainWindow::instance());
   pMetaModelConnectionAttributes->exec();
 }
 

OMEdit/OMEditGUI/Annotations/ShapeAnnotation.h

@@ -35,9 +35,8 @@
 #ifndef SHAPEANNOTATION_H
 #define SHAPEANNOTATION_H
 
-#include "Helper.h"
-#include "StringHandler.h"
-#include "Transformation.h"
+#include "Util/StringHandler.h"
+#include "Component/Transformation.h"
 
 #include <QGraphicsItem>
 #include <QSettings>
@@ -171,7 +170,7 @@ class ShapeAnnotation : public QObject, public QGraphicsItem, public GraphicItem
   QList<StringHandler::TextStyle> getTextStyles() {return mTextStyles;}
   void setTextHorizontalAlignment(StringHandler::TextAlignment textAlignment) {mHorizontalAlignment = textAlignment;}
   StringHandler::TextAlignment getTextHorizontalAlignment() {return mHorizontalAlignment;}
-  void setFileName(QString fileName, Component *pComponent = 0);
+  void setFileName(QString fileName);
   QString getFileName();
   void setImageSource(QString imageSource);
   QString getImageSource();