fix colors for continuous classification with non equally spaced stops

qgis · Jun 2, 2016 · 589364746a02a97cbdcded29aa2a69dac9dce429 · 5893647
1 parent 912f06d
commit 589364746a02a97cbdcded29aa2a69dac9dce429
Showing 1 changed file with 90 additions and 84 deletions.
diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
@@ -383,123 +383,129 @@ void QgsSingleBandPseudoColorRendererWidget::on_mClassifyButton_clicked()
           entryValues.push_back( min + value * ( max - min ) );
         }
       }
+      // for continuous mode take original color map colors
+      for ( int i = 0; i < numberOfEntries; ++i )
+      {
+        entryColors.push_back( colorRamp->color( colorRamp->value( i ) ) );
+      }
     }
   }
-  else if ( mClassificationModeComboBox->itemData( mClassificationModeComboBox->currentIndex() ).toInt() == Quantile )
-  { // Quantile
+  else // for other classification modes interpolate colors linearly
+  {
     numberOfEntries = mNumberOfEntriesSpinBox->value();
 
-    int bandNr = mBandComboBox->itemData( bandComboIndex ).toInt();
-    //QgsRasterHistogram rasterHistogram = mRasterLayer->dataProvider()->histogram( bandNr );
+    if ( mClassificationModeComboBox->itemData( mClassificationModeComboBox->currentIndex() ).toInt() == Quantile )
+    { // Quantile
+      int bandNr = mBandComboBox->itemData( bandComboIndex ).toInt();
+      //QgsRasterHistogram rasterHistogram = mRasterLayer->dataProvider()->histogram( bandNr );
 
-    double cut1 = std::numeric_limits<double>::quiet_NaN();
-    double cut2 = std::numeric_limits<double>::quiet_NaN();
+      double cut1 = std::numeric_limits<double>::quiet_NaN();
+      double cut2 = std::numeric_limits<double>::quiet_NaN();
 
-    QgsRectangle extent = mMinMaxWidget->extent();
-    int sampleSize = mMinMaxWidget->sampleSize();
+      QgsRectangle extent = mMinMaxWidget->extent();
+      int sampleSize = mMinMaxWidget->sampleSize();
 
-    // set min and max from histogram, used later to calculate number of decimals to display
-    mRasterLayer->dataProvider()->cumulativeCut( bandNr, 0.0, 1.0, min, max, extent, sampleSize );
+      // set min and max from histogram, used later to calculate number of decimals to display
+      mRasterLayer->dataProvider()->cumulativeCut( bandNr, 0.0, 1.0, min, max, extent, sampleSize );
 
-    double intervalDiff;
-    if ( numberOfEntries > 1 )
-    {
-      entryValues.reserve( numberOfEntries );
-      if ( discrete )
+      double intervalDiff;
+      if ( numberOfEntries > 1 )
       {
-        intervalDiff = 1.0 / ( numberOfEntries );
-        for ( int i = 1; i < numberOfEntries; ++i )
+        entryValues.reserve( numberOfEntries );
+        if ( discrete )
         {
-          mRasterLayer->dataProvider()->cumulativeCut( bandNr, 0.0, i * intervalDiff, cut1, cut2, extent, sampleSize );
-          entryValues.push_back( cut2 );
+          intervalDiff = 1.0 / ( numberOfEntries );
+          for ( int i = 1; i < numberOfEntries; ++i )
+          {
+            mRasterLayer->dataProvider()->cumulativeCut( bandNr, 0.0, i * intervalDiff, cut1, cut2, extent, sampleSize );
+            entryValues.push_back( cut2 );
+          }
+          entryValues.push_back( std::numeric_limits<double>::infinity() );
         }
-        entryValues.push_back( std::numeric_limits<double>::infinity() );
-      }
-      else
-      {
-        intervalDiff = 1.0 / ( numberOfEntries - 1 );
-        for ( int i = 0; i < numberOfEntries; ++i )
+        else
         {
-          mRasterLayer->dataProvider()->cumulativeCut( bandNr, 0.0, i * intervalDiff, cut1, cut2, extent, sampleSize );
-          entryValues.push_back( cut2 );
+          intervalDiff = 1.0 / ( numberOfEntries - 1 );
+          for ( int i = 0; i < numberOfEntries; ++i )
+          {
+            mRasterLayer->dataProvider()->cumulativeCut( bandNr, 0.0, i * intervalDiff, cut1, cut2, extent, sampleSize );
+            entryValues.push_back( cut2 );
+          }
         }
       }
+      else if ( numberOfEntries == 1 )
+      {
+        mRasterLayer->dataProvider()->cumulativeCut( bandNr, 0.0, 0.5, cut1, cut2, extent, sampleSize );
+        entryValues.push_back( cut2 );
+      }
     }
-    else if ( numberOfEntries == 1 )
+    else // EqualInterval
     {
-      mRasterLayer->dataProvider()->cumulativeCut( bandNr, 0.0, 0.5, cut1, cut2, extent, sampleSize );
-      entryValues.push_back( cut2 );
-    }
-  }
-  else // EqualInterval
-  {
-    numberOfEntries = mNumberOfEntriesSpinBox->value();
-
-    if ( numberOfEntries > 1 )
-    {
-      entryValues.reserve( numberOfEntries );
-      if ( discrete )
+      if ( numberOfEntries > 1 )
       {
-        // in discrete mode the lowest value is not an entry and the highest
-        // value is inf, there are ( numberOfEntries ) of which the first
-        // and last are not used.
-        double intervalDiff = ( max - min ) / ( numberOfEntries );
+        entryValues.reserve( numberOfEntries );
+        if ( discrete )
+        {
+          // in discrete mode the lowest value is not an entry and the highest
+          // value is inf, there are ( numberOfEntries ) of which the first
+          // and last are not used.
+          double intervalDiff = ( max - min ) / ( numberOfEntries );
 
-        for ( int i = 1; i < numberOfEntries; ++i )
+          for ( int i = 1; i < numberOfEntries; ++i )
+          {
+            entryValues.push_back( min + i * intervalDiff );
+          }
+          entryValues.push_back( std::numeric_limits<double>::infinity() );
+        }
+        else
         {
-          entryValues.push_back( min + i * intervalDiff );
+          //because the highest value is also an entry, there are (numberOfEntries - 1) intervals
+          double intervalDiff = ( max - min ) / ( numberOfEntries - 1 );
+
+          for ( int i = 0; i < numberOfEntries; ++i )
+          {
+            entryValues.push_back( min + i * intervalDiff );
+          }
         }
-        entryValues.push_back( std::numeric_limits<double>::infinity() );
       }
-      else
+      else if ( numberOfEntries == 1 )
       {
-        //because the highest value is also an entry, there are (numberOfEntries - 1) intervals
-        double intervalDiff = ( max - min ) / ( numberOfEntries - 1 );
-
-        for ( int i = 0; i < numberOfEntries; ++i )
+        if ( discrete )
+        {
+          entryValues.push_back( std::numeric_limits<double>::infinity() );
+        }
+        else
         {
-          entryValues.push_back( min + i * intervalDiff );
+          entryValues.push_back(( max + min ) / 2 );
         }
       }
     }
-    else if ( numberOfEntries == 1 )
+
+    if ( ! colorRamp )
     {
-      if ( discrete )
+      //hard code color range from blue -> red (previous default)
+      int colorDiff = 0;
+      if ( numberOfEntries != 0 )
       {
-        entryValues.push_back( std::numeric_limits<double>::infinity() );
+        colorDiff = ( int )( 255 / numberOfEntries );
       }
-      else
+
+      entryColors.reserve( numberOfEntries );
+      for ( int i = 0; i < numberOfEntries; ++i )
       {
-        entryValues.push_back(( max + min ) / 2 );
+        QColor currentColor;
+        int idx = mInvertCheckBox->isChecked() ? numberOfEntries - i - 1 : i;
+        currentColor.setRgb( colorDiff*idx, 0, 255 - colorDiff * idx );
+        entryColors.push_back( currentColor );
       }
     }
-  }
-
-  if ( ! colorRamp )
-  {
-    //hard code color range from blue -> red (previous default)
-    int colorDiff = 0;
-    if ( numberOfEntries != 0 )
-    {
-      colorDiff = ( int )( 255 / numberOfEntries );
-    }
-
-    entryColors.reserve( numberOfEntries );
-    for ( int i = 0; i < numberOfEntries; ++i )
-    {
-      QColor currentColor;
-      int idx = mInvertCheckBox->isChecked() ? numberOfEntries - i - 1 : i;
-      currentColor.setRgb( colorDiff*idx, 0, 255 - colorDiff * idx );
-      entryColors.push_back( currentColor );
-    }
-  }
-  else
-  {
-    entryColors.reserve( numberOfEntries );
-    for ( int i = 0; i < numberOfEntries; ++i )
+    else
     {
-      int idx = mInvertCheckBox->isChecked() ? numberOfEntries - i - 1 : i;
-      entryColors.push_back( colorRamp->color((( double ) idx ) / ( numberOfEntries - 1 ) ) );
+      entryColors.reserve( numberOfEntries );
+      for ( int i = 0; i < numberOfEntries; ++i )
+      {
+        int idx = mInvertCheckBox->isChecked() ? numberOfEntries - i - 1 : i;
+        entryColors.push_back( colorRamp->color((( double ) idx ) / ( numberOfEntries - 1 ) ) );
+      }
     }
   }