Skip to content

Commit bac4fc8

Browse files
author
ersts
committed
-updated enums and respective functions to have undefined be initial value
-replaced some QT3 calls with QT4 calls in raster layer properties -updated python bindings git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8026 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b751ccd commit bac4fc8

File tree

4 files changed

+69
-66
lines changed

4 files changed

+69
-66
lines changed

‎python/core/qgsrasterlayer.sip‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ public:
286286
/** \brief This enumerator describes the types of shading that can be used. */
287287
enum COLOR_SHADING_ALGORITHM
288288
{
289+
UNDEFINED_SHADING_ALGORITHM,
289290
PSEUDO_COLOR,
290291
FREAK_OUT, //it will scare your granny!
291292
COLOR_RAMP,
@@ -315,6 +316,7 @@ public:
315316
/** \brief This enumerator describes the different kinds of drawing we can do. */
316317
enum DRAWING_STYLE
317318
{
319+
UNDEFINED_DRAWING_STYLE,
318320
SINGLE_BAND_GRAY, // a "Gray" or "Undefined" layer drawn as a range of gray colors
319321
SINGLE_BAND_PSEUDO_COLOR,// a "Gray" or "Undefined" layer drawn using a pseudocolor algorithm
320322
PALETTED_COLOR, //a "Palette" image drawn using color table

‎src/app/qgsrasterlayerproperties.cpp‎

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,16 @@ mRasterLayer( dynamic_cast<QgsRasterLayer*>(lyr) )
9595
spinMaximumScale->setValue((int)lyr->maxScale());
9696

9797
// build GUI components
98-
cboxColorMap->insertItem(tr("Grayscale"));
99-
cboxColorMap->insertItem(tr("Pseudocolor"));
100-
cboxColorMap->insertItem(tr("Freak Out"));
101-
cboxColorMap->insertItem(tr("Custom Colormap"));
98+
cboxColorMap->addItem(tr("Grayscale"));
99+
cboxColorMap->addItem(tr("Pseudocolor"));
100+
cboxColorMap->addItem(tr("Freak Out"));
101+
cboxColorMap->addItem(tr("Custom Colormap"));
102102

103103
//add items to the color stretch combo box
104-
cboxContrastEnhancementAlgorithm->insertItem(tr("No Stretch"));
105-
cboxContrastEnhancementAlgorithm->insertItem(tr("Stretch To MinMax"));
106-
cboxContrastEnhancementAlgorithm->insertItem(tr("Stretch And Clip To MinMax"));
107-
cboxContrastEnhancementAlgorithm->insertItem(tr("Clip To MinMax"));
104+
cboxContrastEnhancementAlgorithm->addItem(tr("No Stretch"));
105+
cboxContrastEnhancementAlgorithm->addItem(tr("Stretch To MinMax"));
106+
cboxContrastEnhancementAlgorithm->addItem(tr("Stretch And Clip To MinMax"));
107+
cboxContrastEnhancementAlgorithm->addItem(tr("Clip To MinMax"));
108108

109109
//set initial states of all Min Max and StdDev fields and labels to disabled
110110
sboxThreeBandStdDev->setEnabled(false);
@@ -129,10 +129,10 @@ mRasterLayer( dynamic_cast<QgsRasterLayer*>(lyr) )
129129
pbtnLoadMinMax->setEnabled(false);
130130

131131
//setup custom colormap tab
132-
cboxColorInterpolation->insertItem(-1, tr("Discrete"));
133-
cboxColorInterpolation->insertItem(-1, tr("Linearly"));
134-
cboxClassificationMode->insertItem(-1, tr("Equal interval"));
135-
cboxClassificationMode->insertItem(-1, tr("Quantiles"));
132+
cboxColorInterpolation->addItem(tr("Discrete"));
133+
cboxColorInterpolation->addItem(tr("Linearly"));
134+
cboxClassificationMode->addItem(tr("Equal interval"));
135+
cboxClassificationMode->addItem(tr("Quantiles"));
136136

137137
QStringList headerLabels;
138138
headerLabels << "Value";
@@ -150,26 +150,26 @@ mRasterLayer( dynamic_cast<QgsRasterLayer*>(lyr) )
150150
if (mRasterLayer->getRasterLayerType()
151151
== QgsRasterLayer::PALETTE) //paletted layers have hard coded color entries
152152
{
153-
cboRed->insertItem("Red");
154-
cboGreen->insertItem("Red");
155-
cboBlue->insertItem("Red");
153+
cboRed->addItem("Red");
154+
cboGreen->addItem("Red");
155+
cboBlue->addItem("Red");
156156

157-
cboRed->insertItem("Green");
158-
cboGreen->insertItem("Green");
159-
cboBlue->insertItem("Green");
157+
cboRed->addItem("Green");
158+
cboGreen->addItem("Green");
159+
cboBlue->addItem("Green");
160160

161-
cboRed->insertItem("Blue");
162-
cboGreen->insertItem("Blue");
163-
cboBlue->insertItem("Blue");
161+
cboRed->addItem("Blue");
162+
cboGreen->addItem("Blue");
163+
cboBlue->addItem("Blue");
164164

165-
cboRed->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
166-
cboGreen->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
167-
cboBlue->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
165+
cboRed->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
166+
cboGreen->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
167+
cboBlue->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
168168

169-
cboGray->insertItem("Red");
170-
cboGray->insertItem("Green");
171-
cboGray->insertItem("Blue");
172-
cboGray->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
169+
cboGray->addItem("Red");
170+
cboGray->addItem("Green");
171+
cboGray->addItem("Blue");
172+
cboGray->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
173173

174174
lstHistogramLabels->insertItem(tr("Palette"));
175175
}
@@ -263,41 +263,41 @@ mRasterLayer( dynamic_cast<QgsRasterLayer*>(lyr) )
263263
std::cout << "Inserting : " << myQString.toLocal8Bit().data() << std::endl;
264264
#endif
265265

266-
cboGray->insertItem(myQString);
267-
cboRed->insertItem(myQString);
268-
cboGreen->insertItem(myQString);
269-
cboBlue->insertItem(myQString);
266+
cboGray->addItem(myQString);
267+
cboRed->addItem(myQString);
268+
cboGreen->addItem(myQString);
269+
cboBlue->addItem(myQString);
270270
}
271271
//TODO: Need to handle situations where a band is set to Not Set, currently if you set a band to this it will segfault.
272-
cboRed->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
273-
cboGreen->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
274-
cboBlue->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
272+
cboRed->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
273+
cboGreen->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
274+
cboBlue->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
275275
if (cboGray->count() != 1)
276-
cboGray->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
276+
cboGray->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
277277
}
278278

279-
cboxTransparencyBand->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
280-
cboxTransparencyLayer->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
279+
cboxTransparencyBand->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
280+
cboxTransparencyLayer->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
281281
QMap<QString, QgsMapLayer *> myLayers = QgsMapLayerRegistry::instance()->mapLayers();
282282
QMap<QString, QgsMapLayer *>::iterator it;
283283
for(it = myLayers.begin(); it != myLayers.end(); it++)
284284
{
285285
if(QgsMapLayer::RASTER == it.value()->type())
286286
{
287-
cboxTransparencyLayer->insertItem(it.value()->name());
287+
cboxTransparencyLayer->addItem(it.value()->name());
288288
}
289289
}
290290

291291
QString myThemePath = QgsApplication::themePath();
292292
QPixmap myPyramidPixmap(myThemePath + "/mIconPyramid.png");
293293
QPixmap myNoPyramidPixmap(myThemePath + "/mIconNoPyramid.png");
294294

295-
pbnAddValuesManually->setIconSet(QIcon(QPixmap(myThemePath + "/mActionNewAttribute.png")));
296-
pbnAddValuesFromDisplay->setIconSet(QIcon(QPixmap(myThemePath + "/mActionContextHelp.png")));
297-
pbnRemoveSelectedRow->setIconSet(QIcon(QPixmap(myThemePath + "/mActionDeleteAttribute.png")));
298-
pbnDefaultValues->setIconSet(QIcon(QPixmap(myThemePath + "/mActionCopySelected.png")));
299-
pbnImportTransparentPixelValues->setIconSet(QIcon(QPixmap(myThemePath + "/mActionFileOpen.png")));
300-
pbnExportTransparentPixelValues->setIconSet(QIcon(QPixmap(myThemePath + "/mActionFileSave.png")));
295+
pbnAddValuesManually->setIcon(QIcon(QPixmap(myThemePath + "/mActionNewAttribute.png")));
296+
pbnAddValuesFromDisplay->setIcon(QIcon(QPixmap(myThemePath + "/mActionContextHelp.png")));
297+
pbnRemoveSelectedRow->setIcon(QIcon(QPixmap(myThemePath + "/mActionDeleteAttribute.png")));
298+
pbnDefaultValues->setIcon(QIcon(QPixmap(myThemePath + "/mActionCopySelected.png")));
299+
pbnImportTransparentPixelValues->setIcon(QIcon(QPixmap(myThemePath + "/mActionFileOpen.png")));
300+
pbnExportTransparentPixelValues->setIcon(QIcon(QPixmap(myThemePath + "/mActionFileSave.png")));
301301

302302
// Only do pyramids if dealing directly with GDAL.
303303
if (mRasterLayerIsGdal)
@@ -542,6 +542,7 @@ void QgsRasterLayerProperties::sync()
542542
if(mRasterLayerIsWms)
543543
{
544544
tabBar->setCurrentIndex(tabBar->indexOf(tabPageMetadata));
545+
tabBar->removeTab(tabBar->indexOf(tabPageColormap));
545546
tabBar->removeTab(tabBar->indexOf(tabPageSymbology));
546547
tabBar->removeTab(tabBar->indexOf(tabPageTransparency));
547548
tabBar->removeTab(tabBar->indexOf(tabPageHistogram));
@@ -1717,7 +1718,7 @@ void QgsRasterLayerProperties::on_cboxTransparencyLayer_currentIndexChanged(cons
17171718
if(theText == tr(QgsRasterLayer::QSTRING_NOT_SET))
17181719
{
17191720
cboxTransparencyBand->clear();
1720-
cboxTransparencyBand->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
1721+
cboxTransparencyBand->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
17211722
}
17221723
else
17231724
{
@@ -1730,10 +1731,10 @@ void QgsRasterLayerProperties::on_cboxTransparencyLayer_currentIndexChanged(cons
17301731
QgsRasterLayer* myRasterLayer = (QgsRasterLayer*)it.value();
17311732
int myBandCount = myRasterLayer->getBandCount();
17321733
cboxTransparencyBand->clear();
1733-
cboxTransparencyBand->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
1734+
cboxTransparencyBand->addItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
17341735
for(int bandRunner = 1; bandRunner <= myBandCount; bandRunner++)
17351736
{
1736-
cboxTransparencyBand->insertItem(myRasterLayer->getRasterBandName(bandRunner));
1737+
cboxTransparencyBand->addItem(myRasterLayer->getRasterBandName(bandRunner));
17371738
}
17381739
break;
17391740
}

‎src/core/raster/qgsrasterlayer.cpp‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ QString QgsRasterLayer::getDrawingStyleAsQString()
816816
break;
817817
}
818818

819-
return QString("INVALID_DRAWING_STYLE"); // XXX I hope this is ok to return
819+
return QString("UNDEFINED_DRAWING_STYLE");
820820

821821
}
822822

@@ -825,42 +825,38 @@ void QgsRasterLayer::setDrawingStyle(QString const & theDrawingStyleQString)
825825
if (theDrawingStyleQString == "SINGLE_BAND_GRAY")//no need to tr() this its not shown in ui
826826
{
827827
drawingStyle = SINGLE_BAND_GRAY;
828-
return;
829828
}
830-
if (theDrawingStyleQString == "SINGLE_BAND_PSEUDO_COLOR")//no need to tr() this its not shown in ui
829+
else if (theDrawingStyleQString == "SINGLE_BAND_PSEUDO_COLOR")//no need to tr() this its not shown in ui
831830
{
832831
drawingStyle = SINGLE_BAND_PSEUDO_COLOR;
833-
return;
834832
}
835-
if (theDrawingStyleQString == "PALETTED_SINGLE_BAND_GRAY")//no need to tr() this its not shown in ui
833+
else if (theDrawingStyleQString == "PALETTED_SINGLE_BAND_GRAY")//no need to tr() this its not shown in ui
836834
{
837835
drawingStyle = PALETTED_SINGLE_BAND_GRAY;
838-
return;
839836
}
840-
if (theDrawingStyleQString == "PALETTED_SINGLE_BAND_PSEUDO_COLOR")//no need to tr() this its not shown in ui
837+
else if (theDrawingStyleQString == "PALETTED_SINGLE_BAND_PSEUDO_COLOR")//no need to tr() this its not shown in ui
841838
{
842839
drawingStyle = PALETTED_SINGLE_BAND_PSEUDO_COLOR;
843-
return;
844840
}
845-
if (theDrawingStyleQString == "PALETTED_MULTI_BAND_COLOR")//no need to tr() this its not shown in ui
841+
else if (theDrawingStyleQString == "PALETTED_MULTI_BAND_COLOR")//no need to tr() this its not shown in ui
846842
{
847843
drawingStyle = PALETTED_MULTI_BAND_COLOR;
848-
return;
849844
}
850-
if (theDrawingStyleQString == "MULTI_BAND_SINGLE_BAND_GRAY")//no need to tr() this its not shown in ui
845+
else if (theDrawingStyleQString == "MULTI_BAND_SINGLE_BAND_GRAY")//no need to tr() this its not shown in ui
851846
{
852847
drawingStyle = MULTI_BAND_SINGLE_BAND_GRAY;
853-
return;
854848
}
855-
if (theDrawingStyleQString == "MULTI_BAND_SINGLE_BAND_PSEUDO_COLOR")//no need to tr() this its not shown in ui
849+
else if (theDrawingStyleQString == "MULTI_BAND_SINGLE_BAND_PSEUDO_COLOR")//no need to tr() this its not shown in ui
856850
{
857851
drawingStyle = MULTI_BAND_SINGLE_BAND_PSEUDO_COLOR;
858-
return;
859852
}
860-
if (theDrawingStyleQString == "MULTI_BAND_COLOR")//no need to tr() this its not shown in ui
853+
else if (theDrawingStyleQString == "MULTI_BAND_COLOR")//no need to tr() this its not shown in ui
861854
{
862855
drawingStyle = MULTI_BAND_COLOR;
863-
return;
856+
}
857+
else
858+
{
859+
drawingStyle = UNDEFINED_DRAWING_STYLE;
864860
}
865861
}
866862

@@ -5309,7 +5305,7 @@ QString QgsRasterLayer::getColorShadingAlgorithmAsQString()
53095305
break;
53105306
}
53115307

5312-
return QString("UNKNOWN");
5308+
return QString("UNDEFINED_SHADING_ALGORITHM");
53135309
}
53145310

53155311
void QgsRasterLayer::setColorShadingAlgorithm(QString theShaderAlgorithm)
@@ -5326,6 +5322,8 @@ void QgsRasterLayer::setColorShadingAlgorithm(QString theShaderAlgorithm)
53265322
setColorShadingAlgorithm(COLOR_RAMP);
53275323
else if(theShaderAlgorithm == "USER_DEFINED")
53285324
setColorShadingAlgorithm(USER_DEFINED);
5325+
else
5326+
setColorShadingAlgorithm(UNDEFINED_SHADING_ALGORITHM);
53295327
}
53305328

53315329
QString QgsRasterLayer::getContrastEnhancementAlgorithmAsQString()
@@ -5349,7 +5347,7 @@ QString QgsRasterLayer::getContrastEnhancementAlgorithmAsQString()
53495347
break;
53505348
}
53515349

5352-
return QString("UNKNOWN");
5350+
return QString("NO_STRETCH");
53535351
}
53545352

53555353
void QgsRasterLayer::setContrastEnhancementAlgorithm(QString theAlgorithm, bool theGenerateLookupTableFlag)

‎src/core/raster/qgsrasterlayer.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
580580
/** \brief This enumerator describes the types of shading that can be used. */
581581
enum COLOR_SHADING_ALGORITHM
582582
{
583+
UNDEFINED_SHADING_ALGORITHM,
583584
PSEUDO_COLOR,
584585
FREAK_OUT, //it will scare your granny!
585586
COLOR_RAMP,
@@ -629,6 +630,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
629630
/** \brief This enumerator describes the different kinds of drawing we can do. */
630631
enum DRAWING_STYLE
631632
{
633+
UNDEFINED_DRAWING_STYLE,
632634
SINGLE_BAND_GRAY, // a "Gray" or "Undefined" layer drawn as a range of gray colors
633635
SINGLE_BAND_PSEUDO_COLOR,// a "Gray" or "Undefined" layer drawn using a pseudocolor algorithm
634636
PALETTED_COLOR, //a "Palette" image drawn using color table

0 commit comments

Comments
 (0)