Move adding the first html frame out of QgsComposerHtml

mhugent · mhugent · commit 9a3d6abd0241 · 2012-08-08T16:56:54.000+02:00
diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp
@@ -22,19 +22,15 @@
 #include <QWebFrame>
 #include <QWebPage>
 
-QgsComposerHtml::QgsComposerHtml( QgsComposition* c, qreal x, qreal y, qreal width, qreal height, bool createUndoCommands ): QgsComposerMultiFrame( c, createUndoCommands ),
+QgsComposerHtml::QgsComposerHtml( QgsComposition* c, bool createUndoCommands ): QgsComposerMultiFrame( c, createUndoCommands ),
     mWebPage( 0 ), mLoaded( false ), mHtmlUnitsToMM( 1.0 )
 {
   mHtmlUnitsToMM = htmlUnitsToMM();
   mWebPage = new QWebPage();
   QObject::connect( mWebPage, SIGNAL( loadFinished( bool ) ), this, SLOT( frameLoaded( bool ) ) );
-
-  if ( mComposition && width > 0 && height > 0 )
+  if ( mComposition )
   {
-    QgsComposerFrame* frame = new QgsComposerFrame( c, this, x, y, width, height );
-    addFrame( frame );
     QObject::connect( mComposition, SIGNAL( itemRemoved( QgsComposerItem* ) ), this, SLOT( handleFrameRemoval( QgsComposerItem* ) ) );
-    recalculateFrameSizes();
   }
 }
 
@@ -105,14 +101,19 @@ double QgsComposerHtml::htmlUnitsToMM()
   return ( mComposition->printResolution() / 96.0 ); //webkit seems to assume a standard dpi of 96
 }
 
-void QgsComposerHtml::addFrame( QgsComposerFrame* frame )
+void QgsComposerHtml::addFrame( QgsComposerFrame* frame, bool recalcFrameSizes )
 {
   mFrameItems.push_back( frame );
   QObject::connect( frame, SIGNAL( sizeChanged() ), this, SLOT( recalculateFrameSizes() ) );
   if ( mComposition )
   {
     mComposition->addComposerHtmlFrame( this, frame );
   }
+
+  if ( recalcFrameSizes )
+  {
+    recalculateFrameSizes();
+  }
 }
 
 bool QgsComposerHtml::writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames ) const
diff --git a/src/core/composer/qgscomposerhtml.h b/src/core/composer/qgscomposerhtml.h
@@ -25,7 +25,7 @@ class QgsComposerHtml: public QgsComposerMultiFrame
 {
     Q_OBJECT
   public:
-    QgsComposerHtml( QgsComposition* c, qreal x, qreal y, qreal width, qreal height, bool createUndoCommands );
+    QgsComposerHtml( QgsComposition* c, bool createUndoCommands );
     QgsComposerHtml();
     ~QgsComposerHtml();
 
@@ -38,8 +38,7 @@ class QgsComposerHtml: public QgsComposerMultiFrame
     bool writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const;
     bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
 
-  protected:
-    void addFrame( QgsComposerFrame* frame );
+    void addFrame( QgsComposerFrame* frame, bool recalcFrameSizes = true );
 
   private slots:
     void frameLoaded( bool ok );
diff --git a/src/core/composer/qgscomposermultiframe.cpp b/src/core/composer/qgscomposermultiframe.cpp
@@ -15,7 +15,6 @@
 
 #include "qgscomposermultiframe.h"
 #include "qgscomposerframe.h"
-#include "qgsaddremovemultiframecommand.h"
 
 QgsComposerMultiFrame::QgsComposerMultiFrame( QgsComposition* c, bool createUndoCommands ): mComposition( c ), mResizeMode( UseExistingFrames ), mCreateUndoCommands( createUndoCommands )
 {
@@ -107,7 +106,7 @@ void QgsComposerMultiFrame::recalculateFrameSizes()
       newFrame->setContentSection( QRectF( 0, currentY, newFrame->rect().width(), newFrame->rect().height() ) );
       currentY += newFrame->rect().height();
       currentItem = newFrame;
-      addFrame( newFrame );
+      addFrame( newFrame, false );
     }
   }
 }
@@ -125,16 +124,7 @@ void QgsComposerMultiFrame::handleFrameRemoval( QgsComposerItem* item )
     return;
   }
   mFrameItems.removeAt( index );
-
-  if ( mFrameItems.size() < 1 )
-  {
-    if ( mComposition )
-    {
-      //schedule this composer multi frame for deletion
-      mComposition->removeMultiFrame( this );
-    }
-  }
-  else
+  if ( mFrameItems.size() > 0 )
   {
     recalculateFrameSizes();
   }
diff --git a/src/core/composer/qgscomposermultiframe.h b/src/core/composer/qgscomposermultiframe.h
@@ -43,6 +43,9 @@ class QgsComposerMultiFrame: public QObject
     virtual ~QgsComposerMultiFrame();
     virtual QSizeF totalSize() const = 0;
     virtual void render( QPainter* p, const QRectF& renderExtent ) = 0;
+
+    virtual void addFrame( QgsComposerFrame* frame, bool recalcFrameSizes = true ) = 0;
+
     void removeFrame( int i );
 
     void update();
@@ -64,15 +67,15 @@ class QgsComposerMultiFrame: public QObject
     /**Removes and deletes all frames from mComposition*/
     void deleteFrames();
 
+    int nFrames() const { return mFrameItems.size(); }
+
   protected:
     QgsComposition* mComposition;
     QList<QgsComposerFrame*> mFrameItems;
     ResizeMode mResizeMode;
     /**True: creates QgsMultiFrameCommands on internal changes (e.g. changing frames )*/
     bool mCreateUndoCommands;
 
-    virtual void addFrame( QgsComposerFrame* frame ) = 0;
-
   protected slots:
     void recalculateFrameSizes();
     /**Called before a frame is going to be removed (update frame list)*/
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -27,6 +27,7 @@
 #include "qgscomposerscalebar.h"
 #include "qgscomposershape.h"
 #include "qgscomposerattributetable.h"
+#include "qgsaddremovemultiframecommand.h"
 #include "qgscomposermultiframecommand.h"
 #include "qgslogger.h"
 #include "qgspaintenginehack.h"
@@ -462,7 +463,7 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
   for ( int i = 0; i < composerHtmlList.size(); ++i )
   {
     QDomElement currentHtmlElem = composerHtmlList.at( i ).toElement();
-    QgsComposerHtml* newHtml = new QgsComposerHtml( this, 0, 0, 0, 0, true );
+    QgsComposerHtml* newHtml = new QgsComposerHtml( this, true );
     newHtml->readXML( currentHtmlElem, doc );
     this->addMultiFrame( newHtml );
   }
@@ -1069,7 +1070,6 @@ void QgsComposition::addMultiFrame( QgsComposerMultiFrame* multiFrame )
 void QgsComposition::removeMultiFrame( QgsComposerMultiFrame* multiFrame )
 {
   mMultiFrames.remove( multiFrame );
-  //delete multiFrame; //e.v. use deleteLater() in case of stability problems
 }
 
 void QgsComposition::addComposerArrow( QgsComposerArrow* arrow )
@@ -1203,10 +1203,13 @@ void QgsComposition::removeComposerItem( QgsComposerItem* item, bool createComma
     }
     else
     {
+      bool frameItem = ( item->type() == QgsComposerItem::ComposerFrame );
+      QgsComposerMultiFrame* multiFrame = 0;
       if ( createCommand )
       {
-        if ( item->type() == QgsComposerItem::ComposerFrame ) //multiframe tracks item changes
+        if ( frameItem ) //multiframe tracks item changes
         {
+          multiFrame = static_cast<QgsComposerFrame*>( item )->multiFrame();
           item->beginItemCommand( tr( "Frame deleted" ) );
           emit itemRemoved( item );
           item->endItemCommand();
@@ -1221,6 +1224,25 @@ void QgsComposition::removeComposerItem( QgsComposerItem* item, bool createComma
       {
         emit itemRemoved( item );
       }
+
+      //check if there are frames left. If not, remove the multi frame
+      if ( frameItem && multiFrame )
+      {
+        if ( multiFrame->nFrames() < 1 )
+        {
+          removeMultiFrame( multiFrame );
+          if ( createCommand )
+          {
+            QgsAddRemoveMultiFrameCommand* command = new QgsAddRemoveMultiFrameCommand( QgsAddRemoveMultiFrameCommand::Removed,
+                multiFrame, this, tr( "Multiframe removed" ) );
+            undoStack()->push( command );
+          }
+          else
+          {
+            delete multiFrame;
+          }
+        }
+      }
     }
   }
 }
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -24,6 +24,7 @@
 
 #include "qgscomposerview.h"
 #include "qgscomposerarrow.h"
+#include "qgscomposerframe.h"
 #include "qgscomposerhtml.h"
 #include "qgscomposerlabel.h"
 #include "qgscomposerlegend.h"
@@ -323,9 +324,16 @@ void QgsComposerView::mouseReleaseEvent( QMouseEvent* e )
     case AddHtml:
       if ( composition() )
       {
-        QgsComposerHtml* composerHtml = new QgsComposerHtml( composition(), mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(),
-            mRubberBandItem->rect().width(), mRubberBandItem->rect().height(), true );
-        Q_UNUSED( composerHtml );
+        QgsComposerHtml* composerHtml = new QgsComposerHtml( composition(), true );
+        QgsAddRemoveMultiFrameCommand* command = new QgsAddRemoveMultiFrameCommand( QgsAddRemoveMultiFrameCommand::Added,
+            composerHtml, composition(), tr( "Html item added" ) );
+        composition()->undoStack()->push( command );
+        QgsComposerFrame* frame = new QgsComposerFrame( composition(), composerHtml, mRubberBandItem->transform().dx(),
+            mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(),
+            mRubberBandItem->rect().height() );
+        composition()->beginMultiFrameCommand( composerHtml, tr( "Html frame added" ) );
+        composerHtml->addFrame( frame );
+        composition()->endMultiFrameCommand();
         scene()->removeItem( mRubberBandItem );
         delete mRubberBandItem;
         mRubberBandItem = 0;
diff --git a/tests/src/core/testqgscomposerhtml.cpp b/tests/src/core/testqgscomposerhtml.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgscomposerhtml.h"
+#include "qgscomposerframe.h"
 #include "qgscomposition.h"
 #include "qgscompositionchecker.h"
 #include <QObject>
@@ -58,7 +59,9 @@ void TestQgsComposerHtml::cleanup()
 
 void TestQgsComposerHtml::table()
 {
-  QgsComposerHtml* htmlItem = new QgsComposerHtml( mComposition, 0, 0, 100, 200, false );
+  QgsComposerHtml* htmlItem = new QgsComposerHtml( mComposition, false );
+  QgsComposerFrame* htmlFrame = new QgsComposerFrame( mComposition, htmlItem, 0, 0, 100, 200 );
+  htmlItem->addFrame( htmlFrame );
   htmlItem->setUrl( QUrl( QString( "file:///%1" ).arg( QString( TEST_DATA_DIR ) + QDir::separator() +  "html_table.html" ) ) );
   QgsCompositionChecker checker( "Composer html table", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() +
                                  "control_images" + QDir::separator() + "expected_composerhtml" + QDir::separator() + "composerhtml_table.png" ) );
@@ -70,7 +73,9 @@ void TestQgsComposerHtml::table()
 
 void TestQgsComposerHtml::tableMultiFrame()
 {
-  QgsComposerHtml* htmlItem = new QgsComposerHtml( mComposition, 10, 10, 100, 50, false );
+  QgsComposerHtml* htmlItem = new QgsComposerHtml( mComposition, false );
+  QgsComposerFrame* htmlFrame = new QgsComposerFrame( mComposition, htmlItem, 0, 0, 100, 200 );
+  htmlItem->addFrame( htmlFrame );
   htmlItem->setResizeMode( QgsComposerMultiFrame::ExtendToNextPage );
   bool result = true;
   //page1

Original file line number	Diff line number	Diff line change
`@@ -22,19 +22,15 @@`
`22`	`22`	`#include <QWebFrame>`
`23`	`23`	`#include <QWebPage>`
`24`	`24`
`25`		`-QgsComposerHtml::QgsComposerHtml( QgsComposition* c, qreal x, qreal y, qreal width, qreal height, bool createUndoCommands ): QgsComposerMultiFrame( c, createUndoCommands ),`
	`25`	`+QgsComposerHtml::QgsComposerHtml( QgsComposition* c, bool createUndoCommands ): QgsComposerMultiFrame( c, createUndoCommands ),`
`26`	`26`	`mWebPage( 0 ), mLoaded( false ), mHtmlUnitsToMM( 1.0 )`
`27`	`27`	`{`
`28`	`28`	`mHtmlUnitsToMM = htmlUnitsToMM();`
`29`	`29`	`mWebPage = new QWebPage();`
`30`	`30`	`QObject::connect( mWebPage, SIGNAL( loadFinished( bool ) ), this, SLOT( frameLoaded( bool ) ) );`
`31`		`-`
`32`		`- if ( mComposition && width > 0 && height > 0 )`
	`31`	`+ if ( mComposition )`
`33`	`32`	`{`
`34`		`- QgsComposerFrame* frame = new QgsComposerFrame( c, this, x, y, width, height );`
`35`		`- addFrame( frame );`
`36`	`33`	`QObject::connect( mComposition, SIGNAL( itemRemoved( QgsComposerItem* ) ), this, SLOT( handleFrameRemoval( QgsComposerItem* ) ) );`
`37`		`- recalculateFrameSizes();`
`38`	`34`	`}`
`39`	`35`	`}`
`40`	`36`
`@@ -105,14 +101,19 @@ double QgsComposerHtml::htmlUnitsToMM()`
`105`	`101`	`return ( mComposition->printResolution() / 96.0 ); //webkit seems to assume a standard dpi of 96`
`106`	`102`	`}`
`107`	`103`
`108`		`-void QgsComposerHtml::addFrame( QgsComposerFrame* frame )`
	`104`	`+void QgsComposerHtml::addFrame( QgsComposerFrame* frame, bool recalcFrameSizes )`
`109`	`105`	`{`
`110`	`106`	`mFrameItems.push_back( frame );`
`111`	`107`	`QObject::connect( frame, SIGNAL( sizeChanged() ), this, SLOT( recalculateFrameSizes() ) );`
`112`	`108`	`if ( mComposition )`
`113`	`109`	`{`
`114`	`110`	`mComposition->addComposerHtmlFrame( this, frame );`
`115`	`111`	`}`
	`112`	`+`
	`113`	`+ if ( recalcFrameSizes )`
	`114`	`+ {`
	`115`	`+ recalculateFrameSizes();`
	`116`	`+ }`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`bool QgsComposerHtml::writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames ) const`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`
`16`	`16`	`#include "qgscomposermultiframe.h"`
`17`	`17`	`#include "qgscomposerframe.h"`
`18`		`-#include "qgsaddremovemultiframecommand.h"`
`19`	`18`
`20`	`19`	`QgsComposerMultiFrame::QgsComposerMultiFrame( QgsComposition* c, bool createUndoCommands ): mComposition( c ), mResizeMode( UseExistingFrames ), mCreateUndoCommands( createUndoCommands )`
`21`	`20`	`{`
`@@ -107,7 +106,7 @@ void QgsComposerMultiFrame::recalculateFrameSizes()`
`107`	`106`	`newFrame->setContentSection( QRectF( 0, currentY, newFrame->rect().width(), newFrame->rect().height() ) );`
`108`	`107`	`currentY += newFrame->rect().height();`
`109`	`108`	`currentItem = newFrame;`
`110`		`- addFrame( newFrame );`
	`109`	`+ addFrame( newFrame, false );`
`111`	`110`	`}`
`112`	`111`	`}`
`113`	`112`	`}`
`@@ -125,16 +124,7 @@ void QgsComposerMultiFrame::handleFrameRemoval( QgsComposerItem* item )`
`125`	`124`	`return;`
`126`	`125`	`}`
`127`	`126`	`mFrameItems.removeAt( index );`
`128`		`-`
`129`		`- if ( mFrameItems.size() < 1 )`
`130`		`- {`
`131`		`- if ( mComposition )`
`132`		`- {`
`133`		`- //schedule this composer multi frame for deletion`
`134`		`- mComposition->removeMultiFrame( this );`
`135`		`- }`
`136`		`- }`
`137`		`- else`
	`127`	`+ if ( mFrameItems.size() > 0 )`
`138`	`128`	`{`
`139`	`129`	`recalculateFrameSizes();`
`140`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`#include "qgscomposerscalebar.h"`
`28`	`28`	`#include "qgscomposershape.h"`
`29`	`29`	`#include "qgscomposerattributetable.h"`
	`30`	`+#include "qgsaddremovemultiframecommand.h"`
`30`	`31`	`#include "qgscomposermultiframecommand.h"`
`31`	`32`	`#include "qgslogger.h"`
`32`	`33`	`#include "qgspaintenginehack.h"`
`@@ -462,7 +463,7 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen`
`462`	`463`	`for ( int i = 0; i < composerHtmlList.size(); ++i )`
`463`	`464`	`{`
`464`	`465`	`QDomElement currentHtmlElem = composerHtmlList.at( i ).toElement();`
`465`		`- QgsComposerHtml* newHtml = new QgsComposerHtml( this, 0, 0, 0, 0, true );`
	`466`	`+ QgsComposerHtml* newHtml = new QgsComposerHtml( this, true );`
`466`	`467`	`newHtml->readXML( currentHtmlElem, doc );`
`467`	`468`	`this->addMultiFrame( newHtml );`
`468`	`469`	`}`
`@@ -1069,7 +1070,6 @@ void QgsComposition::addMultiFrame( QgsComposerMultiFrame* multiFrame )`
`1069`	`1070`	`void QgsComposition::removeMultiFrame( QgsComposerMultiFrame* multiFrame )`
`1070`	`1071`	`{`
`1071`	`1072`	`mMultiFrames.remove( multiFrame );`
`1072`		`- //delete multiFrame; //e.v. use deleteLater() in case of stability problems`
`1073`	`1073`	`}`
`1074`	`1074`
`1075`	`1075`	`void QgsComposition::addComposerArrow( QgsComposerArrow* arrow )`
`@@ -1203,10 +1203,13 @@ void QgsComposition::removeComposerItem( QgsComposerItem* item, bool createComma`
`1203`	`1203`	`}`
`1204`	`1204`	`else`
`1205`	`1205`	`{`
	`1206`	`+ bool frameItem = ( item->type() == QgsComposerItem::ComposerFrame );`
	`1207`	`+ QgsComposerMultiFrame* multiFrame = 0;`
`1206`	`1208`	`if ( createCommand )`
`1207`	`1209`	`{`
`1208`		`- if ( item->type() == QgsComposerItem::ComposerFrame ) //multiframe tracks item changes`
	`1210`	`+ if ( frameItem ) //multiframe tracks item changes`
`1209`	`1211`	`{`
	`1212`	`+ multiFrame = static_cast<QgsComposerFrame*>( item )->multiFrame();`
`1210`	`1213`	`item->beginItemCommand( tr( "Frame deleted" ) );`
`1211`	`1214`	`emit itemRemoved( item );`
`1212`	`1215`	`item->endItemCommand();`
`@@ -1221,6 +1224,25 @@ void QgsComposition::removeComposerItem( QgsComposerItem* item, bool createComma`
`1221`	`1224`	`{`
`1222`	`1225`	`emit itemRemoved( item );`
`1223`	`1226`	`}`
	`1227`	`+`
	`1228`	`+ //check if there are frames left. If not, remove the multi frame`
	`1229`	`+ if ( frameItem && multiFrame )`
	`1230`	`+ {`
	`1231`	`+ if ( multiFrame->nFrames() < 1 )`
	`1232`	`+ {`
	`1233`	`+ removeMultiFrame( multiFrame );`
	`1234`	`+ if ( createCommand )`
	`1235`	`+ {`
	`1236`	`+ QgsAddRemoveMultiFrameCommand* command = new QgsAddRemoveMultiFrameCommand( QgsAddRemoveMultiFrameCommand::Removed,`
	`1237`	`+ multiFrame, this, tr( "Multiframe removed" ) );`
	`1238`	`+ undoStack()->push( command );`
	`1239`	`+ }`
	`1240`	`+ else`
	`1241`	`+ {`
	`1242`	`+ delete multiFrame;`
	`1243`	`+ }`
	`1244`	`+ }`
	`1245`	`+ }`
`1224`	`1246`	`}`
`1225`	`1247`	`}`
`1226`	`1248`	`}`