Updated the transparency widget to fix bug #16649 (#5358)

JamesShaeffer · nirvn · commit b740a89cba4d · 2017-10-13T11:20:23.000+07:00
diff --git a/src/gui/raster/qgsrastertransparencywidget.cpp b/src/gui/raster/qgsrastertransparencywidget.cpp
@@ -53,6 +53,8 @@ QgsRasterTransparencyWidget::QgsRasterTransparencyWidget( QgsRasterLayer *layer,
 
   connect( mOpacityWidget, &QgsOpacityWidget::opacityChanged, this, &QgsPanelWidget::widgetChanged );
   connect( cboxTransparencyBand, &QgsRasterBandComboBox::bandChanged, this, &QgsPanelWidget::widgetChanged );
+  connect( mSrcNoDataValueCheckBox, &QCheckBox::stateChanged, this, &QgsPanelWidget::widgetChanged );
+  connect( leNoDataValue, &QLineEdit::textEdited, this, &QgsPanelWidget::widgetChanged );
 
   mPixelSelectorTool = nullptr;
   if ( mMapCanvas )
@@ -103,6 +105,17 @@ void QgsRasterTransparencyWidget::syncToLayer()
   mSrcNoDataValueCheckBox->setEnabled( enableSrcNoData );
   lblSrcNoDataValue->setEnabled( enableSrcNoData );
 
+  QgsRasterRangeList noDataRangeList = mRasterLayer->dataProvider()->userNoDataValues( 1 );
+  QgsDebugMsg( QString( "noDataRangeList.size = %1" ).arg( noDataRangeList.size() ) );
+  if ( !noDataRangeList.isEmpty() )
+  {
+    leNoDataValue->insert( QgsRasterBlock::printValue( noDataRangeList.value( 0 ).min() ) );
+  }
+  else
+  {
+    leNoDataValue->insert( QLatin1String( "" ) );
+  }
+
   populateTransparencyTable( mRasterLayer->renderer() );
 }
 
@@ -366,6 +379,25 @@ bool QgsRasterTransparencyWidget::rasterIsMultiBandColor()
 
 void QgsRasterTransparencyWidget::apply()
 {
+  //set NoDataValue
+  QgsRasterRangeList myNoDataRangeList;
+  if ( "" != leNoDataValue->text() )
+  {
+    bool myDoubleOk = false;
+    double myNoDataValue = leNoDataValue->text().toDouble( &myDoubleOk );
+    if ( myDoubleOk )
+    {
+      QgsRasterRange myNoDataRange( myNoDataValue, myNoDataValue );
+      myNoDataRangeList << myNoDataRange;
+    }
+  }
+  for ( int bandNo = 1; bandNo <= mRasterLayer->dataProvider()->bandCount(); bandNo++ )
+  {
+    mRasterLayer->dataProvider()->setUserNoDataValue( bandNo, myNoDataRangeList );
+    mRasterLayer->dataProvider()->setUseSourceNoDataValue( bandNo, mSrcNoDataValueCheckBox->isChecked() );
+  }
+
+  //transparency settings
   QgsRasterRenderer *rasterRenderer = mRasterLayer->renderer();
   if ( rasterRenderer )
   {

-Original file line number
+Diff line change
   connect( mOpacityWidget, &QgsOpacityWidget::opacityChanged, this, &QgsPanelWidget::widgetChanged );
   connect( cboxTransparencyBand, &QgsRasterBandComboBox::bandChanged, this, &QgsPanelWidget::widgetChanged );
 +  connect( mSrcNoDataValueCheckBox, &QCheckBox::stateChanged, this, &QgsPanelWidget::widgetChanged );
 +  connect( leNoDataValue, &QLineEdit::textEdited, this, &QgsPanelWidget::widgetChanged );
   mPixelSelectorTool = nullptr;
   if ( mMapCanvas )
   mSrcNoDataValueCheckBox->setEnabled( enableSrcNoData );
   lblSrcNoDataValue->setEnabled( enableSrcNoData );
 +  QgsRasterRangeList noDataRangeList = mRasterLayer->dataProvider()->userNoDataValues( 1 );
 +  QgsDebugMsg( QString( "noDataRangeList.size = %1" ).arg( noDataRangeList.size() ) );
 +  if ( !noDataRangeList.isEmpty() )
 +  {
 +    leNoDataValue->insert( QgsRasterBlock::printValue( noDataRangeList.value( 0 ).min() ) );
 +  }
 +  else
 +  {
 +    leNoDataValue->insert( QLatin1String( "" ) );Collapse commentComment on line R116
Gustry commented on Oct 13, 2017 
Gustry
on Oct 13, 2017
Contributor
without double quotes?
Code has comments. Press enter to view.
 +  }
++
   populateTransparencyTable( mRasterLayer->renderer() );
+}
 void QgsRasterTransparencyWidget::apply()
+{
 +  //set NoDataValue
 +  QgsRasterRangeList myNoDataRangeList;Collapse commentComment on line R383
DelazJ commented on Oct 13, 2017 
DelazJ
on Oct 13, 2017
Contributor
@nirvn I might mix things but aren't we supposed to avoid these my... naming?
Code has comments. Press enter to view.
 +  if ( "" != leNoDataValue->text() )Collapse commentComment on line R384
Gustry commented on Oct 13, 2017 
Gustry
on Oct 13, 2017
Contributor
! leNoDataValue->text().isEmpty() ?
I'm just trying to apply what I learn from @nyalldawson ;-)
Code has comments. Press enter to view.
 +  {
 +    bool myDoubleOk = false;
 +    double myNoDataValue = leNoDataValue->text().toDouble( &myDoubleOk );
 +    if ( myDoubleOk )
 +    {
 +      QgsRasterRange myNoDataRange( myNoDataValue, myNoDataValue );
 +      myNoDataRangeList << myNoDataRange;
 +    }
 +  }
 +  for ( int bandNo = 1; bandNo <= mRasterLayer->dataProvider()->bandCount(); bandNo++ )
 +  {
 +    mRasterLayer->dataProvider()->setUserNoDataValue( bandNo, myNoDataRangeList );
 +    mRasterLayer->dataProvider()->setUseSourceNoDataValue( bandNo, mSrcNoDataValueCheckBox->isChecked() );
 +  }
++
 +  //transparency settings
   QgsRasterRenderer *rasterRenderer = mRasterLayer->renderer();
   if ( rasterRenderer )
+  {