ticket:3841

Get a proper bounding rectangle for exporting image.

OMEdit/OMEditGUI/Component/Component.cpp

@@ -601,6 +601,26 @@ QRectF Component::boundingRect() const
   return QRectF(left, bottom, fabs(left - right), fabs(bottom - top));
 }
 
+/*!
+ * \brief Component::itemsBoundingRect
+ * Gets the bounding rectangle of all the items added to the component.
+ * \return
+ */
+QRectF Component::itemsBoundingRect()
+{
+  QRectF rect;
+  foreach (Component *pComponent, mInheritedComponentsList) {
+    rect |= pComponent->itemsBoundingRect();
+  }
+  foreach (Component *pComponent, mComponentsList) {
+    rect |= pComponent->itemsBoundingRect();
+  }
+  foreach (QGraphicsItem *item, mShapesList) {
+    rect |= item->sceneBoundingRect();
+  }
+  return rect;
+}
+
 void Component::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
   Q_UNUSED(painter);

OMEdit/OMEditGUI/Component/Component.h

@@ -169,6 +169,7 @@ class Component : public QObject, public QGraphicsItem
   bool hasShapeAnnotation(Component *pComponent);
   bool hasNonExistingClass();
   QRectF boundingRect() const;
+  QRectF itemsBoundingRect();
   void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
   LibraryTreeItem* getLibraryTreeItem() {return mpLibraryTreeItem;}
   QString getName() {return mpComponentInfo->getName();}

OMEdit/OMEditGUI/MainWindow.cpp

@@ -1697,7 +1697,6 @@ void MainWindow::exportModelAsImage(bool copyToClipboard)
         return;
       }
     }
-    bool oldSkipDrawBackground;
     // show the progressbar and set the message in status bar
     mpProgressBar->setRange(0, 0);
     showProgressBar();
@@ -1730,7 +1729,7 @@ void MainWindow::exportModelAsImage(bool copyToClipboard)
     }
     painter.setWindow(destinationRect);
     // paint all the items
-    oldSkipDrawBackground = pGraphicsView->mSkipBackground;
+    bool oldSkipDrawBackground = pGraphicsView->mSkipBackground;
     pGraphicsView->mSkipBackground = true;
     pGraphicsView->render(&painter, destinationRect, destinationRect);
     painter.end();

OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp

@@ -840,19 +840,26 @@ void GraphicsView::createBitmapShape(QPointF point)
   }
 }
 
-//! Gets the bounding rectangle of all the items added to the view, excluding background and so on
+/*!
+ * \brief GraphicsView::itemsBoundingRect
+ * Gets the bounding rectangle of all the items added to the view, excluding background and so on
+ * \return
+ */
 QRectF GraphicsView::itemsBoundingRect()
 {
   QRectF rect;
-  foreach(QGraphicsItem *item, mComponentsList){
-    rect |= item->sceneBoundingRect();
+  foreach (Component *pComponent, mComponentsList) {
+    rect |= pComponent->itemsBoundingRect();
   }
-  foreach(QGraphicsItem *item, mShapesList){
+  foreach (QGraphicsItem *item, mShapesList) {
     rect |= item->sceneBoundingRect();
   }
-  foreach(QGraphicsItem *item, mConnectionsList){
+  foreach (QGraphicsItem *item, mConnectionsList) {
     rect |= item->sceneBoundingRect();
   }
+  qreal x1, y1, x2, y2;
+  rect.getCoords(&x1, &y1, &x2, &y2);
+  rect.setCoords(x1 -5, y1 -5, x2 + 5, y2 + 5);
   return mapFromScene(rect).boundingRect();
 }
 

OMEdit/OMEditGUI/TLM/TLMCoSimulationDialog.cpp

@@ -457,7 +457,7 @@ void MetaModelSimulationParamsDialog::saveSimulationParams()
 {
   if (validateSimulationParams()) {
     // If user has changed the simulation parameters then push the change on the stack.
-    if(!mOldStartTime.compare(mpStartTimeTextBox->text())== 0 || !mOldStopTime.compare(mpStopTimeTextBox->text())== 0) {
+    if (!mOldStartTime.compare(mpStartTimeTextBox->text())== 0 || !mOldStopTime.compare(mpStopTimeTextBox->text())== 0) {
       UpdateSimulationParamsCommand *pUpdateSimulationParamsCommand;
       pUpdateSimulationParamsCommand = new UpdateSimulationParamsCommand(mpLibraryTreeItem, mOldStartTime, mpStartTimeTextBox->text(),
                                                                          mOldStopTime, mpStopTimeTextBox->text());