Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Jun 30, 2011 · 127f7c0 · 127f7c0
2 parents 4888f51 + b6fa94f
commit 127f7c0
Show file tree

Hide file tree

Showing 14 changed files with 938 additions and 61 deletions.
diff --git a/images/svg/geometric/Square1.svg b/images/svg/geometric/Square1.svg
diff --git a/images/svg/geometric/Square2.svg b/images/svg/geometric/Square2.svg
diff --git a/images/svg/geometric/Triangle1.svg b/images/svg/geometric/Triangle1.svg
diff --git a/images/svg/transport/amenity=airport.svg b/images/svg/transport/amenity=airport.svg
diff --git a/images/svg/transport/amenity=ferry_terminal.svg b/images/svg/transport/amenity=ferry_terminal.svg
diff --git a/images/svg/transport/amenity=taxi.svg b/images/svg/transport/amenity=taxi.svg
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(QGIS_CORE_SRCS
   symbology-ng/qgsvectorcolorrampv2.cpp
   symbology-ng/qgsstylev2.cpp
   symbology-ng/qgssymbologyv2conversion.cpp
+  symbology-ng/qgssvgcache.cpp
 
   qgis.cpp
   qgsapplication.cpp

diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -6,6 +6,7 @@
 #include "qgsapplication.h"
 #include "qgslogger.h"
 #include "qgsproject.h"
+#include "qgssvgcache.h"
 
 #include <QPainter>
 #include <QSvgRenderer>
@@ -449,6 +450,9 @@ QgsSvgMarkerSymbolLayerV2::QgsSvgMarkerSymbolLayerV2( QString name, double size,
   mSize = size;
   mAngle = angle;
   mOffset = QPointF( 0, 0 );
+  mOutlineWidth = 1.0;
+  mFillColor = QColor( Qt::black );
+  mOutlineColor = QColor( Qt::black );
 }
 
 
@@ -466,11 +470,60 @@ QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::create( const QgsStringMap& props )
     angle = props["angle"].toDouble();
 
   QgsSvgMarkerSymbolLayerV2* m = new QgsSvgMarkerSymbolLayerV2( name, size, angle );
+
+  //we only check the svg default parameters if necessary, since it could be expensive
+  if( !props.contains("fill") && !props.contains("outline") && !props.contains("outline-width") )
+  {
+    QColor fillColor, outlineColor;
+    double outlineWidth;
+    bool hasFillParam, hasOutlineParam, hasOutlineWidthParam;
+    QgsSvgCache::instance()->containsParams( name, hasFillParam, fillColor, hasOutlineParam, outlineColor, hasOutlineWidthParam, outlineWidth );
+    if( hasFillParam )
+    {
+      m->setFillColor( fillColor );
+    }
+    if( hasOutlineParam )
+    {
+      m->setOutlineColor( outlineColor );
+    }
+    if( hasOutlineWidthParam )
+    {
+      m->setOutlineWidth( outlineWidth );
+    }
+  }
+
   if ( props.contains( "offset" ) )
     m->setOffset( QgsSymbolLayerV2Utils::decodePoint( props["offset"] ) );
+  if ( props.contains( "fill" ) )
+    m->setFillColor( QColor( props["fill"] ) );
+  if ( props.contains( "outline" ) )
+    m->setOutlineColor( QColor( props["outline"] ) );
+  if ( props.contains( "outline-width" ) )
+    m->setOutlineWidth( props["outline-width"].toDouble() );
   return m;
 }
 
+void QgsSvgMarkerSymbolLayerV2::setPath( QString path )
+{
+  mPath = path;
+  QColor fillColor, outlineColor;
+  double outlineWidth;
+  bool hasFillParam, hasOutlineParam, hasOutlineWidthParam;
+  QgsSvgCache::instance()->containsParams( path, hasFillParam, fillColor, hasOutlineParam, outlineColor, hasOutlineWidthParam, outlineWidth );
+  if( hasFillParam )
+  {
+    setFillColor( fillColor );
+  }
+  if( hasOutlineParam )
+  {
+    setOutlineColor( outlineColor );
+  }
+  if( hasOutlineWidthParam )
+  {
+    setOutlineWidth( outlineWidth );
+  }
+}
+
 
 QString QgsSvgMarkerSymbolLayerV2::layerType() const
 {
@@ -479,30 +532,8 @@ QString QgsSvgMarkerSymbolLayerV2::layerType() const
 
 void QgsSvgMarkerSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )
 {
-  double pictureSize = 0;
-  QgsRenderContext& rc = context.renderContext();
-
-  if ( rc.painter() && rc.painter()->device() )
-  {
-    //correct QPictures DPI correction
-    pictureSize = context.outputLineWidth( mSize ) / rc.painter()->device()->logicalDpiX() * mPicture.logicalDpiX();
-  }
-  else
-  {
-    pictureSize = context.outputLineWidth( mSize );
-  }
-  QRectF rect( QPointF( -pictureSize / 2.0, -pictureSize / 2.0 ), QSizeF( pictureSize, pictureSize ) );
-  QSvgRenderer renderer( mPath );
-  QPainter painter( &mPicture );
-  renderer.render( &painter, rect );
-  QPainter selPainter( &mSelPicture );
-  selPainter.setRenderHint( QPainter::Antialiasing );
-  selPainter.setBrush( QBrush( context.selectionColor() ) );
-  selPainter.setPen( Qt::NoPen );
-  selPainter.drawEllipse( QPointF( 0, 0 ), pictureSize*0.6, pictureSize*0.6 );
-  renderer.render( &selPainter, rect );
-
   mOrigSize = mSize; // save in case the size would be data defined
+  Q_UNUSED( context );
 }
 
 void QgsSvgMarkerSymbolLayerV2::stopRender( QgsSymbolV2RenderContext& context )
@@ -533,8 +564,28 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re
   if ( mAngle != 0 )
     p->rotate( mAngle );
 
-  QPicture &pct = context.selected() ? mSelPicture : mPicture;
-  p->drawPicture( 0, 0, pct );
+  if ( doubleNear( context.renderContext().rasterScaleFactor(), 1.0, 0.1 ) )
+  {
+    const QImage& img = QgsSvgCache::instance()->svgAsImage( mPath, mSize, mFillColor, mOutlineColor, mOutlineWidth,
+                        context.renderContext().scaleFactor(), context.renderContext().rasterScaleFactor() );
+    p->drawImage( -img.width() / 2.0, -img.width() / 2.0, img );
+  }
+  else
+  {
+    const QPicture& pct = QgsSvgCache::instance()->svgAsPicture( mPath, mSize, mFillColor, mOutlineColor, mOutlineWidth,
+                          context.renderContext().scaleFactor(), context.renderContext().rasterScaleFactor() );
+    p->drawPicture( 0, 0, pct );
+  }
+
+  if( context.selected() )
+  {
+    QPen pen( context.selectionColor() );
+    pen.setWidth( context.outputLineWidth( 1.0 ) );
+    p->setPen( pen );
+    p->setBrush( Qt::NoBrush );
+    double sizePixel = context.outputLineWidth( mSize );
+    p->drawRect( QRectF( -sizePixel / 2.0, -sizePixel / 2.0, sizePixel, sizePixel ) );
+  }
 
   p->restore();
 }
@@ -547,12 +598,18 @@ QgsStringMap QgsSvgMarkerSymbolLayerV2::properties() const
   map["size"] = QString::number( mSize );
   map["angle"] = QString::number( mAngle );
   map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
+  map["fill"] = mFillColor.name();
+  map["outline"] = mOutlineColor.name();
+  map["outline-width"] = QString::number( mOutlineWidth );
   return map;
 }
 
 QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::clone() const
 {
   QgsSvgMarkerSymbolLayerV2* m = new QgsSvgMarkerSymbolLayerV2( mPath, mSize, mAngle );
+  m->setFillColor( mFillColor );
+  m->setOutlineColor( mOutlineColor );
+  m->setOutlineWidth( mOutlineWidth );
   m->setOffset( mOffset );
   return m;
 }

diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.h b/src/core/symbology-ng/qgsmarkersymbollayerv2.h
@@ -112,15 +112,28 @@ class CORE_EXPORT QgsSvgMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2
     QgsSymbolLayerV2* clone() const;
 
     QString path() const { return mPath; }
-    void setPath( QString path ) { mPath = path; }
+    void setPath( QString path );
+
+    QColor fillColor() const { return mFillColor; }
+    void setFillColor( const QColor& c ) { mFillColor = c; }
+
+    QColor outlineColor() const { return mOutlineColor; }
+    void setOutlineColor( const QColor& c ) { mOutlineColor = c; }
+
+    double outlineWidth() const { return mOutlineWidth; }
+    void setOutlineWidth( double w ) { mOutlineWidth = w; }
 
   protected:
 
     void loadSvg();
 
     QString mPath;
-    QPicture mPicture;
-    QPicture mSelPicture;
+
+    //param(fill), param(outline), param(outline-width) are going
+    //to be replaced in memory
+    QColor mFillColor;
+    QColor mOutlineColor;
+    double mOutlineWidth;
     double mOrigSize;
 };