Skip to content

Commit

Permalink
Silence some debug
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Nov 29, 2022
1 parent aa590b7 commit 6f8bc19
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions src/gui/qgsrasterformatsaveoptionswidget.cpp
View file
Expand Up @@ -106,7 +106,7 @@ QgsRasterFormatSaveOptionsWidget::QgsRasterFormatSaveOptionsWidget( QWidget *par
updateControls();
updateProfiles();

QgsDebugMsg( QStringLiteral( "done" ) );
QgsDebugMsgLevel( QStringLiteral( "done" ), 3 );
}

void QgsRasterFormatSaveOptionsWidget::setFormat( const QString &format )
Expand Down Expand Up @@ -303,7 +303,7 @@ QString QgsRasterFormatSaveOptionsWidget::validateOptions( bool gui, bool report
const QStringList createOptions = options();
QString message;

QgsDebugMsg( QStringLiteral( "layer: [%1] file: [%2] format: [%3]" ).arg( mRasterLayer ? mRasterLayer->id() : "none", mRasterFileName, mFormat ) );
QgsDebugMsgLevel( QStringLiteral( "layer: [%1] file: [%2] format: [%3]" ).arg( mRasterLayer ? mRasterLayer->id() : "none", mRasterFileName, mFormat ), 2 );
// if no rasterLayer is defined, but we have a raster fileName, then create a temp. rasterLayer to validate options
// ideally we should keep it for future access, but this is trickier
QgsRasterLayer *rasterLayer = mRasterLayer;
Expand All @@ -320,7 +320,7 @@ QString QgsRasterFormatSaveOptionsWidget::validateOptions( bool gui, bool report
{
if ( rasterLayer && rasterLayer->dataProvider() )
{
QgsDebugMsg( QStringLiteral( "calling validate pyramids on layer's data provider" ) );
QgsDebugMsgLevel( QStringLiteral( "calling validate pyramids on layer's data provider" ), 2 );
message = rasterLayer->dataProvider()->validatePyramidsConfigOptions( mPyramidsFormat, createOptions, mFormat );
}
else
Expand All @@ -332,7 +332,7 @@ QString QgsRasterFormatSaveOptionsWidget::validateOptions( bool gui, bool report
{
if ( rasterLayer && rasterLayer->dataProvider() )
{
QgsDebugMsg( QStringLiteral( "calling validate on layer's data provider" ) );
QgsDebugMsgLevel( QStringLiteral( "calling validate on layer's data provider" ), 2 );
message = rasterLayer->dataProvider()->validateCreationOptions( createOptions, mFormat );
}
else
Expand Down Expand Up @@ -601,7 +601,7 @@ void QgsRasterFormatSaveOptionsWidget::showEvent( QShowEvent *event )
{
Q_UNUSED( event )
mOptionsTable->horizontalHeader()->resizeSection( 0, mOptionsTable->width() - 115 );
QgsDebugMsg( QStringLiteral( "done" ) );
QgsDebugMsgLevel( QStringLiteral( "done" ), 3 );
}

void QgsRasterFormatSaveOptionsWidget::setOptions( const QString &options )
Expand Down
12 changes: 6 additions & 6 deletions src/gui/raster/qgsrasterhistogramwidget.cpp
View file
Expand Up @@ -345,7 +345,7 @@ bool QgsRasterHistogramWidget::computeHistogram( bool forceComputeFlag )
const int binCount = getBinCount( mRasterLayer->dataProvider(), myIteratorInt, sampleSize );
if ( !mRasterLayer->dataProvider()->hasHistogram( myIteratorInt, binCount, std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(), QgsRectangle(), sampleSize ) )
{
QgsDebugMsg( QStringLiteral( "band %1 does not have cached histo" ).arg( myIteratorInt ) );
QgsDebugMsgLevel( QStringLiteral( "band %1 does not have cached histo" ).arg( myIteratorInt ), 2 );
return false;
}
}
Expand Down Expand Up @@ -391,7 +391,7 @@ void QgsRasterHistogramWidget::refreshHistogram()

if ( ! computeHistogram( false ) )
{
QgsDebugMsg( QStringLiteral( "raster does not have cached histogram" ) );
QgsDebugMsgLevel( QStringLiteral( "raster does not have cached histogram" ), 2 );
stackedWidget2->setCurrentIndex( 2 );
return;
}
Expand Down Expand Up @@ -537,7 +537,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
const int binCount = getBinCount( mRasterLayer->dataProvider(), bandNumber, sampleSize );
const QgsRasterHistogram myHistogram = mRasterLayer->dataProvider()->histogram( bandNumber, binCount, std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(), QgsRectangle(), sampleSize, false, feedback.get() );

QgsDebugMsg( QStringLiteral( "got raster histo for band %1 : min=%2 max=%3 count=%4" ).arg( bandNumber ).arg( myHistogram.minimum ).arg( myHistogram.maximum ).arg( myHistogram.binCount ) );
QgsDebugMsgLevel( QStringLiteral( "got raster histo for band %1 : min=%2 max=%3 count=%4" ).arg( bandNumber ).arg( myHistogram.minimum ).arg( myHistogram.maximum ).arg( myHistogram.binCount ), 2 );

const Qgis::DataType mySrcDataType = mRasterLayer->dataProvider()->sourceDataType( bandNumber );
bool myDrawLines = true;
Expand Down Expand Up @@ -609,7 +609,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
{
mHistoMax = myHistogram.maximum;
}
QgsDebugMsg( QStringLiteral( "computed histo min = %1 max = %2" ).arg( mHistoMin ).arg( mHistoMax ) );
QgsDebugMsgLevel( QStringLiteral( "computed histo min = %1 max = %2" ).arg( mHistoMin ).arg( mHistoMax ), 2 );
myFirstIteration = false;
}

Expand Down Expand Up @@ -760,7 +760,7 @@ void QgsRasterHistogramWidget::histoAction( const QString &actionName, bool acti
return;

// this approach is a bit of a hack, but this way we don't have to define slots for each action
QgsDebugMsg( QStringLiteral( "band = %1 action = %2" ).arg( cboHistoBand->currentIndex() + 1 ).arg( actionName ) );
QgsDebugMsgLevel( QStringLiteral( "band = %1 action = %2" ).arg( cboHistoBand->currentIndex() + 1 ).arg( actionName ), 2 );

// checkeable actions
if ( actionName == QLatin1String( "Show markers" ) )
Expand Down Expand Up @@ -1233,7 +1233,7 @@ QPair< QString, QString > QgsRasterHistogramWidget::rendererMinMax( int bandNo )
if ( myMinMax.second.isEmpty() )
myMinMax.second = QLocale().toString( mHistoMax );

QgsDebugMsg( QStringLiteral( "bandNo %1 got min/max [%2] [%3]" ).arg( bandNo ).arg( myMinMax.first, myMinMax.second ) );
QgsDebugMsgLevel( QStringLiteral( "bandNo %1 got min/max [%2] [%3]" ).arg( bandNo ).arg( myMinMax.first, myMinMax.second ), 2 );

return myMinMax;
}
Expand Down
12 changes: 6 additions & 6 deletions src/gui/raster/qgsrastertransparencywidget.cpp
View file
Expand Up @@ -161,7 +161,7 @@ void QgsRasterTransparencyWidget::syncToLayer()
}

const QgsRasterRangeList noDataRangeList = mRasterLayer->dataProvider()->userNoDataValues( 1 );
QgsDebugMsg( QStringLiteral( "noDataRangeList.size = %1" ).arg( noDataRangeList.size() ) );
QgsDebugMsgLevel( QStringLiteral( "noDataRangeList.size = %1" ).arg( noDataRangeList.size() ), 2 );
if ( !noDataRangeList.isEmpty() )
{
const double v = QgsRasterBlock::printValue( noDataRangeList.value( 0 ).min() ).toDouble();
Expand All @@ -181,7 +181,7 @@ void QgsRasterTransparencyWidget::syncToLayer()
void QgsRasterTransparencyWidget::transparencyCellTextEdited( const QString &text )
{
Q_UNUSED( text )
QgsDebugMsg( QStringLiteral( "text = %1" ).arg( text ) );
QgsDebugMsgLevel( QStringLiteral( "text = %1" ).arg( text ), 2 );
QgsRasterRenderer *renderer = mRasterLayer->renderer();
if ( !renderer )
{
Expand All @@ -207,14 +207,14 @@ void QgsRasterTransparencyWidget::transparencyCellTextEdited( const QString &tex
}
if ( row != -1 ) break;
}
QgsDebugMsg( QStringLiteral( "row = %1 column =%2" ).arg( row ).arg( column ) );
QgsDebugMsgLevel( QStringLiteral( "row = %1 column =%2" ).arg( row ).arg( column ), 2 );

if ( column == 0 )
{
QLineEdit *toLineEdit = dynamic_cast<QLineEdit *>( tableTransparency->cellWidget( row, 1 ) );
if ( !toLineEdit ) return;
const bool toChanged = mTransparencyToEdited.value( row );
QgsDebugMsg( QStringLiteral( "toChanged = %1" ).arg( toChanged ) );
QgsDebugMsgLevel( QStringLiteral( "toChanged = %1" ).arg( toChanged ), 2 );
if ( !toChanged )
{
toLineEdit->setText( lineEdit->text() );
Expand Down Expand Up @@ -587,7 +587,7 @@ void QgsRasterTransparencyWidget::pixelSelected( const QgsPointXY &canvasPoint )
return; // Don't add nodata, transparent anyway
}
const double value = myPixelMap.value( bandNo ).toDouble();
QgsDebugMsg( QStringLiteral( "value = %1" ).arg( value, 0, 'g', 17 ) );
QgsDebugMsgLevel( QStringLiteral( "value = %1" ).arg( value, 0, 'g', 17 ), 2 );
values.append( value );
}
}
Expand Down Expand Up @@ -703,7 +703,7 @@ void QgsRasterTransparencyWidget::setupTransparencyTable( int nBands )

void QgsRasterTransparencyWidget::setTransparencyCell( int row, int column, double value )
{
QgsDebugMsg( QStringLiteral( "value = %1" ).arg( value, 0, 'g', 17 ) );
QgsDebugMsgLevel( QStringLiteral( "value = %1" ).arg( value, 0, 'g', 17 ), 2 );
QgsRasterDataProvider *provider = mRasterLayer->dataProvider();
if ( !provider ) return;

Expand Down

0 comments on commit 6f8bc19

Please sign in to comment.