add table icon and fix warnings related to geometryless layers

jef · jef · commit b430cf9ba81c · 2010-09-10T14:40:53.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14216 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/images/themes/default/mIconTableLayer.png b/images/themes/default/mIconTableLayer.png
diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -370,7 +370,7 @@ QPixmap QgsLegendLayer::getOriginalPixmap()
           return QgisApp::getThemePixmap( "/mIconPolygonLayer.png" );
           break;
         case QGis::NoGeometry:
-          return QgisApp::getThemePixmap( "mActionOpenTable.png" );
+          return QgisApp::getThemePixmap( "/mIconTableLayer.png" );
         default:
           return QgisApp::getThemePixmap( "/mIconLayer.png" );
       }
diff --git a/src/core/composer/qgscomposeritem.cpp b/src/core/composer/qgscomposeritem.cpp
@@ -39,8 +39,15 @@
 
 #define FONT_WORKAROUND_SCALE 10 //scale factor for upscaling fontsize and downscaling painter
 
-QgsComposerItem::QgsComposerItem( QgsComposition* composition, bool manageZValue ): QObject( 0 ), QGraphicsRectItem( 0 ), mComposition( composition ), mBoundingResizeRectangle( 0 ), \
-    mFrame( true ), mItemPositionLocked( false ), mLastValidViewScaleFactor( -1 ), mRotation( 0 )
+QgsComposerItem::QgsComposerItem( QgsComposition* composition, bool manageZValue )
+    : QObject( 0 )
+    , QGraphicsRectItem( 0 )
+    , mComposition( composition )
+    , mBoundingResizeRectangle( 0 )
+    , mFrame( true )
+    , mItemPositionLocked( false )
+    , mLastValidViewScaleFactor( -1 )
+    , mRotation( 0 )
 {
   setFlag( QGraphicsItem::ItemIsSelectable, true );
   setAcceptsHoverEvents( true );
@@ -58,9 +65,15 @@ QgsComposerItem::QgsComposerItem( QgsComposition* composition, bool manageZValue
   }
 }
 
-QgsComposerItem::QgsComposerItem( qreal x, qreal y, qreal width, qreal height, QgsComposition* composition, bool manageZValue ): \
-    QObject( 0 ), QGraphicsRectItem( 0, 0, width, height, 0 ), mComposition( composition ), mBoundingResizeRectangle( 0 ), mFrame( true ), \
-    mItemPositionLocked( false ), mLastValidViewScaleFactor( -1 ), mRotation( 0 )
+QgsComposerItem::QgsComposerItem( qreal x, qreal y, qreal width, qreal height, QgsComposition* composition, bool manageZValue )
+    : QObject( 0 )
+    , QGraphicsRectItem( 0, 0, width, height, 0 )
+    , mComposition( composition )
+    , mBoundingResizeRectangle( 0 )
+    , mFrame( true )
+    , mItemPositionLocked( false )
+    , mLastValidViewScaleFactor( -1 )
+    , mRotation( 0 )
 {
   setFlag( QGraphicsItem::ItemIsSelectable, true );
   setAcceptsHoverEvents( true );
@@ -530,8 +543,8 @@ void QgsComposerItem::changeItemRectangle( const QPointF& currentPosition, const
       }
       else  //for composer items, we prefer setSceneRect as subclasses can implement custom behaviour (e.g. item group)
       {
-        changeComposerItem->setSceneRect( QRectF( originalItem->transform().dx() + moveRectX, \
-                                          originalItem->transform().dy() + moveRectY, \
+        changeComposerItem->setSceneRect( QRectF( originalItem->transform().dx() + moveRectX,
+                                          originalItem->transform().dy() + moveRectY,
                                           originalItem->rect().width(), originalItem->rect().height() ) );
       }
     }
@@ -550,7 +563,7 @@ void QgsComposerItem::changeItemRectangle( const QPointF& currentPosition, const
   }
   else //for composer items, we prefer setSceneRect as subclasses can implement custom behaviour (e.g. item group)
   {
-    changeComposerItem->setSceneRect( QRectF( originalItem->transform().dx() + mx, originalItem->transform().dy() + my, \
+    changeComposerItem->setSceneRect( QRectF( originalItem->transform().dx() + mx, originalItem->transform().dy() + my,
                                       originalItem->rect().width() + rx, originalItem->rect().height() + ry ) );
   }
 }
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -27,7 +27,13 @@
 #include <QDomElement>
 #include <QPainter>
 
-QgsComposerLegend::QgsComposerLegend( QgsComposition* composition ): QgsComposerItem( composition ), mTitle( tr( "Legend" ) ), mBoxSpace( 2 ), mLayerSpace( 3 ), mSymbolSpace( 2 ), mIconLabelSpace( 2 )
+QgsComposerLegend::QgsComposerLegend( QgsComposition* composition )
+	: QgsComposerItem( composition )
+	  , mTitle( tr( "Legend" ) )
+	  , mBoxSpace( 2 )
+	  , mLayerSpace( 3 )
+	  , mSymbolSpace( 2 )
+	  , mIconLabelSpace( 2 )
 {
   //QStringList idList = layerIdList();
   //mLegendModel.setLayerSet( idList );
@@ -326,6 +332,7 @@ void QgsComposerLegend::drawSymbol( QPainter* p, QgsSymbol* s, double currentYCo
       symbolHeight = mSymbolHeight;
       break;
     case QGis::UnknownGeometry:
+    case QGis::NoGeometry:
       // shouldn't occur
       break;
   }
diff --git a/src/core/composer/qgscomposerlegenditem.cpp b/src/core/composer/qgscomposerlegenditem.cpp
@@ -22,6 +22,7 @@
 #include "qgssymbolv2.h"
 #include "qgssymbollayerv2utils.h"
 #include "qgsvectorlayer.h"
+#include "qgsapplication.h"
 #include <QDomDocument>
 #include <QDomElement>
 
@@ -135,6 +136,9 @@ void QgsComposerSymbolItem::readXML( const QDomElement& itemElem )
         case QGis::Polygon:
           setIcon( QIcon( QPixmap::fromImage( symbol->getPolygonSymbolAsImage() ) ) );
           break;
+        case QGis::NoGeometry:
+          setIcon( QIcon( QgsApplication::activeThemePath() + "/mIconTableLayer.png" ) );
+          break;
         case QGis::UnknownGeometry:
           // should not occur
           break;
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -1796,6 +1796,7 @@ bool QgsGeometry::deleteVertex( int atVertex )
       }
       break;
     }
+    case QGis::WKBNoGeometry:
     case QGis::WKBUnknown:
       break;
   }
@@ -2099,6 +2100,7 @@ bool QgsGeometry::insertVertex( double x, double y, int beforeVertex )
       }
       break;
     }
+    case QGis::WKBNoGeometry:
     case QGis::WKBUnknown:
       break;
   }
@@ -6588,6 +6590,7 @@ void QgsGeometry::validateGeometry( QList<Error> &errors )
     }
     break;
 
+    case QGis::WKBNoGeometry:
     case QGis::WKBUnknown:
       QgsDebugMsg( QObject::tr( "Unknown geometry type" ) );
       errors << Error( QObject::tr( "Unknown geometry type" ) );
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -1171,6 +1171,7 @@ void QgsWMSServer::drawLegendSymbol( QgsComposerLegendItem* item, QPainter* p, d
       drawPolygonSymbol( p, symbol, boxSpace, currentY, symbolWidth, symbolHeight, layerOpacity, yDownShift );
       break;
     case QGis::UnknownGeometry:
+    case QGis::NoGeometry:
       // shouldn't occur
       break;
   }

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ QPixmap QgsLegendLayer::getOriginalPixmap()`
`370`	`370`	`return QgisApp::getThemePixmap( "/mIconPolygonLayer.png" );`
`371`	`371`	`break;`
`372`	`372`	`case QGis::NoGeometry:`
`373`		`- return QgisApp::getThemePixmap( "mActionOpenTable.png" );`
	`373`	`+ return QgisApp::getThemePixmap( "/mIconTableLayer.png" );`
`374`	`374`	`default:`
`375`	`375`	`return QgisApp::getThemePixmap( "/mIconLayer.png" );`
`376`	`376`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,15 @@`
`39`	`39`
`40`	`40`	`#define FONT_WORKAROUND_SCALE 10 //scale factor for upscaling fontsize and downscaling painter`
`41`	`41`
`42`		`-QgsComposerItem::QgsComposerItem( QgsComposition* composition, bool manageZValue ): QObject( 0 ), QGraphicsRectItem( 0 ), mComposition( composition ), mBoundingResizeRectangle( 0 ), \`
`43`		`- mFrame( true ), mItemPositionLocked( false ), mLastValidViewScaleFactor( -1 ), mRotation( 0 )`
	`42`	`+QgsComposerItem::QgsComposerItem( QgsComposition* composition, bool manageZValue )`
	`43`	`+ : QObject( 0 )`
	`44`	`+ , QGraphicsRectItem( 0 )`
	`45`	`+ , mComposition( composition )`
	`46`	`+ , mBoundingResizeRectangle( 0 )`
	`47`	`+ , mFrame( true )`
	`48`	`+ , mItemPositionLocked( false )`
	`49`	`+ , mLastValidViewScaleFactor( -1 )`
	`50`	`+ , mRotation( 0 )`
`44`	`51`	`{`
`45`	`52`	`setFlag( QGraphicsItem::ItemIsSelectable, true );`
`46`	`53`	`setAcceptsHoverEvents( true );`
`@@ -58,9 +65,15 @@ QgsComposerItem::QgsComposerItem( QgsComposition* composition, bool manageZValue`
`58`	`65`	`}`
`59`	`66`	`}`
`60`	`67`
`61`		`-QgsComposerItem::QgsComposerItem( qreal x, qreal y, qreal width, qreal height, QgsComposition* composition, bool manageZValue ): \`
`62`		`- QObject( 0 ), QGraphicsRectItem( 0, 0, width, height, 0 ), mComposition( composition ), mBoundingResizeRectangle( 0 ), mFrame( true ), \`
`63`		`- mItemPositionLocked( false ), mLastValidViewScaleFactor( -1 ), mRotation( 0 )`
	`68`	`+QgsComposerItem::QgsComposerItem( qreal x, qreal y, qreal width, qreal height, QgsComposition* composition, bool manageZValue )`
	`69`	`+ : QObject( 0 )`
	`70`	`+ , QGraphicsRectItem( 0, 0, width, height, 0 )`
	`71`	`+ , mComposition( composition )`
	`72`	`+ , mBoundingResizeRectangle( 0 )`
	`73`	`+ , mFrame( true )`
	`74`	`+ , mItemPositionLocked( false )`
	`75`	`+ , mLastValidViewScaleFactor( -1 )`
	`76`	`+ , mRotation( 0 )`
`64`	`77`	`{`
`65`	`78`	`setFlag( QGraphicsItem::ItemIsSelectable, true );`
`66`	`79`	`setAcceptsHoverEvents( true );`
`@@ -530,8 +543,8 @@ void QgsComposerItem::changeItemRectangle( const QPointF& currentPosition, const`
`530`	`543`	`}`
`531`	`544`	`else //for composer items, we prefer setSceneRect as subclasses can implement custom behaviour (e.g. item group)`
`532`	`545`	`{`
`533`		`- changeComposerItem->setSceneRect( QRectF( originalItem->transform().dx() + moveRectX, \`
`534`		`- originalItem->transform().dy() + moveRectY, \`
	`546`	`+ changeComposerItem->setSceneRect( QRectF( originalItem->transform().dx() + moveRectX,`
	`547`	`+ originalItem->transform().dy() + moveRectY,`
`535`	`548`	`originalItem->rect().width(), originalItem->rect().height() ) );`
`536`	`549`	`}`
`537`	`550`	`}`
`@@ -550,7 +563,7 @@ void QgsComposerItem::changeItemRectangle( const QPointF& currentPosition, const`
`550`	`563`	`}`
`551`	`564`	`else //for composer items, we prefer setSceneRect as subclasses can implement custom behaviour (e.g. item group)`
`552`	`565`	`{`
`553`		`- changeComposerItem->setSceneRect( QRectF( originalItem->transform().dx() + mx, originalItem->transform().dy() + my, \`
	`566`	`+ changeComposerItem->setSceneRect( QRectF( originalItem->transform().dx() + mx, originalItem->transform().dy() + my,`
`554`	`567`	`originalItem->rect().width() + rx, originalItem->rect().height() + ry ) );`
`555`	`568`	`}`
`556`	`569`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1796,6 +1796,7 @@ bool QgsGeometry::deleteVertex( int atVertex )`
`1796`	`1796`	`}`
`1797`	`1797`	`break;`
`1798`	`1798`	`}`
	`1799`	`+ case QGis::WKBNoGeometry:`
`1799`	`1800`	`case QGis::WKBUnknown:`
`1800`	`1801`	`break;`
`1801`	`1802`	`}`
`@@ -2099,6 +2100,7 @@ bool QgsGeometry::insertVertex( double x, double y, int beforeVertex )`
`2099`	`2100`	`}`
`2100`	`2101`	`break;`
`2101`	`2102`	`}`
	`2103`	`+ case QGis::WKBNoGeometry:`
`2102`	`2104`	`case QGis::WKBUnknown:`
`2103`	`2105`	`break;`
`2104`	`2106`	`}`
`@@ -6588,6 +6590,7 @@ void QgsGeometry::validateGeometry( QList<Error> &errors )`
`6588`	`6590`	`}`
`6589`	`6591`	`break;`
`6590`	`6592`
	`6593`	`+ case QGis::WKBNoGeometry:`
`6591`	`6594`	`case QGis::WKBUnknown:`
`6592`	`6595`	`QgsDebugMsg( QObject::tr( "Unknown geometry type" ) );`
`6593`	`6596`	`errors << Error( QObject::tr( "Unknown geometry type" ) );`
Original file line number	Diff line number	Diff line change
`@@ -1171,6 +1171,7 @@ void QgsWMSServer::drawLegendSymbol( QgsComposerLegendItem* item, QPainter* p, d`
`1171`	`1171`	`drawPolygonSymbol( p, symbol, boxSpace, currentY, symbolWidth, symbolHeight, layerOpacity, yDownShift );`
`1172`	`1172`	`break;`
`1173`	`1173`	`case QGis::UnknownGeometry:`
	`1174`	`+ case QGis::NoGeometry:`
`1174`	`1175`	`// shouldn't occur`
`1175`	`1176`	`break;`
`1176`	`1177`	`}`