qgis · Mar 3, 2006
diff --git a/‎ChangeLog
Lines changed: 2 additions & 0 deletions b/‎ChangeLog
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/composer/qgscomposermap.cpp
Lines changed: 8 additions & 10 deletions b/‎src/composer/qgscomposermap.cpp
Lines changed: 8 additions & 10 deletions
@@ -5,6 +5,8 @@ Version 0.8 'Joesephine' .... development version
 ** Dropped use of qpicture and resampling for point markers in favour of
 qt4.1 qsvgrenderer new goodies
 2006-01-09 [timlinux] 0.7.9.8
+** Started Mapcanvas branch for Martin
+2006-01-09 [timlinux] 0.7.9.8
 ** Moved plugins into src/plugins
 2006-01-08 [timlinux] 0.7.9.8
 ** moved all sources for gui lib into src/gui
 
@@ -94,17 +94,15 @@ void QgsComposerMap::init ()
     Q3CanvasRectangle::setZ(20);
     setActive(true);
 
-    connect ( mMapCanvas, SIGNAL(addedLayer(QgsMapLayer *)), this, SLOT(mapCanvasChanged()) );
-    connect ( mMapCanvas, SIGNAL(removedLayer(QString)), this, SLOT(mapCanvasChanged()) );
-    connect ( mMapCanvas, SIGNAL(removedAll()), this, SLOT(mapCanvasChanged()) );
+    connect ( mMapCanvas, SIGNAL(layersChanged()), this, SLOT(mapCanvasChanged()) );
 }
 
 QgsComposerMap::~QgsComposerMap()
 {
      std::cerr << "QgsComposerMap::~QgsComposerMap" << std::endl;
 }
 
-void QgsComposerMap::draw ( QPainter *painter, QgsRect *extent, QgsMapToPixel *transform, QPaintDevice *device )
+void QgsComposerMap::draw ( QPainter *painter, QgsRect *extent, QgsMapToPixel *transform)
 {
     mMapCanvas->freeze(true);  // necessary ?
     int nlayers = mMapCanvas->layerCount();
@@ -122,7 +120,7 @@ void QgsComposerMap::draw ( QPainter *painter, QgsRect *extent, QgsMapToPixel *t
 	widthScale *= mComposition->viewScale();
 	  }
 	  double symbolScale = mSymbolScale * mComposition->scale();
-	  vector->draw( painter, extent, transform, device, widthScale, symbolScale);
+	  vector->draw( painter, extent, transform, widthScale, symbolScale);
 
       } else { 
 	  // raster
@@ -139,13 +137,13 @@ void QgsComposerMap::draw ( QPainter *painter, QgsRect *extent, QgsMapToPixel *t
               painter->save();
 	      painter->scale( 1./multip, 1./multip);
 
-	      layer->draw( painter, extent, &trans, device );
+	      layer->draw( painter, extent, &trans);
 
 	      painter->restore();
 	  } 
 	  else 
 	  {
-	      layer->draw( painter, extent, transform, device );
+	      layer->draw( painter, extent, transform);
 	  }
       }
     }
@@ -164,7 +162,7 @@ void QgsComposerMap::draw ( QPainter *painter, QgsRect *extent, QgsMapToPixel *t
 	      if ( plotStyle() == QgsComposition::Postscript ) {
 		  fontScale = QgsComposition::psFontScaleFactor() * 72.0 / mComposition->resolution();
 	      }
-	      vector->drawLabels (  painter, extent, transform, device, fontScale );
+	      vector->drawLabels (  painter, extent, transform, fontScale );
 	  }
 
       }
@@ -214,7 +212,7 @@ void QgsComposerMap::cache ( void )
 
     QPainter p(&mCachePixmap);
 
-    draw( &p, &mCacheExtent, &transform, &mCachePixmap );
+    draw( &p, &mCacheExtent, &transform);
     p.end();
 
     mNumCachedLayers = mMapCanvas->layerCount();
@@ -271,7 +269,7 @@ void QgsComposerMap::draw ( QPainter & painter )
       painter.setClipRect ( 0, 0, Q3CanvasRectangle::width(), Q3CanvasRectangle::height() );
 #endif
 
-      draw( &painter, &mExtent, &transform, painter.device() );
+      draw( &painter, &mExtent, &transform);
       painter.restore();
     }
Original file line number	Diff line number	Diff line change
`@@ -94,17 +94,15 @@ void QgsComposerMap::init ()`
`94`	`94`	`Q3CanvasRectangle::setZ(20);`
`95`	`95`	`setActive(true);`
`96`	`96`
`97`		`- connect ( mMapCanvas, SIGNAL(addedLayer(QgsMapLayer *)), this, SLOT(mapCanvasChanged()) );`
`98`		`- connect ( mMapCanvas, SIGNAL(removedLayer(QString)), this, SLOT(mapCanvasChanged()) );`
`99`		`- connect ( mMapCanvas, SIGNAL(removedAll()), this, SLOT(mapCanvasChanged()) );`
	`97`	`+ connect ( mMapCanvas, SIGNAL(layersChanged()), this, SLOT(mapCanvasChanged()) );`
`100`	`98`	`}`
`101`	`99`
`102`	`100`	`QgsComposerMap::~QgsComposerMap()`
`103`	`101`	`{`
`104`	`102`	`std::cerr << "QgsComposerMap::~QgsComposerMap" << std::endl;`
`105`	`103`	`}`
`106`	`104`
`107`		`-void QgsComposerMap::draw ( QPainter painter, QgsRect extent, QgsMapToPixel transform, QPaintDevice device )`
	`105`	`+void QgsComposerMap::draw ( QPainter painter, QgsRect extent, QgsMapToPixel *transform)`
`108`	`106`	`{`
`109`	`107`	`mMapCanvas->freeze(true); // necessary ?`
`110`	`108`	`int nlayers = mMapCanvas->layerCount();`
`@@ -122,7 +120,7 @@ void QgsComposerMap::draw ( QPainter painter, QgsRect extent, QgsMapToPixel *t`
`122`	`120`	`widthScale *= mComposition->viewScale();`
`123`	`121`	`}`
`124`	`122`	`double symbolScale = mSymbolScale * mComposition->scale();`
`125`		`- vector->draw( painter, extent, transform, device, widthScale, symbolScale);`
	`123`	`+ vector->draw( painter, extent, transform, widthScale, symbolScale);`
`126`	`124`
`127`	`125`	`} else {`
`128`	`126`	`// raster`
`@@ -139,13 +137,13 @@ void QgsComposerMap::draw ( QPainter painter, QgsRect extent, QgsMapToPixel *t`
`139`	`137`	`painter->save();`
`140`	`138`	`painter->scale( 1./multip, 1./multip);`
`141`	`139`
`142`		`- layer->draw( painter, extent, &trans, device );`
	`140`	`+ layer->draw( painter, extent, &trans);`
`143`	`141`
`144`	`142`	`painter->restore();`
`145`	`143`	`}`
`146`	`144`	`else`
`147`	`145`	`{`
`148`		`- layer->draw( painter, extent, transform, device );`
	`146`	`+ layer->draw( painter, extent, transform);`
`149`	`147`	`}`
`150`	`148`	`}`
`151`	`149`	`}`
`@@ -164,7 +162,7 @@ void QgsComposerMap::draw ( QPainter painter, QgsRect extent, QgsMapToPixel *t`
`164`	`162`	`if ( plotStyle() == QgsComposition::Postscript ) {`
`165`	`163`	`fontScale = QgsComposition::psFontScaleFactor() * 72.0 / mComposition->resolution();`
`166`	`164`	`}`
`167`		`- vector->drawLabels ( painter, extent, transform, device, fontScale );`
	`165`	`+ vector->drawLabels ( painter, extent, transform, fontScale );`
`168`	`166`	`}`
`169`	`167`
`170`	`168`	`}`
`@@ -214,7 +212,7 @@ void QgsComposerMap::cache ( void )`
`214`	`212`
`215`	`213`	`QPainter p(&mCachePixmap);`
`216`	`214`
`217`		`- draw( &p, &mCacheExtent, &transform, &mCachePixmap );`
	`215`	`+ draw( &p, &mCacheExtent, &transform);`
`218`	`216`	`p.end();`
`219`	`217`
`220`	`218`	`mNumCachedLayers = mMapCanvas->layerCount();`
`@@ -271,7 +269,7 @@ void QgsComposerMap::draw ( QPainter & painter )`
`271`	`269`	`painter.setClipRect ( 0, 0, Q3CanvasRectangle::width(), Q3CanvasRectangle::height() );`
`272`	`270`	`#endif`
`273`	`271`
`274`		`- draw( &painter, &mExtent, &transform, painter.device() );`
	`272`	`+ draw( &painter, &mExtent, &transform);`
`275`	`273`	`painter.restore();`
`276`	`274`	`}`
`277`	`275`