Reverting class editor patch

qgis · Sep 24, 2014 · c309a31 · c309a31
1 parent 5d18a2e
commit c309a31
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 339 deletions.
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -18,7 +18,6 @@ symbology-ng/qgssymbollayerv2widget.cpp
 symbology-ng/qgsrendererv2widget.cpp
 symbology-ng/qgssinglesymbolrendererv2widget.cpp
 symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
-symbology-ng/qgsgraduatedrendererclasseditor.cpp
 symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
 symbology-ng/qgsrulebasedrendererv2widget.cpp
 symbology-ng/qgsinvertedpolygonrendererwidget.cpp
@@ -246,7 +245,6 @@ symbology-ng/qgssymbollayerv2widget.h
 symbology-ng/qgssinglesymbolrendererv2widget.h
 symbology-ng/qgscategorizedsymbolrendererv2widget.h
 symbology-ng/qgsdatadefinedsymboldialog.h
-symbology-ng/qgsgraduatedrendererclasseditor.h
 symbology-ng/qgsgraduatedsymbolrendererv2widget.h
 symbology-ng/qgsrulebasedrendererv2widget.h
 symbology-ng/qgsinvertedpolygonrendererwidget.h

diff --git a/src/gui/symbology-ng/qgsgraduatedrendererclasseditor.cpp b/src/gui/symbology-ng/qgsgraduatedrendererclasseditor.cpp
diff --git a/src/gui/symbology-ng/qgsgraduatedrendererclasseditor.h b/src/gui/symbology-ng/qgsgraduatedrendererclasseditor.h
diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
@@ -25,7 +25,6 @@
 #include "qgsexpressionbuilderdialog.h"
 
 #include "qgsludialog.h"
-#include "qgsgraduatedrendererclasseditor.h"
 
 #include "qgsproject.h"
 
@@ -552,8 +551,6 @@ void QgsGraduatedSymbolRendererV2Widget::classifyGraduated()
     mode = QgsGraduatedSymbolRendererV2::StdDev;
   else if ( cboGraduatedMode->currentIndex() == 4 )
     mode = QgsGraduatedSymbolRendererV2::Pretty;
-  else if ( cboGraduatedMode->currentIndex() == 5)
-    mode = QgsGraduatedSymbolRendererV2::Custom;
   else // default should be quantile for now
     mode = QgsGraduatedSymbolRendererV2::Quantile;
 
@@ -571,27 +568,13 @@ void QgsGraduatedSymbolRendererV2Widget::classifyGraduated()
   mRenderer->setClassAttribute(attrName);
   mRenderer->setMode(mode);
   bool updateUiCount=true;
-  if( mode == QgsGraduatedSymbolRendererV2::Custom )
-  {
-    QgsGraduatedRendererClassEditor dialog( this );
-    dialog.setRendererAndLayer(mRenderer,mLayer);
-    if ( dialog.exec() != QDialog::Accepted )
-    {
-      return;
-    }
-    mRenderer->updateColorRamp();
-    mRenderer->calculateDecimalPlaces();
-  }
-  else
-  {
-    QApplication::setOverrideCursor( Qt::WaitCursor );
-    mRenderer->updateClasses(mLayer,mode,nclasses);
-    mRenderer->calculateDecimalPlaces();
-    QApplication::restoreOverrideCursor();
-    // PrettyBreaks and StdDev calculation don't generate exact
-    // number of classes - leave user interface unchanged for these
-    updateUiCount=false;
-  }
+  QApplication::setOverrideCursor( Qt::WaitCursor );
+  mRenderer->updateClasses(mLayer,mode,nclasses);
+  mRenderer->calculateDecimalPlaces();
+  QApplication::restoreOverrideCursor();
+  // PrettyBreaks and StdDev calculation don't generate exact
+  // number of classes - leave user interface unchanged for these
+  updateUiCount=false;
   updateUiFromRenderer( updateUiCount );
 }
 

diff --git a/src/ui/qgsgraduatedsymbolrendererv2widget.ui b/src/ui/qgsgraduatedsymbolrendererv2widget.ui
@@ -69,11 +69,6 @@
          <string>Pretty Breaks</string>
         </property>
        </item>
-       <item>
-        <property name="text">
-         <string>Manual Breaks</string>
-        </property>
-       </item>
       </widget>
      </item>
      <item row="5" column="0">