sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

-Prevent text from being entered in color cell in the color map tree

Browse Source 
-Stort / reload color map table on apply

git-svn-id: http://svn.osgeo.org/qgis/trunk@9284 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
ersts 2008-09-08 13:42:21 +00:00
parent 5638905dc0
commit a7847660d5
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/app/qgsrasterlayerproperties.cpp
View File

@ -1367,11 +1367,12 @@ void QgsRasterLayerProperties::apply()
if ( myRasterShaderFunction )
{
//iterate through mColormapTreeWidget and set colormap info of layer
QList<QgsColorRampShader::ColorRampItem> mColorRampItems;
QList<QgsColorRampShader::ColorRampItem> myColorRampItems;
bool inserted = false;
int myCurrentIndex = 0;
int myTopLevelItemCount = mColormapTreeWidget->topLevelItemCount();
QTreeWidgetItem* myCurrentItem;
for ( int i = 0; i < myTopLevelItemCount; ++i )
{
myCurrentItem = mColormapTreeWidget->topLevelItem( i );
@ -1383,9 +1384,33 @@ void QgsRasterLayerProperties::apply()
myNewColorRampItem.value = myCurrentItem->text( 0 ).toDouble();
myNewColorRampItem.color = myCurrentItem->background( 1 ).color();
myNewColorRampItem.label = myCurrentItem->text( 2 );
mColorRampItems.push_back( myNewColorRampItem );
//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 && 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++;
}
}
myRasterShaderFunction->setColorRampItemList( mColorRampItems );
myRasterShaderFunction->setColorRampItemList( myColorRampItems );
//Reload table in GUI because it may have been sorted or contained invalid values
populateColorMapTable( myColorRampItems );
if ( cboxColorInterpolation->currentText() == tr( "Linear" ) )
{
@ -2610,6 +2635,7 @@ void QgsRasterLayerProperties::handleColormapTreeWidgetDoubleClick( QTreeWidgetI
{
if ( column == 1 )
{
item->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
//show color dialog
QColor newColor = QColorDialog::getColor();
if ( newColor.isValid() )