[QGIS Commit] r9309 - in trunk/qgis/src: app core/raster
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Sep 12 16:29:55 EDT 2008
Author: timlinux
Date: 2008-09-12 16:29:55 -0400 (Fri, 12 Sep 2008)
New Revision: 9309
Modified:
trunk/qgis/src/app/qgsrasterlayerproperties.cpp
trunk/qgis/src/core/raster/qgsrasterlayer.cpp
trunk/qgis/src/core/raster/qgsrasterlayer.h
Log:
Remove debug overlay from api and code base
Modified: trunk/qgis/src/app/qgsrasterlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2008-09-12 19:57:38 UTC (rev 9308)
+++ trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2008-09-12 20:29:55 UTC (rev 9309)
@@ -1437,7 +1437,6 @@
*/
mRasterLayer->setLayerName( leDisplayName->text() );
- mRasterLayer->setShowDebugOverlayFlag( true );
// set up the scale based layer visibility stuff....
mRasterLayer->setScaleBasedVisibility( chkUseScaleDependentRendering->isChecked() );
Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2008-09-12 19:57:38 UTC (rev 9308)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2008-09-12 20:29:55 UTC (rev 9309)
@@ -310,7 +310,6 @@
TRSTRING_NOT_SET( tr( "Not Set" ) ),
mRasterXDim( std::numeric_limits<int>::max() ),
mRasterYDim( std::numeric_limits<int>::max() ),
- mDebugOverlayFlag( false ),
mInvertPixelsFlag( false ),
mStandardDeviations( 0 ),
mDataProvider( 0 )
@@ -1325,12 +1324,6 @@
}
- //see if debug info is wanted
- if ( mDebugOverlayFlag )
- {
- showDebugOverlay( theQPainter, theRasterViewPort );
- };
-
} //end of draw method
@@ -2035,38 +2028,7 @@
//return;
}
-/**
- Print some debug info to the qpainter
- */
-void QgsRasterLayer::showDebugOverlay( QPainter * theQPainter, QgsRasterViewPort * theRasterViewPort )
-{
-
-
- QFont myQFont( "arial", 10, QFont::Bold );
- theQPainter->setFont( myQFont );
- theQPainter->setPen( Qt::black );
- QBrush myQBrush( qRgba( 128, 128, 164, 50 ), Qt::Dense6Pattern ); //semi transparent
- theQPainter->setBrush( myQBrush ); // set the yellow brush
- theQPainter->drawRect( 5, 5, theQPainter->window().width() - 10, 60 );
- theQPainter->setBrush( Qt::NoBrush ); // do not fill
-
- theQPainter->drawText( 10, 20, "QPainter: "
- + QString::number( theQPainter->window().width() ) + " x " + QString::number( theQPainter->window().height() ) );
- theQPainter->drawText( 10, 32, tr( "Raster Extent: " )
- + QString::number( theRasterViewPort->drawableAreaXDim )
- + "," + QString::number( theRasterViewPort->drawableAreaYDim ) );
- theQPainter->drawText( 10, 44, tr( "Clipped area: " )
- + QString::number( theRasterViewPort->clippedXMin )
- + "," + QString::number( theRasterViewPort->clippedYMin )
- + " - " + QString::number( theRasterViewPort->clippedXMax )
- + "," + QString::number( theRasterViewPort->clippedYMin ) );
-
- return;
-
-
-} //end of main draw method
-
const QgsRasterBandStats QgsRasterLayer::getRasterBandStats( QString const & theBandName )
{
@@ -3834,7 +3796,6 @@
<zorder>0</zorder>
<transparencyLevelInt>255</transparencyLevelInt>
<rasterproperties>
- <mDebugOverlayFlag boolean="false"/>
<drawingStyle>SINGLE_BAND_GRAY</drawingStyle>
<mInvertPixelsFlag boolean="false"/>
<mStandardDeviations>0</mStandardDeviations>
@@ -3912,14 +3873,8 @@
}
QDomNode mnl = layer_node.namedItem( "rasterproperties" );
-
- QDomNode snode = mnl.namedItem( "mDebugOverlayFlag" );
+ QDomNode snode = mnl.namedItem( "drawingStyle" );
QDomElement myElement = snode.toElement();
- QVariant myQVariant = ( QVariant ) myElement.attribute( "boolean" );
- setShowDebugOverlayFlag( myQVariant.toBool() );
-
- snode = mnl.namedItem( "drawingStyle" );
- myElement = snode.toElement();
setDrawingStyle( myElement.text() );
snode = mnl.namedItem( "mColorShadingAlgorithm" );
@@ -3928,8 +3883,8 @@
snode = mnl.namedItem( "mInvertPixelsFlag" );
myElement = snode.toElement();
- myQVariant = ( QVariant ) myElement.attribute( "boolean" );
- setInvertHistogramFlag( myQVariant.toBool() );
+ QVariant myVariant = ( QVariant ) myElement.attribute( "boolean" );
+ setInvertHistogramFlag( myVariant.toBool() );
snode = mnl.namedItem( "mRedBandName" );
myElement = snode.toElement();
@@ -3954,23 +3909,23 @@
snode = mnl.namedItem( "mUserDefinedRGBMinMaxFlag" );
myElement = snode.toElement();
- myQVariant = ( QVariant ) myElement.attribute( "boolean" );
- setUserDefinedRGBMinMax( myQVariant.toBool() );
+ myVariant = ( QVariant ) myElement.attribute( "boolean" );
+ setUserDefinedRGBMinMax( myVariant.toBool() );
snode = mnl.namedItem( "mRGBActualMinimumMaximum" );
myElement = snode.toElement();
- myQVariant = ( QVariant ) myElement.attribute( "boolean" );
- setActualRGBMinMaxFlag( myQVariant.toBool() );
+ myVariant = ( QVariant ) myElement.attribute( "boolean" );
+ setActualRGBMinMaxFlag( myVariant.toBool() );
snode = mnl.namedItem( "mUserDefinedGrayMinMaxFlag" );
myElement = snode.toElement();
- myQVariant = ( QVariant ) myElement.attribute( "boolean" );
- setUserDefinedGrayMinMax( myQVariant.toBool() );
+ myVariant = ( QVariant ) myElement.attribute( "boolean" );
+ setUserDefinedGrayMinMax( myVariant.toBool() );
snode = mnl.namedItem( "mGrayActualMinimumMaximum" );
myElement = snode.toElement();
- myQVariant = ( QVariant ) myElement.attribute( "boolean" );
- setActualGrayMinMaxFlag( myQVariant.toBool() );
+ myVariant = ( QVariant ) myElement.attribute( "boolean" );
+ setActualGrayMinMaxFlag( myVariant.toBool() );
snode = mnl.namedItem( "mContrastEnhancementAlgorithm" );
myElement = snode.toElement();
@@ -4172,20 +4127,6 @@
}
- // <mDebugOverlayFlag>
- QDomElement mDebugOverlayFlagElement = document.createElement( "mDebugOverlayFlag" );
-
- if ( getShowDebugOverlayFlag() )
- {
- mDebugOverlayFlagElement.setAttribute( "boolean", "true" );
- }
- else
- {
- mDebugOverlayFlagElement.setAttribute( "boolean", "false" );
- }
-
- rasterPropertiesElement.appendChild( mDebugOverlayFlagElement );
-
// <drawingStyle>
QDomElement drawStyleElement = document.createElement( "drawingStyle" );
QDomText drawStyleText = document.createTextNode( getDrawingStyleAsQString() );
@@ -4610,7 +4551,6 @@
: QgsMapLayer( RASTER, baseName, rasterLayerPath ),
mRasterXDim( std::numeric_limits<int>::max() ),
mRasterYDim( std::numeric_limits<int>::max() ),
- mDebugOverlayFlag( false ),
mInvertPixelsFlag( false ),
mStandardDeviations( 0 ),
mProviderKey( providerKey ),
Modified: trunk/qgis/src/core/raster/qgsrasterlayer.h
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.h 2008-09-12 19:57:38 UTC (rev 9308)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.h 2008-09-12 20:29:55 UTC (rev 9309)
@@ -429,19 +429,6 @@
}
/** \brief Mutator for gray band name mapping. */
void setGrayBandName( const QString & theBandName );
- //
- // Accessor and mutator for mDebugOverlayFlag
- //
- /** \brief Accessor for a flag that determines whether to show some debug info on the image. */
- bool getShowDebugOverlayFlag()
- {
- return mDebugOverlayFlag;
- }
- /** \brief Mutator for a flag that determines whether to show some debug info on the image. */
- void setShowDebugOverlayFlag( bool theFlag )
- {
- mDebugOverlayFlag = theFlag;
- }
// Accessor and mutator for minimum maximum values
//TODO: Move these out of the header file...
@@ -912,8 +899,6 @@
//
// Private methods
//
- /** \brief Paint debug information onto the output image. */
- void showDebugOverlay( QPainter * theQPainter, QgsRasterViewPort * theRasterViewPort );
//
// Grayscale Imagery
@@ -1033,8 +1018,6 @@
double mNoDataValue;
/** \brief Flag indicating if the nodatavalue is valid*/
bool mValidNoDataValue;
- /** \brief Flag to indicate whether debug info overlay should be rendered onto the raster. */
- bool mDebugOverlayFlag;
/** \brief Pointer to the gdaldataset. */
GDALDatasetH mGdalBaseDataset;
/** \brief Pointer to the gdaldataset (possibly warped vrt). */
More information about the QGIS-commit
mailing list