use QgsTreeWidgetItem also for sorting color map items

pierstitus · nyalldawson · commit e5ab7ca2e0de · 2016-06-02T15:01:02.000+10:00
quicker and less code, so enable automatic sorting after every edit
diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
@@ -39,6 +39,13 @@ void QgsTreeWidgetItem::setData( int column, int role, const QVariant & value )
   }
 }
 
+// override < operator to allow sorting
+bool QgsTreeWidgetItem::operator<( const QTreeWidgetItem & other ) const
+{
+  // could use treeWidget()->sortColumn() instead of 0
+  return text( 0 ).toDouble() < other.text( 0 ).toDouble();
+}
+
 QgsSingleBandPseudoColorRendererWidget::QgsSingleBandPseudoColorRendererWidget( QgsRasterLayer* layer, const QgsRectangle &extent )
     : QgsRasterRendererWidget( layer, extent )
     , mMinMaxWidget( nullptr )
@@ -223,6 +230,7 @@ void QgsSingleBandPseudoColorRendererWidget::on_mAddEntryButton_clicked()
   newItem->setText( 2, "" );
   connect( newItem, SIGNAL( itemEdited( QTreeWidgetItem*, int ) ),
            this, SLOT( mColormapTreeWidget_itemEdited( QTreeWidgetItem*, int ) ) );
+  mColormapTreeWidget->sortItems( 0, Qt::AscendingOrder );
   autoLabel();
   emit widgetChanged();
 }
@@ -243,56 +251,7 @@ void QgsSingleBandPseudoColorRendererWidget::on_mNumberOfEntriesSpinBox_valueCha
 
 void QgsSingleBandPseudoColorRendererWidget::on_mSortButton_clicked()
 {
-  bool inserted = false;
-  int myCurrentIndex = 0;
-  int myTopLevelItemCount = mColormapTreeWidget->topLevelItemCount();
-  QTreeWidgetItem* myCurrentItem;
-  QList<QgsColorRampShader::ColorRampItem> myColorRampItems;
-  for ( int i = 0; i < myTopLevelItemCount; ++i )
-  {
-    myCurrentItem = mColormapTreeWidget->topLevelItem( i );
-    //If the item is null or does not have a pixel values set, skip
-    if ( !myCurrentItem || myCurrentItem->text( 0 ) == "" )
-    {
-      continue;
-    }
-
-    //Create a copy of the new Color ramp Item
-    QgsColorRampShader::ColorRampItem myNewColorRampItem;
-    myNewColorRampItem.value = myCurrentItem->text( 0 ).toDouble();
-    myNewColorRampItem.color = myCurrentItem->background( 1 ).color();
-    myNewColorRampItem.label = myCurrentItem->text( 2 );
-
-    //Simple insertion sort - speed is not a huge factor here
-    inserted = false;
-    myCurrentIndex = 0;
-    while ( !inserted )
-    {
-      if ( 0 == myColorRampItems.size() || myCurrentIndex == myColorRampItems.size() )
-      {
-        myColorRampItems.push_back( myNewColorRampItem );
-        inserted = true;
-      }
-      else if ( myColorRampItems[myCurrentIndex].value > myNewColorRampItem.value )
-      {
-        myColorRampItems.insert( myCurrentIndex, myNewColorRampItem );
-        inserted = true;
-      }
-      else if ( myColorRampItems[myCurrentIndex].value <= myNewColorRampItem.value  && myCurrentIndex == myColorRampItems.size() - 1 )
-      {
-        myColorRampItems.push_back( myNewColorRampItem );
-        inserted = true;
-      }
-      else if ( myColorRampItems[myCurrentIndex].value <= myNewColorRampItem.value && myColorRampItems[myCurrentIndex+1].value > myNewColorRampItem.value )
-      {
-        myColorRampItems.insert( myCurrentIndex + 1, myNewColorRampItem );
-        inserted = true;
-      }
-      myCurrentIndex++;
-    }
-  }
-  populateColormapTreeWidget( myColorRampItems );
-  emit widgetChanged();
+  mColormapTreeWidget->sortItems( 0, Qt::AscendingOrder );
 }
 
 void QgsSingleBandPseudoColorRendererWidget::on_mClassifyButton_clicked()
@@ -672,6 +631,7 @@ void QgsSingleBandPseudoColorRendererWidget::mColormapTreeWidget_itemEdited( QTr
 
   if ( column == 0 ) // item value edited
   {
+    mColormapTreeWidget->sortItems( 0, Qt::AscendingOrder );
     autoLabel();
   }
   else if ( column == 2 ) // item label edited
diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.h b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
@@ -87,6 +87,7 @@ class QgsTreeWidgetItem: public QObject, public QTreeWidgetItem
 
   public:
     virtual void setData( int column, int role, const QVariant & value );
+    virtual bool operator< ( const QTreeWidgetItem & other ) const;
 
   signals:
     void itemEdited( QTreeWidgetItem* item, int column );
