10 changes: 0 additions & 10 deletions src/core/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,6 @@ SET(QGIS_CORE_SRCS
raster/qgsbrightnesscontrastfilter.cpp
raster/qgshuesaturationfilter.cpp

symbology/qgsmarkercatalogue.cpp
symbology/qgssymbol.cpp
symbology/qgssymbologyutils.cpp

qgsspatialindex.cpp

qgspaintenginehack.cpp
Expand Down Expand Up @@ -339,7 +335,6 @@ SET(QGIS_CORE_MOC_HDRS
composer/qgscomposition.h

composer/qgslegendmodel.h
symbology/qgsmarkercatalogue.h
raster/qgsrasterlayer.h
raster/qgsrasterdataprovider.h

Expand Down Expand Up @@ -484,10 +479,6 @@ SET(QGIS_CORE_HDRS
raster/qgsrastershaderfunction.h
raster/qgsrasterviewport.h

symbology/qgsmarkercatalogue.h
symbology/qgssymbol.h
symbology/qgssymbologyutils.h

symbology-ng/qgscategorizedsymbolrendererv2.h
symbology-ng/qgscolorbrewerpalette.h
symbology-ng/qgsellipsesymbollayerv2.h
Expand Down Expand Up @@ -531,7 +522,6 @@ INCLUDE_DIRECTORIES(
pal
raster
renderer
symbology
symbology-ng
gps/qextserialport
${SPATIALINDEX_INCLUDE_DIR}
Expand Down
153 changes: 4 additions & 149 deletions src/core/composer/qgscomposerlegend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "qgsmaplayer.h"
#include "qgsmaplayerregistry.h"
#include "qgsmaprenderer.h"
#include "qgssymbol.h"
#include "qgssymbolv2.h"
#include <QDomDocument>
#include <QDomElement>
Expand Down Expand Up @@ -335,13 +334,6 @@ QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendI

QStringList lines = splitStringForWrapping( text );

QgsSymbol* symbol = 0;
QgsComposerSymbolItem* symItem = dynamic_cast<QgsComposerSymbolItem*>( symbolItem );
if ( symItem )
{
symbol = symItem->symbol();
}

QgsSymbolV2* symbolNg = 0;
QgsComposerSymbolV2Item* symbolV2Item = dynamic_cast<QgsComposerSymbolV2Item*>( symbolItem );
if ( symbolV2Item )
Expand All @@ -351,14 +343,7 @@ QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendI
QgsComposerRasterSymbolItem* rasterItem = dynamic_cast<QgsComposerRasterSymbolItem*>( symbolItem );

double x = point.x();
if ( symbol ) //item with symbol?
{
//draw symbol
drawSymbol( painter, symbol, point.y() + ( itemHeight - mSymbolHeight ) / 2, x, realSymbolHeight, opacity );
symbolSize.rwidth() = qMax( x - point.x(), mSymbolWidth );
symbolSize.rheight() = qMax( realSymbolHeight, mSymbolHeight );
}
else if ( symbolNg ) //item with symbol NG?
if ( symbolNg ) //item with symbol NG?
{
// must be called also with painter=0 to get real size
drawSymbolV2( painter, symbolNg, point.y() + ( itemHeight - mSymbolHeight ) / 2, x, realSymbolHeight, opacity );
Expand Down Expand Up @@ -428,33 +413,6 @@ QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendI
return nucleon;
}

void QgsComposerLegend::drawSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition, double& symbolHeight, int layerOpacity ) const
{
if ( !s )
{
return;
}

QGis::GeometryType symbolType = s->type();
switch ( symbolType )
{
case QGis::Point:
drawPointSymbol( p, s, currentYCoord, currentXPosition, symbolHeight, layerOpacity );
break;
case QGis::Line:
drawLineSymbol( p, s, currentYCoord, currentXPosition, layerOpacity );
symbolHeight = mSymbolHeight;
break;
case QGis::Polygon:
drawPolygonSymbol( p, s, currentYCoord, currentXPosition, layerOpacity );
symbolHeight = mSymbolHeight;
break;
case QGis::UnknownGeometry:
case QGis::NoGeometry:
// shouldn't occur
break;
}
}

void QgsComposerLegend::drawSymbolV2( QPainter* p, QgsSymbolV2* s, double currentYCoord, double& currentXPosition, double& symbolHeight, int layerOpacity ) const
{
Expand Down Expand Up @@ -538,106 +496,6 @@ void QgsComposerLegend::drawSymbolV2( QPainter* p, QgsSymbolV2* s, double curren
symbolHeight = height + 2 * heightOffset;
}

void QgsComposerLegend::drawPointSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition, double& symbolHeight, int opacity ) const
{
if ( !s )
{
return;
}

QImage pointImage;
double rasterScaleFactor = 1.0;
if ( p )
{
QPaintDevice* paintDevice = p->device();
if ( !paintDevice )
{
return;
}

rasterScaleFactor = ( paintDevice->logicalDpiX() + paintDevice->logicalDpiY() ) / 2.0 / 25.4;
}

//width scale is 1.0
pointImage = s->getPointSymbolAsImage( 1.0, false, Qt::yellow, 1.0, 0.0, rasterScaleFactor, opacity / 255.0 );

if ( p )
{
p->save();
p->scale( 1.0 / rasterScaleFactor, 1.0 / rasterScaleFactor );

QPointF imageTopLeft( currentXPosition * rasterScaleFactor, currentYCoord * rasterScaleFactor );
p->drawImage( imageTopLeft, pointImage );
p->restore();
}

currentXPosition += s->pointSize(); //pointImage.width() / rasterScaleFactor;
symbolHeight = s->pointSize(); //pointImage.height() / rasterScaleFactor;
}

void QgsComposerLegend::drawLineSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition, int opacity ) const
{
if ( !s )
{
return;
}

double yCoord = currentYCoord + mSymbolHeight / 2;

if ( p )
{
p->save();
QPen symbolPen = s->pen();
QColor penColor = symbolPen.color();
penColor.setAlpha( opacity );
symbolPen.setColor( penColor );
symbolPen.setCapStyle( Qt::FlatCap );
p->setPen( symbolPen );
p->drawLine( QPointF( currentXPosition, yCoord ), QPointF( currentXPosition + mSymbolWidth, yCoord ) );
p->restore();
}

currentXPosition += mSymbolWidth;
}

void QgsComposerLegend::drawPolygonSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition, int opacity ) const
{
if ( !s )
{
return;
}

if ( p )
{
//scale brush and set transparencies
QBrush symbolBrush = s->brush();
QColor brushColor = symbolBrush.color();
brushColor.setAlpha( opacity );
symbolBrush.setColor( brushColor );
QPaintDevice* paintDevice = p->device();
if ( paintDevice )
{
double rasterScaleFactor = ( paintDevice->logicalDpiX() + paintDevice->logicalDpiY() ) / 2.0 / 25.4;
if ( rasterScaleFactor != 1.0 )
{
QMatrix m;
m.scale( 1.0 / rasterScaleFactor, 1.0 / rasterScaleFactor );
symbolBrush.setMatrix( m );
}
}
p->setBrush( symbolBrush );

QPen symbolPen = s->pen();
QColor penColor = symbolPen.color();
penColor.setAlpha( opacity );
symbolPen.setColor( penColor );
p->setPen( symbolPen );

p->drawRect( QRectF( currentXPosition, currentYCoord, mSymbolWidth, mSymbolHeight ) );
}

currentXPosition += mSymbolWidth;
}

QStringList QgsComposerLegend::layerIdList() const
{
Expand Down Expand Up @@ -1004,8 +862,7 @@ QSizeF QgsComposerLegend::drawAtom( Atom atom, QPainter* painter, QPointF point
drawLayerItemTitle( layerItem, painter, point );
}
}
else if ( type == QgsComposerLegendItem::SymbologyItem ||
type == QgsComposerLegendItem::SymbologyV2Item ||
else if ( type == QgsComposerLegendItem::SymbologyV2Item ||
type == QgsComposerLegendItem::RasterSymbolItem )
{
//if ( !first )
Expand Down Expand Up @@ -1127,8 +984,7 @@ void QgsComposerLegend::setColumns( QList<Atom>& atomList )
QgsComposerLegendItem* item = atomList[i].nucleons[j].item;
if ( !item ) continue;
QgsComposerLegendItem::ItemType type = item->itemType();
if ( type == QgsComposerLegendItem::SymbologyItem ||
type == QgsComposerLegendItem::SymbologyV2Item ||
if ( type == QgsComposerLegendItem::SymbologyV2Item ||
type == QgsComposerLegendItem::RasterSymbolItem )
{
QString key = QString( "%1-%2" ).arg(( qulonglong )item->parent() ).arg( atomList[i].column );
Expand All @@ -1143,8 +999,7 @@ void QgsComposerLegend::setColumns( QList<Atom>& atomList )
QgsComposerLegendItem* item = atomList[i].nucleons[j].item;
if ( !item ) continue;
QgsComposerLegendItem::ItemType type = item->itemType();
if ( type == QgsComposerLegendItem::SymbologyItem ||
type == QgsComposerLegendItem::SymbologyV2Item ||
if ( type == QgsComposerLegendItem::SymbologyV2Item ||
type == QgsComposerLegendItem::RasterSymbolItem )
{
QString key = QString( "%1-%2" ).arg(( qulonglong )item->parent() ).arg( atomList[i].column );
Expand Down
5 changes: 0 additions & 5 deletions src/core/composer/qgscomposerlegend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "qgscomposerlegenditem.h"
#include "qgslegendmodel.h"

class QgsSymbol;
class QgsSymbolV2;
class QgsComposerGroupItem;
class QgsComposerLayerItem;
Expand Down Expand Up @@ -218,11 +217,7 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem

/**Draws a symbol at the current y position and returns the new x position. Returns real symbol height, because for points,
it is possible that it differs from mSymbolHeight*/
void drawSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition, double& symbolHeight, int layerOpacity = 255 ) const;
void drawSymbolV2( QPainter* p, QgsSymbolV2* s, double currentYCoord, double& currentXPosition, double& symbolHeight, int layerOpacity = 255 ) const;
void drawPointSymbol( QPainter*, QgsSymbol* s, double currentYCoord, double& currentXPosition, double& symbolHeight, int opacity = 255 ) const;
void drawLineSymbol( QPainter*, QgsSymbol* s, double currentYCoord, double& currentXPosition, int opacity = 255 ) const;
void drawPolygonSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition, int opacity = 255 ) const;

/** Draw atom and return its actual size */
QSizeF drawAtom( Atom atom, QPainter* painter = 0, QPointF point = QPointF() );
Expand Down
97 changes: 1 addition & 96 deletions src/core/composer/qgscomposerlegenditem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "qgsmaplayerregistry.h"
#include "qgsrasterlayer.h"
#include "qgsrendererv2.h"
#include "qgssymbol.h"
#include "qgssymbolv2.h"
#include "qgssymbollayerv2utils.h"
#include "qgsvectorlayer.h"
Expand Down Expand Up @@ -62,100 +61,6 @@ void QgsComposerLegendItem::writeXMLChildren( QDomElement& elem, QDomDocument& d
}
}

//////////////////////////////QgsComposerSymbolItem

QgsComposerSymbolItem::QgsComposerSymbolItem(): QgsComposerLegendItem( QgsComposerLegendStyle::Symbol ), mSymbol( 0 )
{
}

QgsComposerSymbolItem::QgsComposerSymbolItem( const QString& text ): QgsComposerLegendItem( text, QgsComposerLegendStyle::Symbol ), mSymbol( 0 )
{
}

QgsComposerSymbolItem::QgsComposerSymbolItem( const QIcon& icon, const QString& text ): QgsComposerLegendItem( icon, text, QgsComposerLegendStyle::Symbol ), mSymbol( 0 )
{
}

QgsComposerSymbolItem::~QgsComposerSymbolItem()
{
delete mSymbol;
}

void QgsComposerSymbolItem::setSymbol( QgsSymbol* s )
{
delete mSymbol;
mSymbol = s;
}

QStandardItem* QgsComposerSymbolItem::clone() const
{
QgsComposerSymbolItem* cloneItem = new QgsComposerSymbolItem();
*cloneItem = *this;
if ( mSymbol )
{
cloneItem->setSymbol( new QgsSymbol( *mSymbol ) );
}
return cloneItem;
}

void QgsComposerSymbolItem::writeXML( QDomElement& elem, QDomDocument& doc ) const
{
QDomElement vectorClassElem = doc.createElement( "VectorClassificationItem" );
if ( mSymbol )
{
mSymbol->writeXML( vectorClassElem, doc, 0 );
}
vectorClassElem.setAttribute( "text", text() );
vectorClassElem.setAttribute( "layerId", mLayerID );

elem.appendChild( vectorClassElem );
}

void QgsComposerSymbolItem::readXML( const QDomElement& itemElem, bool xServerAvailable )
{
if ( itemElem.isNull() )
{
return;
}
setText( itemElem.attribute( "text", "" ) );
setLayerID( itemElem.attribute( "layerId", "" ) );

QgsVectorLayer* vLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( mLayerID ) );
if ( vLayer )
{
QDomElement symbolElem = itemElem.firstChildElement( "symbol" );
if ( !symbolElem.isNull() )
{
QgsSymbol* symbol = new QgsSymbol( vLayer->geometryType() );
symbol->readXML( symbolElem, vLayer );
setSymbol( symbol );
if ( !xServerAvailable ) //don't read icon without GUI
{
return;
}

//add icon
switch ( symbol->type() )
{
case QGis::Point:
setIcon( QIcon( QPixmap::fromImage( symbol->getPointSymbolAsImage() ) ) );
break;
case QGis::Line:
setIcon( QIcon( QPixmap::fromImage( symbol->getLineSymbolAsImage() ) ) );
break;
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;
}
}
}
}

////////////////QgsComposerSymbolV2Item

Expand Down Expand Up @@ -356,7 +261,7 @@ void QgsComposerLayerItem::readXML( const QDomElement& itemElem, bool xServerAva
QString elemTag = currentElem.tagName();
if ( elemTag == "VectorClassificationItem" )
{
currentChildItem = new QgsComposerSymbolItem();
continue; // legacy - unsupported
}
else if ( elemTag == "VectorClassificationItemNg" )
{
Expand Down
29 changes: 0 additions & 29 deletions src/core/composer/qgscomposerlegenditem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ class CORE_EXPORT QgsComposerLegendItem: public QStandardItem
{
GroupItem = QStandardItem::UserType,
LayerItem,
SymbologyItem,
SymbologyV2Item,
RasterSymbolItem,
StyleItem
Expand All @@ -60,34 +59,6 @@ class CORE_EXPORT QgsComposerLegendItem: public QStandardItem
QgsComposerLegendStyle::Style mStyle;
};

class QgsSymbol;

class CORE_EXPORT QgsComposerSymbolItem: public QgsComposerLegendItem
{
public:
QgsComposerSymbolItem();
QgsComposerSymbolItem( const QString& text );
QgsComposerSymbolItem( const QIcon& icon, const QString& text );
virtual ~QgsComposerSymbolItem();

virtual QStandardItem* clone() const;

virtual void writeXML( QDomElement& elem, QDomDocument& doc ) const;
virtual void readXML( const QDomElement& itemElem, bool xServerAvailable = true );

/**Set symbol (takes ownership)*/
void setSymbol( QgsSymbol* s );
QgsSymbol* symbol() {return mSymbol;}

void setLayerID( const QString& id ) { mLayerID = id; }
QString layerID() const { return mLayerID; }

ItemType itemType() const { return SymbologyItem; }

private:
QgsSymbol* mSymbol;
QString mLayerID; //this is needed to read the symbol from XML
};

class QgsSymbolV2;

Expand Down
80 changes: 0 additions & 80 deletions src/core/composer/qgslegendmodel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "qgsrasterlayer.h"
#include "qgsrendererv2.h"
#include "qgssymbollayerv2utils.h"
#include "qgssymbol.h"
#include "qgsvectordataprovider.h"
#include "qgsvectorlayer.h"
#include <QApplication>
Expand All @@ -42,7 +41,6 @@ QgsLegendModel::QgsLegendModel(): QStandardItemModel(), mAutoUpdate( true )
connect( QgsMapLayerRegistry::instance(), SIGNAL( layerWillBeRemoved( QString ) ), this, SLOT( removeLayer( const QString& ) ) );
connect( QgsMapLayerRegistry::instance(), SIGNAL( layerWasAdded( QgsMapLayer* ) ), this, SLOT( addLayer( QgsMapLayer* ) ) );
}
setItemPrototype( new QgsComposerSymbolItem() );

QWidgetList topLevelWidgets = QApplication::topLevelWidgets();
mHasTopLevelWindow = ( topLevelWidgets.size() > 0 );
Expand Down Expand Up @@ -341,84 +339,6 @@ void QgsLegendModel::addLayer( QgsMapLayer* theMapLayer )
emit layersChanged();
}

QStandardItem* QgsLegendModel::itemFromSymbol( QgsSymbol* s, int opacity, const QString& layerID )
{
QgsComposerSymbolItem* currentSymbolItem = 0;

//label
QString itemText;
QString label;

QString lowerValue = s->lowerValue();
QString upperValue = s->upperValue();

label = s->label();

//Take the label as item text if it is there
if ( !label.isEmpty() )
{
itemText = label;
}
//take single value
else if ( lowerValue == upperValue || upperValue.isEmpty() )
{
itemText = lowerValue;
}
else //or value range
{
itemText = lowerValue + " - " + upperValue;
}

//icon item
QImage symbolImage;
switch ( s->type() )
{
case QGis::Point:
symbolImage = s->getPointSymbolAsImage();
break;
case QGis::Line:
symbolImage = s->getLineSymbolAsImage();
break;
case QGis::Polygon:
symbolImage = s->getPolygonSymbolAsImage();
break;
default:
return 0;
}

if ( opacity != 255 )
{
//todo: manipulate image pixel by pixel...
QRgb oldColor;
for ( int i = 0; i < symbolImage.height(); ++i )
{
QRgb* scanLineBuffer = ( QRgb* ) symbolImage.scanLine( i );
for ( int j = 0; j < symbolImage.width(); ++j )
{
oldColor = symbolImage.pixel( j, i );
scanLineBuffer[j] = qRgba( qRed( oldColor ), qGreen( oldColor ), qBlue( oldColor ), opacity );
}
}
}

currentSymbolItem = new QgsComposerSymbolItem( itemText );
if ( mHasTopLevelWindow )//only use QIcon / QPixmap if we have a running x-server
{
currentSymbolItem->setIcon( QIcon( QPixmap::fromImage( symbolImage ) ) );
}

if ( !currentSymbolItem )
{
return 0;
}

//Pass deep copy of QgsSymbol as user data. Cast to void* necessary such that QMetaType handles it
QgsSymbol* symbolCopy = new QgsSymbol( *s );
currentSymbolItem->setSymbol( symbolCopy );
currentSymbolItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
currentSymbolItem ->setLayerID( layerID );
return currentSymbolItem;
}

bool QgsLegendModel::writeXML( QDomElement& composerLegendElem, QDomDocument& doc ) const
{
Expand Down
6 changes: 0 additions & 6 deletions src/core/composer/qgslegendmodel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
class QDomDocument;
class QDomElement;
class QgsMapLayer;
class QgsSymbol;
class QgsSymbolV2;
class QgsVectorLayer;

Expand Down Expand Up @@ -68,8 +67,6 @@ class CORE_EXPORT QgsLegendModel: public QStandardItemModel
/**Updates the whole symbology of a layer*/
void updateLayer( QStandardItem* layerItem );
/**Tries to update a single classification item*/
void updateVectorClassificationItem( QStandardItem* classificationItem, QgsSymbol* symbol, QString itemText )
{ Q_UNUSED( classificationItem ); Q_UNUSED( symbol ); Q_UNUSED( itemText ); }
void updateVectorV2ClassificationItem( QStandardItem* classificationItem, QgsSymbolV2* symbol, QString itemText )
{ Q_UNUSED( classificationItem ); Q_UNUSED( symbol ); Q_UNUSED( itemText ); }
void updateRasterClassificationItem( QStandardItem* classificationItem )
Expand Down Expand Up @@ -109,9 +106,6 @@ class CORE_EXPORT QgsLegendModel: public QStandardItemModel
@return 0 in case of success*/
int addRasterLayerItems( QStandardItem* layerItem, QgsMapLayer* rlayer );

/**Creates a model item for a vector symbol. The calling function takes ownership*/
QStandardItem* itemFromSymbol( QgsSymbol* s, int opacity, const QString& layerID );

protected:
QStringList mLayerIds;
/**True if this application has toplevel windows (normally true). If this is false, this means that the application
Expand Down
1 change: 0 additions & 1 deletion src/core/qgsmaplayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

#include "qgslogger.h"
#include "qgsrectangle.h"
#include "qgssymbol.h"
#include "qgsmaplayer.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsapplication.h"
Expand Down
227 changes: 224 additions & 3 deletions src/core/symbology-ng/qgssymbologyv2conversion.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "qgssymbologyv2conversion.h"

#include "qgslogger.h"
#include "qgssymbologyutils.h"

#include "qgsmarkersymbollayerv2.h"
#include "qgslinesymbollayerv2.h"
Expand Down Expand Up @@ -92,14 +91,14 @@ static Qt::PenStyle readOutlineStyle( const QDomNode& synode )
{
QDomNode outlstnode = synode.namedItem( "outlinestyle" );
QDomElement outlstelement = outlstnode.toElement();
return QgsSymbologyUtils::qString2PenStyle( outlstelement.text() );
return QgsSymbologyV2Conversion::qString2PenStyle( outlstelement.text() );
}

static Qt::BrushStyle readBrushStyle( const QDomNode& synode )
{
QDomNode fillpnode = synode.namedItem( "fillpattern" );
QDomElement fillpelement = fillpnode.toElement();
return QgsSymbologyUtils::qString2BrushStyle( fillpelement.text() );
return QgsSymbologyV2Conversion::qString2BrushStyle( fillpelement.text() );
}

static QString readMarkerSymbolName( const QDomNode& synode )
Expand Down Expand Up @@ -346,3 +345,225 @@ UNSUPPORTED SYMBOL PROPERTY: texture
QDomElement texturepathelement = texturepathnode.toElement();
setCustomTexture( QgsProject::instance()->readPath( texturepathelement.text() ) );
*/





QString QgsSymbologyV2Conversion::penStyle2QString( Qt::PenStyle penstyle )
{
if ( penstyle == Qt::NoPen )
{
return "NoPen";
}
else if ( penstyle == Qt::SolidLine )
{
return "SolidLine";
}
else if ( penstyle == Qt::DashLine )
{
return "DashLine";
}
else if ( penstyle == Qt::DotLine )
{
return "DotLine";
}
else if ( penstyle == Qt::DashDotLine )
{
return "DashDotLine";
}
else if ( penstyle == Qt::DashDotDotLine )
{
return "DashDotDotLine";
}
else if ( penstyle == Qt::MPenStyle )
{
return "MPenStyle";
}
else //return a null string
{
return QString();
}
}

Qt::PenStyle QgsSymbologyV2Conversion::qString2PenStyle( QString penString )
{
if ( penString == "NoPen" )
{
return Qt::NoPen;
}
else if ( penString == "SolidLine" )
{
return Qt::SolidLine;
}
else if ( penString == "DashLine" )
{
return Qt::DashLine;
}
else if ( penString == "DotLine" )
{
return Qt::DotLine;
}
else if ( penString == "DashDotLine" )
{
return Qt::DashDotLine;
}
else if ( penString == "DashDotDotLine" )
{
return Qt::DashDotDotLine;
}
else if ( penString == "MPenStyle" )
{
return Qt::MPenStyle;
}
else
{
return Qt::NoPen;
}
}

QString QgsSymbologyV2Conversion::brushStyle2QString( Qt::BrushStyle brushstyle )
{
if ( brushstyle == Qt::NoBrush )
{
return "NoBrush";
}
else if ( brushstyle == Qt::SolidPattern )
{
return "SolidPattern";
}
else if ( brushstyle == Qt::Dense1Pattern )
{
return "Dense1Pattern";
}
else if ( brushstyle == Qt::Dense2Pattern )
{
return "Dense2Pattern";
}
else if ( brushstyle == Qt::Dense3Pattern )
{
return "Dense3Pattern";
}
else if ( brushstyle == Qt::Dense4Pattern )
{
return "Dense4Pattern";
}
else if ( brushstyle == Qt::Dense5Pattern )
{
return "Dense5Pattern";
}
else if ( brushstyle == Qt::Dense6Pattern )
{
return "Dense6Pattern";
}
else if ( brushstyle == Qt::Dense7Pattern )
{
return "Dense7Pattern";
}
else if ( brushstyle == Qt::HorPattern )
{
return "HorPattern";
}
else if ( brushstyle == Qt::VerPattern )
{
return "VerPattern";
}
else if ( brushstyle == Qt::CrossPattern )
{
return "CrossPattern";
}
else if ( brushstyle == Qt::BDiagPattern )
{
return "BDiagPattern";
}
else if ( brushstyle == Qt::FDiagPattern )
{
return "FDiagPattern";
}
else if ( brushstyle == Qt::DiagCrossPattern )
{
return "DiagCrossPattern";
}
else if ( brushstyle == Qt::TexturePattern )
{
return "TexturePattern";
}
else //return a null string
{
QgsDebugMsg( "no matching pattern found" );
return " ";
}
}

Qt::BrushStyle QgsSymbologyV2Conversion::qString2BrushStyle( QString brushString )
{
if ( brushString == "NoBrush" )
{
return Qt::NoBrush;
}
else if ( brushString == "SolidPattern" )
{
return Qt::SolidPattern;
}
else if ( brushString == "Dense1Pattern" )
{
return Qt::Dense1Pattern;
}
else if ( brushString == "Dense2Pattern" )
{
return Qt::Dense2Pattern;
}
else if ( brushString == "Dense3Pattern" )
{
return Qt::Dense3Pattern;
}
else if ( brushString == "Dense4Pattern" )
{
return Qt::Dense4Pattern;
}
else if ( brushString == "Dense5Pattern" )
{
return Qt::Dense5Pattern;
}
else if ( brushString == "Dense6Pattern" )
{
return Qt::Dense6Pattern;
}
else if ( brushString == "Dense7Pattern" )
{
return Qt::Dense7Pattern;
}
else if ( brushString == "HorPattern" )
{
return Qt::HorPattern;
}
else if ( brushString == "VerPattern" )
{
return Qt::VerPattern;
}
else if ( brushString == "CrossPattern" )
{
return Qt::CrossPattern;
}
else if ( brushString == "BDiagPattern" )
{
return Qt::BDiagPattern;
}
else if ( brushString == "FDiagPattern" )
{
return Qt::FDiagPattern;
}
else if ( brushString == "DiagCrossPattern" )
{
return Qt::DiagCrossPattern;
}
else if ( brushString == "TexturePattern" )
{
return Qt::TexturePattern;
}
else //return a null string
{
QgsDebugMsg( QString( "Brush style \"%1\" not found" ).arg( brushString ) );
return Qt::NoBrush;
}
}
8 changes: 8 additions & 0 deletions src/core/symbology-ng/qgssymbologyv2conversion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,21 @@ class QgsFeatureRendererV2;

#include "qgis.h"

#include <Qt>

/** This class is not a part of public API, it is intended only for compatibility with older versions of QGIS (1.x) */
class CORE_EXPORT QgsSymbologyV2Conversion
{
public:

/** Read old renderer definition from XML and create matching new renderer */
static QgsFeatureRendererV2* readOldRenderer( const QDomNode& layerNode, QGis::GeometryType geomType );


static QString penStyle2QString( Qt::PenStyle penstyle );
static Qt::PenStyle qString2PenStyle( QString string );
static QString brushStyle2QString( Qt::BrushStyle brushstyle );
static Qt::BrushStyle qString2BrushStyle( QString string );
};

#endif // QGSSYMBOLOGYV2CONVERSION_H
418 changes: 0 additions & 418 deletions src/core/symbology/qgsmarkercatalogue.cpp
View file

This file was deleted.

90 changes: 0 additions & 90 deletions src/core/symbology/qgsmarkercatalogue.h
View file

This file was deleted.

718 changes: 0 additions & 718 deletions src/core/symbology/qgssymbol.cpp
View file

This file was deleted.

281 changes: 0 additions & 281 deletions src/core/symbology/qgssymbol.h
View file

This file was deleted.

1,403 changes: 0 additions & 1,403 deletions src/core/symbology/qgssymbologyutils.cpp
View file

This file was deleted.

45 changes: 0 additions & 45 deletions src/core/symbology/qgssymbologyutils.h
View file

This file was deleted.

1 change: 0 additions & 1 deletion src/gui/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ INCLUDE_DIRECTORIES(
../core
../core/composer
../core/raster
../core/symbology
../core/symbology-ng
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsattributedialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "qgsproject.h"
#include "qgsvectorlayer.h"
#include "qgsvectordataprovider.h"
#include "qgssymbol.h"
#include "qgsattributeeditor.h"
#include "qgshighlight.h"
#include "qgsexpression.h"
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsattributeeditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <qgsvectorlayer.h>
#include <qgsvectordataprovider.h>
#include <qgscategorizedsymbolrendererv2.h>
#include <qgssymbol.h>
#include <qgslonglongvalidator.h>
#include <qgsfieldvalidator.h>
#include <qgsmaplayerregistry.h>
Expand Down
1 change: 0 additions & 1 deletion src/mapserver/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ INCLUDE_DIRECTORIES(
${QGIS_INCLUDE_DIR}
../core
../core/raster
../core/symbology
../core/symbology-ng
../core/composer
../analysis/interpolation
Expand Down
1 change: 0 additions & 1 deletion src/mapserver/qgswfsserver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#include "qgslogger.h"
#include "qgsmapserviceexception.h"
#include "qgssldparser.h"
#include "qgssymbol.h"
#include "qgssymbolv2.h"
#include "qgslegendmodel.h"
#include "qgscomposerlegenditem.h"
Expand Down
106 changes: 0 additions & 106 deletions src/mapserver/qgswmsserver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "qgslogger.h"
#include "qgsmapserviceexception.h"
#include "qgssldparser.h"
#include "qgssymbol.h"
#include "qgssymbolv2.h"
#include "qgsrendererv2.h"
#include "qgslegendmodel.h"
Expand Down Expand Up @@ -1535,9 +1534,6 @@ void QgsWMSServer::drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p,
QgsComposerLegendItem::ItemType type = currentComposerItem->itemType();
switch ( type )
{
case QgsComposerLegendItem::SymbologyItem:
drawLegendSymbol( currentComposerItem, p, boxSpace, currentY, currentSymbolWidth, currentSymbolHeight, opacity, dpi, symbolDownShift );
break;
case QgsComposerLegendItem::SymbologyV2Item:
drawLegendSymbolV2( currentComposerItem, p, boxSpace, currentY, currentSymbolWidth, currentSymbolHeight, dpi, symbolDownShift );
break;
Expand Down Expand Up @@ -1590,108 +1586,6 @@ void QgsWMSServer::drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p,
}
}

void QgsWMSServer::drawLegendSymbol( QgsComposerLegendItem* item, QPainter* p, double boxSpace, double currentY, double& symbolWidth, double& symbolHeight, double layerOpacity,
double dpi, double yDownShift ) const
{
QgsComposerSymbolItem* symbolItem = dynamic_cast< QgsComposerSymbolItem* >( item );
if ( !symbolItem )
{
return;
}

QgsSymbol* symbol = symbolItem->symbol();
if ( !symbol )
{
return;
}

QGis::GeometryType symbolType = symbol->type();
switch ( symbolType )
{
case QGis::Point:
drawPointSymbol( p, symbol, boxSpace, currentY, symbolWidth, symbolHeight, layerOpacity, dpi );
break;
case QGis::Line:
drawLineSymbol( p, symbol, boxSpace, currentY, symbolWidth, symbolHeight, layerOpacity, yDownShift );
break;
case QGis::Polygon:
drawPolygonSymbol( p, symbol, boxSpace, currentY, symbolWidth, symbolHeight, layerOpacity, yDownShift );
break;
case QGis::UnknownGeometry:
case QGis::NoGeometry:
// shouldn't occur
break;
}
}

void QgsWMSServer::drawPointSymbol( QPainter* p, QgsSymbol* s, double boxSpace, double currentY, double& symbolWidth, double& symbolHeight, double layerOpacity, double dpi ) const
{
if ( !s )
{
return;
}

QImage pointImage;

//width scale is 1.0
pointImage = s->getPointSymbolAsImage( dpi / 25.4, false, Qt::yellow, 1.0, 0.0, 1.0, layerOpacity / 255.0 );

if ( p )
{
QPointF imageTopLeft( boxSpace, currentY );
p->drawImage( imageTopLeft, pointImage );
}

symbolWidth = pointImage.width();
symbolHeight = pointImage.height();
}

void QgsWMSServer::drawPolygonSymbol( QPainter* p, QgsSymbol* s, double boxSpace, double currentY, double symbolWidth, double symbolHeight, double layerOpacity, double yDownShift ) const
{
if ( !s || !p )
{
return;
}

p->save();

//brush
QBrush symbolBrush = s->brush();
QColor brushColor = symbolBrush.color();
brushColor.setAlpha( layerOpacity );
symbolBrush.setColor( brushColor );
p->setBrush( symbolBrush );

//pen
QPen symbolPen = s->pen();
QColor penColor = symbolPen.color();
penColor.setAlpha( layerOpacity );
symbolPen.setColor( penColor );
p->setPen( symbolPen );

p->drawRect( QRectF( boxSpace, currentY + yDownShift, symbolWidth, symbolHeight ) );

p->restore();
}

void QgsWMSServer::drawLineSymbol( QPainter* p, QgsSymbol* s, double boxSpace, double currentY, double symbolWidth, double symbolHeight, double layerOpacity, double yDownShift ) const
{
if ( !s || !p )
{
return;
}

p->save();
QPen symbolPen = s->pen();
QColor penColor = symbolPen.color();
penColor.setAlpha( layerOpacity );
symbolPen.setColor( penColor );
symbolPen.setCapStyle( Qt::FlatCap );
p->setPen( symbolPen );
double lineY = currentY + symbolHeight / 2.0 + symbolPen.widthF() / 2.0 + yDownShift;
p->drawLine( QPointF( boxSpace, lineY ), QPointF( boxSpace + symbolWidth, lineY ) );
p->restore();
}

void QgsWMSServer::drawLegendSymbolV2( QgsComposerLegendItem* item, QPainter* p, double boxSpace, double currentY, double& symbolWidth,
double& symbolHeight, double dpi, double yDownShift ) const
Expand Down
7 changes: 1 addition & 6 deletions src/mapserver/qgswmsserver.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,7 @@ class QgsWMSServer
void drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p, double& maxTextWidth, double& maxSymbolWidth, double& currentY, const QFont& layerFont,
const QColor& layerFontColor, const QFont& itemFont, const QColor& itemFontColor, double boxSpace, double layerSpace,
double layerTitleSpace, double symbolSpace, double iconLabelSpace, double symbolWidth, double symbolHeight, double fontOversamplingFactor, double dpi ) const;
/**Draws a (old generation) symbol. Optionally, maxHeight is adapted (e.g. for large point markers) */
void drawLegendSymbol( QgsComposerLegendItem* item, QPainter* p, double boxSpace, double currentY, double& symbolWidth, double& symbolHeight,
double layerOpacity, double dpi, double yDownShift ) const;
void drawPointSymbol( QPainter* p, QgsSymbol* s, double boxSpace, double currentY, double& symbolWidth, double& symbolHeight, double layerOpacity, double dpi ) const;
void drawLineSymbol( QPainter* p, QgsSymbol* s, double boxSpace, double currentY, double symbolWidth, double symbolHeight, double layerOpacity, double yDownShift ) const;
void drawPolygonSymbol( QPainter* p, QgsSymbol* s, double boxSpace, double currentY, double symbolWidth, double symbolHeight, double layerOpacity, double yDownShift ) const;
/**Draws a symbol. Optionally, maxHeight is adapted (e.g. for large point markers) */
void drawLegendSymbolV2( QgsComposerLegendItem* item, QPainter* p, double boxSpace, double currentY, double& symbolWidth, double& symbolHeight, double dpi, double yDownShift ) const;
void drawRasterSymbol( QgsComposerLegendItem* item, QPainter* p, double boxSpace, double currentY, double symbolWidth, double symbolHeight, double yDownShift ) const;

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/compass/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ADD_LIBRARY (compassplugin MODULE ${COMPASS_SRCS} ${COMPASS_MOC_SRCS} ${COMPASS_

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/raster ../../core/symbology
../../core ../../core/raster
../../gui
..
)
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/coordinate_capture/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
../../core
../../core/raster
../../core/renderer
../../core/symbology
../../gui
..
${GEOS_INCLUDE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/delimited_text/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ADD_LIBRARY (delimitedtextplugin MODULE ${DLTEXT_SRCS} ${DLTEXT_MOC_SRCS} ${DLTE

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/raster ../../core/symbology
../../core ../../core/raster
../../gui
..
../../providers/delimitedtext/delimitedtext
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/diagram_overlay/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES(
../../core
../../core/pal
../../core/raster
../../core/symbology
../../core/symbology-ng
../../gui
..
)
Expand Down
1 change: 0 additions & 1 deletion src/plugins/diagram_overlay/qgsdiagramoverlay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include "qgsoverlayobject.h"
#include "qgsproject.h"
#include "qgsrendercontext.h"
#include "qgssymbologyutils.h"
#include "qgsvectordataprovider.h"
#include "qgslogger.h"

Expand Down
10 changes: 5 additions & 5 deletions src/plugins/diagram_overlay/qgswkndiagramfactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include "qgswkndiagramfactory.h"
#include "qgsfeature.h"
#include "qgssymbologyutils.h"
#include "qgssymbologyv2conversion.h"
#include <QDomDocument>
#include <QDomElement>
#include <QImage>
Expand Down Expand Up @@ -82,15 +82,15 @@ bool QgsWKNDiagramFactory::writeXML( QDomNode& overlay_node, QDomDocument& doc )
currentBrushElem.setAttribute( "red", QString::number( c_it->brush().color().red() ) );
currentBrushElem.setAttribute( "green", QString::number( c_it->brush().color().green() ) );
currentBrushElem.setAttribute( "blue", QString::number( c_it->brush().color().blue() ) );
currentBrushElem.setAttribute( "style", QgsSymbologyUtils::brushStyle2QString( c_it->brush().style() ) );
currentBrushElem.setAttribute( "style", QgsSymbologyV2Conversion::brushStyle2QString( c_it->brush().style() ) );

//pen
QDomElement currentPenElem = doc.createElement( "pen" );
currentPenElem.setAttribute( "red", QString::number( c_it->pen().color().red() ) );
currentPenElem.setAttribute( "green", QString::number( c_it->pen().color().green() ) );
currentPenElem.setAttribute( "blue", QString::number( c_it->pen().color().blue() ) );
currentPenElem.setAttribute( "width", QString::number( c_it->pen().width() ) );
currentPenElem.setAttribute( "style", QgsSymbologyUtils::penStyle2QString( c_it->pen().style() ) );
currentPenElem.setAttribute( "style", QgsSymbologyV2Conversion::penStyle2QString( c_it->pen().style() ) );

currentCategoryElem.appendChild( currentBrushElem );
currentCategoryElem.appendChild( currentPenElem );
Expand Down Expand Up @@ -177,7 +177,7 @@ bool QgsWKNDiagramFactory::readXML( const QDomNode& factoryNode )
green = penElem.attribute( "green" ).toInt();
blue = penElem.attribute( "blue" ).toInt();
currentPen.setColor( QColor( red, green, blue ) );
currentPen.setStyle( QgsSymbologyUtils::qString2PenStyle( penElem.attribute( "style" ) ) );
currentPen.setStyle( QgsSymbologyV2Conversion::qString2PenStyle( penElem.attribute( "style" ) ) );
newCategory.setPen( currentPen );
}

Expand All @@ -190,7 +190,7 @@ bool QgsWKNDiagramFactory::readXML( const QDomNode& factoryNode )
green = brushElem.attribute( "green" ).toInt();
blue = brushElem.attribute( "blue" ).toInt();
currentBrush.setColor( QColor( red, green, blue ) );
currentBrush.setStyle( QgsSymbologyUtils::qString2BrushStyle( brushElem.attribute( "style" ) ) );
currentBrush.setStyle( QgsSymbologyV2Conversion::qString2BrushStyle( brushElem.attribute( "style" ) ) );
newCategory.setBrush( currentBrush );
}
mCategories.push_back( newCategory );
Expand Down
1 change: 0 additions & 1 deletion src/plugins/dxf2shp_converter/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core
../../core/raster
../../core/symbology
../../gui
..
)
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/georeferencer/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ ADD_LIBRARY (georefplugin MODULE ${GEOREF_SRCS} ${GEOREF_MOC_SRCS} ${GEOREF_RCC_
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/raster ../../core/symbology ../../core/composer
../../core ../../core/raster ../../core/composer
../../gui
..
${GSL_INCLUDE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/globe/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ INCLUDE_DIRECTORIES(
${OSGEARTH_INCLUDE_DIR}
${OSG_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
../../core ../../core/raster ../../core/symbology
../../core ../../core/raster
../../gui
..
)
Expand Down
1 change: 0 additions & 1 deletion src/plugins/grass/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core
../../core/raster
../../core/symbology
../../gui
../../providers/grass
${CMAKE_CURRENT_BINARY_DIR}/../../ui
Expand Down
1 change: 0 additions & 1 deletion src/plugins/interpolation/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ INCLUDE_DIRECTORIES(
../../analysis/interpolation
../../core
../../core/raster
../../core/symbology
../../gui
..
.
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/offline_editing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ENDIF (WITH_INTERNAL_SPATIALITE)

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/raster ../../core/symbology
../../core ../../core/raster
../../gui
..
${GEOS_INCLUDE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/oracle_raster/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ADD_LIBRARY (oracleplugin MODULE ${ORACLE_SRCS} ${ORACLE_MOC_SRCS} ${ORACLE_RCC_

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/raster ../../core/symbology
../../core ../../core/raster
../../gui
..
${GDAL_INCLUDE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/plugin_template/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ADD_LIBRARY ([pluginlcasename]plugin MODULE ${[pluginlcasename]_SRCS} ${[pluginl

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/raster ../../core/symbology
../../core ../../core/raster
../../gui
..
)
Expand Down
1 change: 0 additions & 1 deletion src/plugins/spatialquery/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
../../core
../../core/raster
../../core/symbology
../../gui
..
${GEOS_INCLUDE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spit/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ADD_LIBRARY (spitplugin MODULE ${SPIT_PLUGIN_SRCS} ${SPIT_PLUGIN_MOC_SRCS} ${SPI

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/raster ../../core/symbology
../../core ../../core/raster
../../gui
../../ui
../../app
Expand Down
1 change: 0 additions & 1 deletion src/plugins/sqlanywhere/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/../../ui
../../core
../../core/raster
../../core/symbology
../../gui
../../app
..
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/topology/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/ui
${CMAKE_CURRENT_BINARY_DIR}
${GEOS_INCLUDE_DIR}
../../core ../../core/raster ../../core/symbology
../../core ../../core/raster
../../gui
..
)
Expand Down
1 change: 0 additions & 1 deletion src/python/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ SET(QGISPYTHON_SRCS qgispython.cpp qgspythonutilsimpl.cpp)
INCLUDE_DIRECTORIES(
../core
../core/raster
../core/symbology
../gui
${PYTHON_INCLUDE_PATH}
)
Expand Down
2 changes: 0 additions & 2 deletions tests/src/analysis/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/renderer
${CMAKE_SOURCE_DIR}/src/core/symbology
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
${CMAKE_SOURCE_DIR}/src/analysis
${CMAKE_SOURCE_DIR}/src/analysis/vector
Expand Down
2 changes: 0 additions & 2 deletions tests/src/core/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/composer
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/renderer
${CMAKE_SOURCE_DIR}/src/core/symbology
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
Expand Down