Remove the broken, unused QgsPseudoColorShader class

qgis · Jul 26, 2016 · ba26bc8 · ba26bc8
1 parent 156c098
commit ba26bc8
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 216 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -27,6 +27,7 @@ This page tries to maintain a list with incompatible changes that happened in pr
 <li>QgsCRSCache was removed. QgsCoordinateReferenceSystem now internally uses a cache for CRS creation,
 so there is no longer a need for the separate cache class. Code which previously called QgsCRSCache::updateCRSCache()
 should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinateTransformCache::instance()->invalidateCrs( authid ).</li>
+<li>QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.</li>
 </ul>
 
 \subsection qgis_api_break_3_0_global General changes

diff --git a/python/core/core.sip b/python/core/core.sip
@@ -256,7 +256,6 @@
 %Include raster/qgslinearminmaxenhancementwithclip.sip
 %Include raster/qgsmultibandcolorrenderer.sip
 %Include raster/qgspalettedrasterrenderer.sip
-%Include raster/qgspseudocolorshader.sip
 %Include raster/qgsraster.sip
 %Include raster/qgsrasterbandstats.sip
 %Include raster/qgsrasterblock.sip

diff --git a/python/core/raster/qgspseudocolorshader.sip b/python/core/raster/qgspseudocolorshader.sip
diff --git a/python/core/raster/qgsrastershaderfunction.sip b/python/core/raster/qgsrastershaderfunction.sip
@@ -3,14 +3,11 @@ class QgsRasterShaderFunction
 %TypeHeaderCode
 #include <qgsrastershaderfunction.h>
 #include <qgscolorrampshader.h>
-#include <qgspseudocolorshader.h>
 %End
 
 %ConvertToSubClassCode
   if (dynamic_cast<QgsColorRampShader*>(sipCpp) != NULL)
     sipType = sipType_QgsColorRampShader;
-  else if (dynamic_cast<QgsPseudoColorShader*>(sipCpp) != NULL)
-    sipType = sipType_QgsPseudoColorShader;
   else
     sipType = 0;
 %End

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -298,7 +298,6 @@ SET(QGIS_CORE_SRCS
   raster/qgscontrastenhancementfunction.cpp
   raster/qgslinearminmaxenhancement.cpp
   raster/qgslinearminmaxenhancementwithclip.cpp
-  raster/qgspseudocolorshader.cpp
   raster/qgsraster.cpp
   raster/qgsrasterblock.cpp
   raster/qgsrasterchecker.cpp
@@ -779,7 +778,6 @@ SET(QGIS_CORE_HDRS
   raster/qgslinearminmaxenhancementwithclip.h
   raster/qgsmultibandcolorrenderer.h
   raster/qgspalettedrasterrenderer.h
-  raster/qgspseudocolorshader.h
   raster/qgsraster.h
   raster/qgsrasterbandstats.h
   raster/qgsrasterblock.h

diff --git a/src/core/raster/qgspseudocolorshader.cpp b/src/core/raster/qgspseudocolorshader.cpp
diff --git a/src/core/raster/qgspseudocolorshader.h b/src/core/raster/qgspseudocolorshader.h
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -31,7 +31,6 @@ email                : tim at linfiniti.com
 #include "qgspalettedrasterrenderer.h"
 #include "qgsprojectfiletransform.h"
 #include "qgsproviderregistry.h"
-#include "qgspseudocolorshader.h"
 #include "qgsrasterdataprovider.h"
 #include "qgsrasterdrawer.h"
 #include "qgsrasteriterator.h"

diff --git a/tests/src/python/acceptable_missing_doc.py b/tests/src/python/acceptable_missing_doc.py
@@ -305,7 +305,6 @@
     "QgsScaleVisibilityDialog": ["QgsScaleVisibilityDialog(QWidget *parent=nullptr, const QString &title=QString(), QgsMapCanvas *mapCanvas=nullptr)"],
     "QgsGraduatedSymbolRendererV2": ["scaleMethod() const ", "QgsGraduatedSymbolRendererV2(const QString &attrName=QString(), const QgsRangeList &ranges=QgsRangeList())", "updateRangeUpperValue(int rangeIndex, double value)", "sortByValue(Qt::SortOrder order=Qt::AscendingOrder)", "createRenderer(QgsVectorLayer *vlayer, const QString &attrName, int classes, Mode mode, QgsSymbolV2 *symbol, QgsVectorColorRampV2 *ramp, bool inverted=false, const QgsRendererRangeV2LabelFormat &legendFormat=QgsRendererRangeV2LabelFormat())", "addClass(QgsSymbolV2 *symbol)", "setInvertedColorRamp(bool inverted)", "setMode(Mode mode)", "updateRangeSymbol(int rangeIndex, QgsSymbolV2 *symbol)", "setSizeScaleField(const QString &fieldOrExpression)", "updateRangeLowerValue(int rangeIndex, double value)", "GraduatedMethod", "deleteClass(int idx)", "deleteAllClasses()", "Mode", "setClassAttribute(const QString &attr)", "sortByLabel(Qt::SortOrder order=Qt::AscendingOrder)", "symbolForValue(double value)", "setScaleMethod(QgsSymbolV2::ScaleMethod scaleMethod)", "updateRangeLabel(int rangeIndex, const QString &label)", "ranges() const ", "mode() const ", "sizeScaleField() const ", "classAttribute() const "],
     "QgsPaintEffectWidget": ["QgsPaintEffectWidget(QWidget *parent=nullptr)"],
-    "QgsPseudoColorShader": ["QgsPseudoColorShader(double theMinimumValue=0.0, double theMaximumValue=255.0)", "classBreakMax2() const ", "classBreakMin2() const ", "classBreakMin3() const ", "classBreakMax1() const ", "classBreakMin1() const "],
     "QgsDetailedItemDelegate": ["QgsDetailedItemDelegate(QObject *parent=nullptr)", "horizontalSpacing() const ", "setHorizontalSpacing(int theValue)", "setVerticalSpacing(int theValue)", "verticalSpacing() const "],
     "FieldSorter": ["FieldSorter(QgsAtlasComposition::SorterKeys &keys, bool ascending=true)", "operator()(const QPair< QgsFeatureId, QString > &id1, const QPair< QgsFeatureId, QString > &id2)"],
     "QgsMessageLogConsole": ["logMessage(const QString &message, const QString &tag, QgsMessageLog::MessageLevel level)"],
@@ -937,7 +936,6 @@
     "QgsVectorLayerUndoCommandAddFeature",
     "QgsAuthConfigEditor",
     "QgsCharacterSelectorDialog",
-    "QgsPseudoColorShader",
     "QgsSpatialIndex",
     "QgsAbstractFeatureIterator",
     "QgsMapCanvasMap",