Skip to content

Commit b6bf12a

Browse files
mhugentmhugent
committedJun 25, 2012
Merge branch 'raster_renderer_default'
·
ltr-3_40Before-merge-new_vector_api
2 parents 48e42c5 + 6a7ab64 commit b6bf12a

File tree

6 files changed

+85
-872
lines changed

6 files changed

+85
-872
lines changed
 

‎python/core/qgsrasterlayer.sip

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ public:
145145
DrawingStyle drawingStyle();
146146

147147
/** \brief Accessor for gray band name mapping */
148-
QString grayBandName() const;
148+
//QString grayBandName() const; //removed with raster redesign
149149

150150
/** \brief Accessor for green band name mapping */
151-
QString greenBandName() const;
151+
//QString greenBandName() const; //removed with raster redesign
152152

153153
/** \brief Accessor for mHasPyramids (READ ONLY) */
154154
bool hasPyramids();
@@ -163,31 +163,31 @@ public:
163163
int height();
164164

165165
/** \brief Accessor to find out whether the histogram should be inverted */
166-
bool invertHistogram() const;
166+
//bool invertHistogram() const; //removed with raster redesign
167167

168168
/** \brief Is the NoDataValue Valid */
169169
bool isNoDataValueValid() const;
170170

171171
/** \brief Accessor for mGrayMinimumMaximumEstimated */
172-
bool isGrayMinimumMaximumEstimated() const;
172+
//bool isGrayMinimumMaximumEstimated() const; //removed with raster redesign
173173

174174
/** \brief Accessor for mRGBMinimumMaximumEstimated */
175-
bool isRGBMinimumMaximumEstimated() const;
175+
//bool isRGBMinimumMaximumEstimated() const; //removed with raster redesign
176176

177177
/** \brief Accessor that returns the NO_DATA entry for this raster */
178178
double noDataValue( bool* isValid = 0 );
179179

180180
/** \brief Returns a pointer to the transparency object */
181-
QgsRasterTransparency* rasterTransparency();
181+
//QgsRasterTransparency* rasterTransparency(); //removed with raster redesign
182182

183183
/** \brief Accessor for raster shader */
184-
QgsRasterShader* rasterShader();
184+
//QgsRasterShader* rasterShader(); //removed with raster redesign
185185

186186
/** \brief Accessor for raster layer type (which is a read only property) */
187187
LayerType rasterType();
188188

189189
/** \brief Accessor for red band name (allows alternate mappings e.g. map blue as red color) */
190-
QString redBandName();
190+
//QString redBandName(); //removed with raster redesign
191191

192192
/** [ data provider interface ] Set the data provider */
193193
void setDataProvider( const QString & provider );
@@ -196,22 +196,22 @@ public:
196196
void setDrawingStyle( const DrawingStyle & theDrawingStyle );
197197

198198
/** \brief Mutator for mGrayMinimumMaximumEstimated */
199-
void setGrayMinimumMaximumEstimated( bool theBool );
199+
//void setGrayMinimumMaximumEstimated( bool theBool ); //removed with raster redesign
200200

201201
/** \brief Mutator to alter the state of the invert histogram flag */
202-
void setInvertHistogram( bool theFlag );
202+
//void setInvertHistogram( bool theFlag ); //removed with raster redesign
203203

204204
/** \brief Mutator for mRGBMinimumMaximumEstimated */
205-
void setRGBMinimumMaximumEstimated( bool theBool );
205+
//void setRGBMinimumMaximumEstimated( bool theBool ); //removed with raster redesign
206206

207207
/** \brief Mutator to alter the number of standard deviations that should be plotted */
208-
void setStandardDeviations( double theStdDevsToPlot );
208+
//void setStandardDeviations( double theStdDevsToPlot ); //removed with raster redesign
209209

210210
/** \brief Mutator for mUserDefinedGrayMinimumMaximum */
211-
void setUserDefinedGrayMinimumMaximum( bool theBool );
211+
//void setUserDefinedGrayMinimumMaximum( bool theBool ); //removed with raster redesign
212212

213213
/** \brief Mutator for mUserDefinedRGBMinimumMaximum */
214-
void setUserDefinedRGBMinimumMaximum( bool theBool );
214+
//void setUserDefinedRGBMinimumMaximum( bool theBool ); //removed with raster redesign
215215

216216
/**Set raster renderer. Takes ownership of the renderer object*/
217217
void setRenderer( QgsRasterRenderer* renderer );
@@ -221,7 +221,7 @@ public:
221221
double standardDeviations() const;
222222

223223
/** \brief Accessor for transparent band name mapping */
224-
QString transparentBandName() const;
224+
//QString transparentBandName() const; //removed with raster redesign
225225

226226
/** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data?
227227
* @deprecated in 2.0

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 42 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
186186
tabBar->setCurrentIndex( settings.value( "/Windows/RasterLayerProperties/row" ).toInt() );
187187

188188
setWindowTitle( tr( "Layer Properties - %1" ).arg( lyr->name() ) );
189-
int myHistogramTab = 6;
189+
int myHistogramTab = 5;
190190
if ( tabBar->currentIndex() == myHistogramTab )
191191
{
192192
refreshHistogram();
@@ -324,11 +324,8 @@ void QgsRasterLayerProperties::populateTransparencyTable()
324324
{
325325
return;
326326
}
327+
327328
const QgsRasterTransparency* rasterTransparency = renderer->rasterTransparency();
328-
if ( !rasterTransparency )
329-
{
330-
return;
331-
}
332329

333330
//Clear existing color transparency list
334331
//NOTE: May want to just tableTransparency->clearContents() and fill back in after checking to be sure list and table are the same size
@@ -349,19 +346,22 @@ void QgsRasterLayerProperties::populateTransparencyTable()
349346

350347

351348
//populate three band transparency list
352-
QList<QgsRasterTransparency::TransparentThreeValuePixel> myTransparentThreeValuePixelList = rasterTransparency->transparentThreeValuePixelList();
353-
for ( int myListRunner = 0; myListRunner < myTransparentThreeValuePixelList.count(); myListRunner++ )
349+
if ( rasterTransparency )
354350
{
355-
tableTransparency->insertRow( myListRunner );
356-
QTableWidgetItem* myRedItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%.2f", myTransparentThreeValuePixelList[myListRunner].red ) );
357-
QTableWidgetItem* myGreenItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%.2f", myTransparentThreeValuePixelList[myListRunner].green ) );
358-
QTableWidgetItem* myBlueItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%.2f", myTransparentThreeValuePixelList[myListRunner].blue ) );
359-
QTableWidgetItem* myPercentTransparentItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%.2f", myTransparentThreeValuePixelList[myListRunner].percentTransparent ) );
360-
361-
tableTransparency->setItem( myListRunner, 0, myRedItem );
362-
tableTransparency->setItem( myListRunner, 1, myGreenItem );
363-
tableTransparency->setItem( myListRunner, 2, myBlueItem );
364-
tableTransparency->setItem( myListRunner, 3, myPercentTransparentItem );
351+
QList<QgsRasterTransparency::TransparentThreeValuePixel> myTransparentThreeValuePixelList = rasterTransparency->transparentThreeValuePixelList();
352+
for ( int myListRunner = 0; myListRunner < myTransparentThreeValuePixelList.count(); myListRunner++ )
353+
{
354+
tableTransparency->insertRow( myListRunner );
355+
QTableWidgetItem* myRedItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%.2f", myTransparentThreeValuePixelList[myListRunner].red ) );
356+
QTableWidgetItem* myGreenItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%.2f", myTransparentThreeValuePixelList[myListRunner].green ) );
357+
QTableWidgetItem* myBlueItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%.2f", myTransparentThreeValuePixelList[myListRunner].blue ) );
358+
QTableWidgetItem* myPercentTransparentItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%.2f", myTransparentThreeValuePixelList[myListRunner].percentTransparent ) );
359+
360+
tableTransparency->setItem( myListRunner, 0, myRedItem );
361+
tableTransparency->setItem( myListRunner, 1, myGreenItem );
362+
tableTransparency->setItem( myListRunner, 2, myBlueItem );
363+
tableTransparency->setItem( myListRunner, 3, myPercentTransparentItem );
364+
}
365365
}
366366
}
367367
else if ( mRasterLayer->bandCount() == 1 )
@@ -388,15 +388,18 @@ void QgsRasterLayerProperties::populateTransparencyTable()
388388
tableTransparency->setHorizontalHeaderItem( 1, new QTableWidgetItem( tr( "Percent Transparent" ) ) );
389389

390390
//populate gray transparency list
391-
QList<QgsRasterTransparency::TransparentSingleValuePixel> myTransparentSingleValuePixelList = rasterTransparency->transparentSingleValuePixelList();
392-
for ( int myListRunner = 0; myListRunner < myTransparentSingleValuePixelList.count(); myListRunner++ )
391+
if ( rasterTransparency )
393392
{
394-
tableTransparency->insertRow( myListRunner );
395-
QTableWidgetItem* myGrayItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%g", myTransparentSingleValuePixelList[myListRunner].pixelValue ) );
396-
QTableWidgetItem* myPercentTransparentItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%.2f", myTransparentSingleValuePixelList[myListRunner].percentTransparent ) );
393+
QList<QgsRasterTransparency::TransparentSingleValuePixel> myTransparentSingleValuePixelList = rasterTransparency->transparentSingleValuePixelList();
394+
for ( int myListRunner = 0; myListRunner < myTransparentSingleValuePixelList.count(); myListRunner++ )
395+
{
396+
tableTransparency->insertRow( myListRunner );
397+
QTableWidgetItem* myGrayItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%g", myTransparentSingleValuePixelList[myListRunner].pixelValue ) );
398+
QTableWidgetItem* myPercentTransparentItem = new QTableWidgetItem( myNumberFormatter.sprintf( "%.2f", myTransparentSingleValuePixelList[myListRunner].percentTransparent ) );
397399

398-
tableTransparency->setItem( myListRunner, 0, myGrayItem );
399-
tableTransparency->setItem( myListRunner, 1, myPercentTransparentItem );
400+
tableTransparency->setItem( myListRunner, 0, myGrayItem );
401+
tableTransparency->setItem( myListRunner, 1, myPercentTransparentItem );
402+
}
400403
}
401404
}
402405

@@ -471,17 +474,18 @@ void QgsRasterLayerProperties::sync()
471474
sliderTransparency->setValue(( 1.0 - renderer->opacity() ) * 255 );
472475
//update the transparency percentage label
473476
sliderTransparency_valueChanged(( 1.0 - renderer->opacity() ) * 255 );
474-
}
475477

476-
int myIndex = cboxTransparencyBand->findText( mRasterLayer->transparentBandName() );
477-
if ( -1 != myIndex )
478-
{
479-
cboxTransparencyBand->setCurrentIndex( myIndex );
480-
}
481-
else
482-
{
483-
cboxTransparencyBand->setCurrentIndex( cboxTransparencyBand->findText( TRSTRING_NOT_SET ) );
478+
int myIndex = renderer->alphaBand();
479+
if ( -1 != myIndex )
480+
{
481+
cboxTransparencyBand->setCurrentIndex( myIndex );
482+
}
483+
else
484+
{
485+
cboxTransparencyBand->setCurrentIndex( cboxTransparencyBand->findText( TRSTRING_NOT_SET ) );
486+
}
484487
}
488+
485489
//add current NoDataValue to NoDataValue line edit
486490
if ( mRasterLayer->isNoDataValueValid() )
487491
{
@@ -543,12 +547,12 @@ void QgsRasterLayerProperties::sync()
543547
pixmapThumbnail->setPixmap( myQPixmap );
544548

545549
//update the legend pixmap on this dialog
546-
pixmapLegend->setPixmap( mRasterLayer->legendAsPixmap() );
550+
//pixmapLegend->setPixmap( mRasterLayer->legendAsPixmap() );
547551
pixmapLegend->setScaledContents( true );
548552
pixmapLegend->repaint();
549553

550554
//set the palette pixmap
551-
pixmapPalette->setPixmap( mRasterLayer->paletteAsPixmap( mRasterLayer->bandNumber( mRasterLayer->grayBandName() ) ) );
555+
//pixmapPalette->setPixmap( mRasterLayer->paletteAsPixmap( mRasterLayer->bandNumber( mRasterLayer->grayBandName() ) ) );
552556
pixmapPalette->setScaledContents( true );
553557
pixmapPalette->repaint();
554558

@@ -581,18 +585,6 @@ void QgsRasterLayerProperties::apply()
581585
//set whether the layer histogram should be inverted
582586
//mRasterLayer->setInvertHistogram( cboxInvertColorMap->isChecked() );
583587

584-
//now set the color -> band mapping combos to the correct values
585-
mRasterLayer->setTransparentBandName( cboxTransparencyBand->currentText() );
586-
587-
QSettings myQSettings;
588-
myQSettings.setValue( "/Raster/defaultRedBand", mDefaultRedBand );
589-
myQSettings.setValue( "/Raster/defaultGreenBand", mDefaultGreenBand );
590-
myQSettings.setValue( "/Raster/defaultBlueBand", mDefaultBlueBand );
591-
592-
myQSettings.setValue( "/Raster/defaultContrastEnhancementAlgorithm", mDefaultContrastEnhancementAlgorithm );
593-
594-
myQSettings.setValue( "/Raster/defaultStandardDeviation", mDefaultStandardDeviation );
595-
596588
QgsDebugMsg( "processing transparency tab" );
597589
/*
598590
* Transparent Pixel Tab
@@ -1111,7 +1103,7 @@ void QgsRasterLayerProperties::on_pbnExportTransparentPixelValues_clicked()
11111103

11121104
void QgsRasterLayerProperties::on_tabBar_currentChanged( int theTab )
11131105
{
1114-
int myHistogramTab = 6;
1106+
int myHistogramTab = 5;
11151107
if ( theTab == myHistogramTab )
11161108
{
11171109
refreshHistogram();
@@ -1361,6 +1353,7 @@ void QgsRasterLayerProperties::on_pbnRemoveSelectedRow_clicked()
13611353

13621354
void QgsRasterLayerProperties::pixelSelected( const QgsPoint& canvasPoint )
13631355
{
1356+
#if 0 //needs to be fixed
13641357
//PixelSelectorTool has registered a mouse click on the canvas, so bring the dialog back to the front
13651358
raise();
13661359
setModal( true );
@@ -1395,7 +1388,7 @@ void QgsRasterLayerProperties::pixelSelected( const QgsPoint& canvasPoint )
13951388
}
13961389
}
13971390
}
1398-
1391+
#endif //0
13991392
}
14001393

14011394
void QgsRasterLayerProperties::sliderTransparency_valueChanged( int theValue )

‎src/core/raster/qgsrasterlayer.cpp

Lines changed: 14 additions & 731 deletions
Large diffs are not rendered by default.

‎src/core/raster/qgsrasterlayer.h

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -310,12 +310,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
310310
/** \brief Accessor for drawing style */
311311
DrawingStyle drawingStyle() { return mDrawingStyle; }
312312

313-
/** \brief Accessor for gray band name mapping */
314-
QString grayBandName() const { return mGrayBandName; }
315-
316-
/** \brief Accessor for green band name mapping */
317-
QString greenBandName() const { return mGreenBandName; }
318-
319313
/** \brief Accessor for mHasPyramids (READ ONLY) */
320314
bool hasPyramids() { return mHasPyramids; }
321315

@@ -328,48 +322,21 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
328322
/** \brief Accessor that returns the height of the (unclipped) raster */
329323
int height() { return mHeight; }
330324

331-
/** \brief Accessor to find out whether the histogram should be inverted */
332-
bool invertHistogram() const { return mInvertColor; }
333-
334325
/** \brief Is the NoDataValue Valid */
335326
bool isNoDataValueValid() const { return mValidNoDataValue; }
336327

337-
/** \brief Accessor for mGrayMinimumMaximumEstimated */
338-
bool isGrayMinimumMaximumEstimated() const { return mGrayMinimumMaximumEstimated; }
339-
340-
/** \brief Accessor for mRGBMinimumMaximumEstimated */
341-
bool isRGBMinimumMaximumEstimated() const { return mRGBMinimumMaximumEstimated; }
342-
343328
/** \brief Accessor that returns the NO_DATA entry for this raster */
344329
double noDataValue( bool* isValid = 0 ) { if ( isValid ) { *isValid = mValidNoDataValue;} return mNoDataValue; }
345330

346-
/** \brief Returns a pointer to the transparency object */
347-
QgsRasterTransparency* rasterTransparency() { return &mRasterTransparency; }
348-
349-
/** \brief Accessor for raster shader */
350-
QgsRasterShader* rasterShader() { return mRasterShader; }
351-
352331
/** \brief Accessor for raster layer type (which is a read only property) */
353332
LayerType rasterType() { return mRasterType; }
354333

355-
/** \brief Accessor for red band name (allows alternate mappings e.g. map blue as red color) */
356-
QString redBandName() const { return mRedBandName; }
357-
358334

359335
/** \brief Mutator for drawing style */
360336
void setDrawingStyle( const DrawingStyle & theDrawingStyle ) { mDrawingStyle = theDrawingStyle; setRendererForDrawingStyle( theDrawingStyle ); }
361337
/**Sets corresponding renderer for style*/
362338
void setRendererForDrawingStyle( const DrawingStyle & theDrawingStyle );
363339

364-
/** \brief Mutator for mGrayMinimumMaximumEstimated */
365-
void setGrayMinimumMaximumEstimated( bool theBool ) { mGrayMinimumMaximumEstimated = theBool; }
366-
367-
/** \brief Mutator to alter the state of the invert histogram flag */
368-
void setInvertHistogram( bool theFlag ) { mInvertColor = theFlag; }
369-
370-
/** \brief Mutator for mRGBMinimumMaximumEstimated */
371-
void setRGBMinimumMaximumEstimated( bool theBool ) { mRGBMinimumMaximumEstimated = theBool; }
372-
373340
/** \brief Mutator to alter the number of standard deviations that should be plotted */
374341
void setStandardDeviations( double theStandardDeviations ) { mStandardDeviations = theStandardDeviations; }
375342

@@ -387,9 +354,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
387354
/** \brief Accessor to find out how many standard deviations are being plotted */
388355
double standardDeviations() const { return mStandardDeviations; }
389356

390-
/** \brief Accessor for transparent band name mapping */
391-
QString transparentBandName() const { return mTransparencyBandName; }
392-
393357
/** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data?
394358
* @deprecated in 2.0
395359
*/
@@ -681,9 +645,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
681645
/** \brief receive progress signal from provider */
682646
void onProgress( int, double, QString );
683647

684-
/** \brief Overload the setTransparency method from QgsMapLayer */
685-
void setTransparency( unsigned int theInt );
686-
687648
signals:
688649
/** \brief Signal for notifying listeners of long running processes */
689650
void progressUpdate( int theValue );
@@ -848,15 +809,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
848809
/** \brief Values for mapping pixel to world coordinates. Contents of this array are the same as the GDAL adfGeoTransform */
849810
double mGeoTransform[6];
850811

851-
/** \brief The band to be associated with the grayscale only output - usually 1 */
852-
QString mGrayBandName;
853-
854-
/** \brief Flag to indicate of the min max values are actual or estimates/user defined */
855-
bool mGrayMinimumMaximumEstimated;
856-
857-
/** \brief The band to be associated with the color green - usually 2 */
858-
QString mGreenBandName;
859-
860812
/** \brief Whether this raster has overviews / pyramids or not */
861813
bool mHasPyramids;
862814

@@ -866,9 +818,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
866818
/** \brief Raster height */
867819
int mHeight;
868820

869-
/** \brief Flag indicating whether the color of pixels should be inverted or not */
870-
bool mInvertColor;
871-
872821
/** [ data provider interface ] Timestamp, the last modified time of the data source when the layer was created */
873822
QDateTime mLastModified;
874823

@@ -889,26 +838,11 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
889838
/** \brief This list holds a series of RasterPyramid structs which store information for each potential pyramid level */
890839
RasterPyramidList mPyramidList;
891840

892-
/** \brief The raster shader for the layer */
893-
QgsRasterShader* mRasterShader;
894-
895841
/** \brief A collection of stats - one for each band in the layer */
896842
RasterStatsList mRasterStatsList;
897843

898-
/** \brief The transparency container */
899-
QgsRasterTransparency mRasterTransparency;
900-
901844
LayerType mRasterType;
902845

903-
/** \brief The band to be associated with the color red - usually 1 */
904-
QString mRedBandName;
905-
906-
/** \brief Flag to indicate of the min max values are actual or estimates/user defined */
907-
bool mRGBMinimumMaximumEstimated;
908-
909-
/** \brief The band to be associated with transparency */
910-
QString mTransparencyBandName;
911-
912846
/** \brief Flag to indicate if the user entered custom min max values */
913847
bool mUserDefinedGrayMinimumMaximum;
914848

‎src/core/raster/qgssinglebandgrayrenderer.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,17 @@ void QgsSingleBandGrayRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
122122
{
123123
grayVal = readValue( rasterData, rasterType, currentRasterPos );
124124

125+
//alpha
126+
currentAlpha = mOpacity;
127+
if ( mRasterTransparency )
128+
{
129+
currentAlpha = mRasterTransparency->alphaValue( grayVal, mOpacity * 255 ) / 255.0;
130+
}
131+
if ( mAlphaBand > 0 )
132+
{
133+
currentAlpha *= ( readValue( alphaData, alphaType, currentRasterPos ) / 255.0 );
134+
}
135+
125136
if ( mContrastEnhancement )
126137
{
127138
if ( !mContrastEnhancement->isValueInDisplayableRange( grayVal ) )
@@ -138,17 +149,6 @@ void QgsSingleBandGrayRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
138149
grayVal = 255 - grayVal;
139150
}
140151

141-
//alpha
142-
currentAlpha = mOpacity;
143-
if ( mRasterTransparency )
144-
{
145-
currentAlpha = mRasterTransparency->alphaValue( grayVal, mOpacity * 255 ) / 255.0;
146-
}
147-
if ( mAlphaBand > 0 )
148-
{
149-
currentAlpha *= ( readValue( alphaData, alphaType, currentRasterPos ) / 255.0 );
150-
}
151-
152152
if ( doubleNear( currentAlpha, 255 ) )
153153
{
154154
imageScanLine[j] = qRgba( grayVal, grayVal, grayVal, 255 );

‎src/mapserver/qgssldparser.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,8 @@ QgsFeatureRendererV2* QgsSLDParser::rendererFromUserStyle( const QDomElement& us
419419

420420
bool QgsSLDParser::rasterSymbologyFromUserStyle( const QDomElement& userStyleElement, QgsRasterLayer* r ) const
421421
{
422+
return false;
423+
#if 0 //needs to be fixed
422424
QgsDebugMsg( "Entering" );
423425
if ( !r )
424426
{
@@ -502,6 +504,7 @@ bool QgsSLDParser::rasterSymbologyFromUserStyle( const QDomElement& userStyleEle
502504

503505
//set pseudo color mode
504506
return true;
507+
#endif //0
505508
}
506509

507510
// ---------------labelSettingsFromUserStyle-----------------------

0 commit comments

Comments
 (0)
Please sign in to comment.