Skip to content

Commit 53447de

Browse files
author
jef
committed
add table icon and fix warnings related to geometryless layers
git-svn-id: http://svn.osgeo.org/qgis/trunk@14216 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 60bab29 commit 53447de

File tree

7 files changed

+38
-10
lines changed

7 files changed

+38
-10
lines changed
801 Bytes
Loading

src/app/legend/qgslegendlayer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ QPixmap QgsLegendLayer::getOriginalPixmap()
370370
return QgisApp::getThemePixmap( "/mIconPolygonLayer.png" );
371371
break;
372372
case QGis::NoGeometry:
373-
return QgisApp::getThemePixmap( "mActionOpenTable.png" );
373+
return QgisApp::getThemePixmap( "/mIconTableLayer.png" );
374374
default:
375375
return QgisApp::getThemePixmap( "/mIconLayer.png" );
376376
}

src/core/composer/qgscomposeritem.cpp

+21-8
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,15 @@
3939

4040
#define FONT_WORKAROUND_SCALE 10 //scale factor for upscaling fontsize and downscaling painter
4141

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 )
4451
{
4552
setFlag( QGraphicsItem::ItemIsSelectable, true );
4653
setAcceptsHoverEvents( true );
@@ -58,9 +65,15 @@ QgsComposerItem::QgsComposerItem( QgsComposition* composition, bool manageZValue
5865
}
5966
}
6067

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 )
6477
{
6578
setFlag( QGraphicsItem::ItemIsSelectable, true );
6679
setAcceptsHoverEvents( true );
@@ -530,8 +543,8 @@ void QgsComposerItem::changeItemRectangle( const QPointF& currentPosition, const
530543
}
531544
else //for composer items, we prefer setSceneRect as subclasses can implement custom behaviour (e.g. item group)
532545
{
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,
535548
originalItem->rect().width(), originalItem->rect().height() ) );
536549
}
537550
}
@@ -550,7 +563,7 @@ void QgsComposerItem::changeItemRectangle( const QPointF& currentPosition, const
550563
}
551564
else //for composer items, we prefer setSceneRect as subclasses can implement custom behaviour (e.g. item group)
552565
{
553-
changeComposerItem->setSceneRect( QRectF( originalItem->transform().dx() + mx, originalItem->transform().dy() + my, \
566+
changeComposerItem->setSceneRect( QRectF( originalItem->transform().dx() + mx, originalItem->transform().dy() + my,
554567
originalItem->rect().width() + rx, originalItem->rect().height() + ry ) );
555568
}
556569
}

src/core/composer/qgscomposerlegend.cpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@
2727
#include <QDomElement>
2828
#include <QPainter>
2929

30-
QgsComposerLegend::QgsComposerLegend( QgsComposition* composition ): QgsComposerItem( composition ), mTitle( tr( "Legend" ) ), mBoxSpace( 2 ), mLayerSpace( 3 ), mSymbolSpace( 2 ), mIconLabelSpace( 2 )
30+
QgsComposerLegend::QgsComposerLegend( QgsComposition* composition )
31+
: QgsComposerItem( composition )
32+
, mTitle( tr( "Legend" ) )
33+
, mBoxSpace( 2 )
34+
, mLayerSpace( 3 )
35+
, mSymbolSpace( 2 )
36+
, mIconLabelSpace( 2 )
3137
{
3238
//QStringList idList = layerIdList();
3339
//mLegendModel.setLayerSet( idList );
@@ -326,6 +332,7 @@ void QgsComposerLegend::drawSymbol( QPainter* p, QgsSymbol* s, double currentYCo
326332
symbolHeight = mSymbolHeight;
327333
break;
328334
case QGis::UnknownGeometry:
335+
case QGis::NoGeometry:
329336
// shouldn't occur
330337
break;
331338
}

src/core/composer/qgscomposerlegenditem.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "qgssymbolv2.h"
2323
#include "qgssymbollayerv2utils.h"
2424
#include "qgsvectorlayer.h"
25+
#include "qgsapplication.h"
2526
#include <QDomDocument>
2627
#include <QDomElement>
2728

@@ -135,6 +136,9 @@ void QgsComposerSymbolItem::readXML( const QDomElement& itemElem )
135136
case QGis::Polygon:
136137
setIcon( QIcon( QPixmap::fromImage( symbol->getPolygonSymbolAsImage() ) ) );
137138
break;
139+
case QGis::NoGeometry:
140+
setIcon( QIcon( QgsApplication::activeThemePath() + "/mIconTableLayer.png" ) );
141+
break;
138142
case QGis::UnknownGeometry:
139143
// should not occur
140144
break;

src/core/qgsgeometry.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -1796,6 +1796,7 @@ bool QgsGeometry::deleteVertex( int atVertex )
17961796
}
17971797
break;
17981798
}
1799+
case QGis::WKBNoGeometry:
17991800
case QGis::WKBUnknown:
18001801
break;
18011802
}
@@ -2099,6 +2100,7 @@ bool QgsGeometry::insertVertex( double x, double y, int beforeVertex )
20992100
}
21002101
break;
21012102
}
2103+
case QGis::WKBNoGeometry:
21022104
case QGis::WKBUnknown:
21032105
break;
21042106
}
@@ -6588,6 +6590,7 @@ void QgsGeometry::validateGeometry( QList<Error> &errors )
65886590
}
65896591
break;
65906592

6593+
case QGis::WKBNoGeometry:
65916594
case QGis::WKBUnknown:
65926595
QgsDebugMsg( QObject::tr( "Unknown geometry type" ) );
65936596
errors << Error( QObject::tr( "Unknown geometry type" ) );

src/mapserver/qgswmsserver.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1171,6 +1171,7 @@ void QgsWMSServer::drawLegendSymbol( QgsComposerLegendItem* item, QPainter* p, d
11711171
drawPolygonSymbol( p, symbol, boxSpace, currentY, symbolWidth, symbolHeight, layerOpacity, yDownShift );
11721172
break;
11731173
case QGis::UnknownGeometry:
1174+
case QGis::NoGeometry:
11741175
// shouldn't occur
11751176
break;
11761177
}

0 commit comments

Comments
 (0)