Skip to content

Commit 4d9deca

Browse files
author
homann
committedJan 12, 2008
Use english for logical values of band names in project files. Use String comparision properly
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7943 c8812cc2-4d05-0410-92ff-de0c093fc19c

File tree

3 files changed

+103
-70
lines changed

3 files changed

+103
-70
lines changed
 

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,14 @@ rasterLayer( dynamic_cast<QgsRasterLayer*>(lyr) )
162162
cboGreen->insertItem("Blue");
163163
cboBlue->insertItem("Blue");
164164

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

169169
cboGray->insertItem("Red");
170170
cboGray->insertItem("Green");
171171
cboGray->insertItem("Blue");
172-
cboGray->insertItem(tr("Not Set"));
172+
cboGray->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
173173

174174
lstHistogramLabels->insertItem(tr("Palette"));
175175
}
@@ -269,15 +269,15 @@ rasterLayer( dynamic_cast<QgsRasterLayer*>(lyr) )
269269
cboBlue->insertItem(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("Not Set"));
273-
cboGreen->insertItem(tr("Not Set"));
274-
cboBlue->insertItem(tr("Not Set"));
272+
cboRed->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
273+
cboGreen->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
274+
cboBlue->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
275275
if (cboGray->count() != 1)
276-
cboGray->insertItem(tr("Not Set"));
276+
cboGray->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
277277
}
278278

279-
cboxTransparencyBand->insertItem(tr("Not Set"));
280-
cboxTransparencyLayer->insertItem(tr("Not Set"));
279+
cboxTransparencyBand->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
280+
cboxTransparencyLayer->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
281281
std::map<QString, QgsMapLayer *> myLayers = QgsMapLayerRegistry::instance()->mapLayers();
282282
std::map<QString, QgsMapLayer *>::iterator it;
283283
for(it = myLayers.begin(); it != myLayers.end(); it++)
@@ -599,22 +599,22 @@ void QgsRasterLayerProperties::sync()
599599
rbtnThreeBandMinMax->setChecked(false);
600600
}
601601

602-
if(QgsRasterLayer::PALETTED_COLOR != rasterLayer->getDrawingStyle() &&
602+
if(QgsRasterLayer::PALETTED_COLOR != rasterLayer->getDrawingStyle() &&
603603
QgsRasterLayer::PALETTED_SINGLE_BAND_GRAY != rasterLayer->getDrawingStyle() &&
604604
QgsRasterLayer::PALETTED_SINGLE_BAND_PSEUDO_COLOR != rasterLayer->getDrawingStyle() &&
605605
QgsRasterLayer::PALETTED_MULTI_BAND_COLOR != rasterLayer->getDrawingStyle())
606606
{
607-
if(rasterLayer->getRedBandName() != tr("Not Set"))
607+
if(rasterLayer->getRedBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
608608
{
609609
leRedMin->setText(QString::number(rasterLayer->getMinimumValue(rasterLayer->getRedBandName())));
610610
leRedMax->setText(QString::number(rasterLayer->getMaximumValue(rasterLayer->getRedBandName())));
611611
}
612-
if(rasterLayer->getGreenBandName() != tr("Not Set"))
612+
if(rasterLayer->getGreenBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
613613
{
614614
leGreenMin->setText(QString::number(rasterLayer->getMinimumValue(rasterLayer->getGreenBandName())));
615615
leGreenMax->setText(QString::number(rasterLayer->getMaximumValue(rasterLayer->getGreenBandName())));
616616
}
617-
if(rasterLayer->getBlueBandName() != tr("Not Set"))
617+
if(rasterLayer->getBlueBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
618618
{
619619
leBlueMin->setText(QString::number(rasterLayer->getMinimumValue(rasterLayer->getBlueBandName())));
620620
leBlueMax->setText(QString::number(rasterLayer->getMaximumValue(rasterLayer->getBlueBandName())));
@@ -641,7 +641,7 @@ if(QgsRasterLayer::PALETTED_COLOR != rasterLayer->getDrawingStyle() &&
641641
QgsRasterLayer::PALETTED_SINGLE_BAND_PSEUDO_COLOR != rasterLayer->getDrawingStyle() &&
642642
QgsRasterLayer::PALETTED_MULTI_BAND_COLOR != rasterLayer->getDrawingStyle())
643643
{
644-
if(rasterLayer->getGrayBandName() != tr("Not Set"))
644+
if(rasterLayer->getGrayBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
645645
{
646646
leGrayMin->setText(QString::number(rasterLayer->getMinimumValue(rasterLayer->getGrayBandName())));
647647
leGrayMax->setText(QString::number(rasterLayer->getMaximumValue(rasterLayer->getGrayBandName())));
@@ -685,7 +685,7 @@ if(QgsRasterLayer::PALETTED_COLOR != rasterLayer->getDrawingStyle() &&
685685
}
686686
else
687687
{
688-
cboxTransparencyLayer->setCurrentIndex(cboxTransparencyLayer->findText(tr("Not Set")));
688+
cboxTransparencyLayer->setCurrentIndex(cboxTransparencyLayer->findText(tr(QgsRasterLayer::QSTRING_NOT_SET)));
689689
}
690690

691691
myIndex = cboxTransparencyBand->findText(rasterLayer->getTransparentBandName());
@@ -695,7 +695,7 @@ if(QgsRasterLayer::PALETTED_COLOR != rasterLayer->getDrawingStyle() &&
695695
}
696696
else
697697
{
698-
cboxTransparencyBand->setCurrentIndex(cboxTransparencyBand->findText(tr("Not Set")));
698+
cboxTransparencyBand->setCurrentIndex(cboxTransparencyBand->findText(tr(QgsRasterLayer::QSTRING_NOT_SET)));
699699
}
700700
//add current NoDataValue to NoDataValue line edit
701701
if(rasterLayer->isNoDataValueValid())
@@ -1059,17 +1059,17 @@ void QgsRasterLayerProperties::apply()
10591059
//Set min max based on user defined values if all are set and stdDev is 0.0
10601060
if(rbtnThreeBandMinMax->isEnabled() && rbtnThreeBandMinMax->isChecked() && validUserDefinedMinMax())
10611061
{
1062-
if(rasterLayer->getRedBandName() != tr("Not Set"))
1062+
if(rasterLayer->getRedBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
10631063
{
10641064
rasterLayer->setMinimumValue(cboRed->currentText(), leRedMin->text().toDouble(), false);
10651065
rasterLayer->setMaximumValue(cboRed->currentText(), leRedMax->text().toDouble());
10661066
}
1067-
if(rasterLayer->getGreenBandName() != tr("Not Set"))
1067+
if(rasterLayer->getGreenBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
10681068
{
10691069
rasterLayer->setMinimumValue(cboGreen->currentText(), leGreenMin->text().toDouble(), false);
10701070
rasterLayer->setMaximumValue(cboGreen->currentText(), leGreenMax->text().toDouble());
10711071
}
1072-
if(rasterLayer->getBlueBandName() != tr("Not Set"))
1072+
if(rasterLayer->getBlueBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
10731073
{
10741074
rasterLayer->setMinimumValue(cboBlue->currentText(), leBlueMin->text().toDouble(), false);
10751075
rasterLayer->setMaximumValue(cboBlue->currentText(), leBlueMax->text().toDouble());
@@ -1093,7 +1093,7 @@ void QgsRasterLayerProperties::apply()
10931093
//Set min max based on user defined values if all are set and stdDev is 0.0
10941094
if(rbtnSingleBandMinMax->isEnabled() && rbtnSingleBandMinMax->isChecked() && validUserDefinedMinMax())
10951095
{
1096-
if(rasterLayer->getGrayBandName() != tr("Not Set"))
1096+
if(rasterLayer->getGrayBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
10971097
{
10981098
rasterLayer->setMinimumValue(cboGray->currentText(), leGrayMin->text().toDouble(), false);
10991099
rasterLayer->setMaximumValue(cboGray->currentText(), leGrayMax->text().toDouble());
@@ -1411,17 +1411,17 @@ void QgsRasterLayerProperties::apply()
14111411

14121412
if(rbtnThreeBandMinMax->isEnabled())
14131413
{
1414-
if(rasterLayer->getRedBandName() != tr("Not Set"))
1414+
if(rasterLayer->getRedBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
14151415
{
14161416
leRedMin->setText(QString::number(rasterLayer->getMinimumValue(rasterLayer->getRedBandName())));
14171417
leRedMax->setText(QString::number(rasterLayer->getMaximumValue(rasterLayer->getRedBandName())));
14181418
}
1419-
if(rasterLayer->getGreenBandName() != tr("Not Set"))
1419+
if(rasterLayer->getGreenBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
14201420
{
14211421
leGreenMin->setText(QString::number(rasterLayer->getMinimumValue(rasterLayer->getGreenBandName())));
14221422
leGreenMax->setText(QString::number(rasterLayer->getMaximumValue(rasterLayer->getGreenBandName())));
14231423
}
1424-
if(rasterLayer->getBlueBandName() != tr("Not Set"))
1424+
if(rasterLayer->getBlueBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
14251425
{
14261426
leBlueMin->setText(QString::number(rasterLayer->getMinimumValue(rasterLayer->getBlueBandName())));
14271427
leBlueMax->setText(QString::number(rasterLayer->getMaximumValue(rasterLayer->getBlueBandName())));
@@ -1437,7 +1437,7 @@ void QgsRasterLayerProperties::apply()
14371437

14381438
if(rbtnSingleBandMinMax->isEnabled())
14391439
{
1440-
if(rasterLayer->getGrayBandName() != tr("Not Set"))
1440+
if(rasterLayer->getGrayBandName() != tr(QgsRasterLayer::QSTRING_NOT_SET))
14411441
{
14421442
leGrayMin->setText(QString::number(rasterLayer->getMinimumValue(rasterLayer->getGrayBandName())));
14431443
leGrayMax->setText(QString::number(rasterLayer->getMaximumValue(rasterLayer->getGrayBandName())));
@@ -1549,7 +1549,7 @@ void QgsRasterLayerProperties::on_buttonBuildPyramids_clicked()
15491549

15501550
void QgsRasterLayerProperties::on_cboBlue_currentIndexChanged(const QString& theText)
15511551
{
1552-
if(tr("Not Set") != theText)
1552+
if(tr(QgsRasterLayer::QSTRING_NOT_SET) != theText)
15531553
{
15541554
leBlueMin->setText(QString::number(rasterLayer->getMinimumValue(theText)));
15551555
leBlueMax->setText(QString::number(rasterLayer->getMaximumValue(theText)));
@@ -1558,7 +1558,7 @@ void QgsRasterLayerProperties::on_cboBlue_currentIndexChanged(const QString& the
15581558

15591559
void QgsRasterLayerProperties::on_cboGray_currentIndexChanged(const QString& theText)
15601560
{
1561-
if(tr("Not Set") != theText)
1561+
if(tr(QgsRasterLayer::QSTRING_NOT_SET) != theText)
15621562
{
15631563
leGrayMin->setText(QString::number(rasterLayer->getMinimumValue(theText)));
15641564
leGrayMax->setText(QString::number(rasterLayer->getMaximumValue(theText)));
@@ -1567,7 +1567,7 @@ void QgsRasterLayerProperties::on_cboGray_currentIndexChanged(const QString& the
15671567

15681568
void QgsRasterLayerProperties::on_cboGreen_currentIndexChanged(const QString& theText)
15691569
{
1570-
if(tr("Not Set") != theText)
1570+
if(tr(QgsRasterLayer::QSTRING_NOT_SET) != theText)
15711571
{
15721572
leGreenMin->setText(QString::number(rasterLayer->getMinimumValue(theText)));
15731573
leGreenMax->setText(QString::number(rasterLayer->getMaximumValue(theText)));
@@ -1576,7 +1576,7 @@ void QgsRasterLayerProperties::on_cboGreen_currentIndexChanged(const QString& th
15761576

15771577
void QgsRasterLayerProperties::on_cboRed_currentIndexChanged(const QString& theText)
15781578
{
1579-
if(tr("Not Set") != theText)
1579+
if(tr(QgsRasterLayer::QSTRING_NOT_SET) != theText)
15801580
{
15811581
leRedMin->setText(QString::number(rasterLayer->getMinimumValue(theText)));
15821582
leRedMax->setText(QString::number(rasterLayer->getMaximumValue(theText)));
@@ -1659,10 +1659,10 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged(const QString
16591659

16601660
void QgsRasterLayerProperties::on_cboxTransparencyLayer_currentIndexChanged(const QString& theText)
16611661
{
1662-
if(theText == tr("Not Set"))
1662+
if(theText == tr(QgsRasterLayer::QSTRING_NOT_SET))
16631663
{
16641664
cboxTransparencyBand->clear();
1665-
cboxTransparencyBand->insertItem(tr("Not Set"));
1665+
cboxTransparencyBand->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
16661666
}
16671667
else
16681668
{
@@ -1675,7 +1675,7 @@ void QgsRasterLayerProperties::on_cboxTransparencyLayer_currentIndexChanged(cons
16751675
QgsRasterLayer* myRasterLayer = (QgsRasterLayer*)it->second;
16761676
int myBandCount = myRasterLayer->getBandCount();
16771677
cboxTransparencyBand->clear();
1678-
cboxTransparencyBand->insertItem(tr("Not Set"));
1678+
cboxTransparencyBand->insertItem(tr(QgsRasterLayer::QSTRING_NOT_SET));
16791679
for(int bandRunner = 1; bandRunner <= myBandCount; bandRunner++)
16801680
{
16811681
cboxTransparencyBand->insertItem(myRasterLayer->getRasterBandName(bandRunner));
@@ -2376,7 +2376,7 @@ void QgsRasterLayerProperties::on_rbtnSingleBand_toggled(bool b)
23762376
// Populate transparency table with single value transparency pixels
23772377
populateTransparencyTable();
23782378
// If no band is selected but there are multiple bands, selcet the first as the default
2379-
if(cboGray->currentText() == tr("Not Set") && 1 < cboGray->count())
2379+
if(cboGray->currentText() == tr(QgsRasterLayer::QSTRING_NOT_SET) && 1 < cboGray->count())
23802380
{
23812381
cboGray->setCurrentIndex(0);
23822382
}

‎src/core/raster/qgsrasterlayer.cpp

Lines changed: 68 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ static const char *const mSupportedRasterFormats[] =
103103
};
104104

105105

106+
// Constant that signals property not used.
107+
const QString QgsRasterLayer::QSTRING_NOT_SET = QString("Not Set");
106108

107109
/**
108110
Builds the list of file filter strings to later be used by
@@ -598,8 +600,8 @@ bool QgsRasterLayer::readFile( QString const & fileName )
598600
mRedBandName = "Red"; // sensible default
599601
mGreenBandName = "Green"; // sensible default
600602
mBlueBandName = "Blue";// sensible default
601-
mTransparencyBandName = tr("Not Set"); // sensible default
602-
mGrayBandName = tr("Not Set"); //sensible default
603+
mTransparencyBandName = tr(QSTRING_NOT_SET); // sensible default
604+
mGrayBandName = tr(QSTRING_NOT_SET); //sensible default
603605
drawingStyle = PALETTED_MULTI_BAND_COLOR; //sensible default
604606
}
605607
else if (rasterLayerType == MULTIBAND)
@@ -614,7 +616,7 @@ bool QgsRasterLayer::readFile( QString const & fileName )
614616
}
615617
else
616618
{
617-
mBlueBandName = tr("Not Set"); // sensible default
619+
mBlueBandName = tr(QSTRING_NOT_SET); // sensible default
618620
}
619621

620622
//Beacuse the transparent band can be set from a different layer defaulting to the fourth
@@ -624,18 +626,18 @@ bool QgsRasterLayer::readFile( QString const & fileName )
624626
mTransparencyBandName = getRasterBandName(4);
625627
else
626628
*/
627-
mTransparencyBandName = tr("Not Set");
629+
mTransparencyBandName = tr(QSTRING_NOT_SET);
628630

629-
mGrayBandName = tr("Not Set"); //sensible default
631+
mGrayBandName = tr(QSTRING_NOT_SET); //sensible default
630632
drawingStyle = MULTI_BAND_COLOR; //sensible default
631633
}
632634
else //GRAY_OR_UNDEFINED
633635
{
634636
getRasterBandStats(1);
635-
mRedBandName = tr("Not Set"); //sensible default
636-
mGreenBandName = tr("Not Set"); //sensible default
637-
mBlueBandName = tr("Not Set"); //sensible default
638-
mTransparencyBandName = tr("Not Set"); //sensible default
637+
mRedBandName = tr(QSTRING_NOT_SET); //sensible default
638+
mGreenBandName = tr(QSTRING_NOT_SET); //sensible default
639+
mBlueBandName = tr(QSTRING_NOT_SET); //sensible default
640+
mTransparencyBandName = tr(QSTRING_NOT_SET); //sensible default
639641
drawingStyle = SINGLE_BAND_GRAY; //sensible default
640642
mGrayBandName = getRasterBandName(1); // usually gdal will return gray or undefined
641643
}
@@ -1291,7 +1293,7 @@ void QgsRasterLayer::draw (QPainter * theQPainter,
12911293
// a "Gray" or "Undefined" layer drawn as a range of gray colors
12921294
case SINGLE_BAND_GRAY:
12931295
//check the band is set!
1294-
if (mGrayBandName == tr("Not Set"))
1296+
if (mGrayBandName == tr(QSTRING_NOT_SET))
12951297
{
12961298
break;
12971299
}
@@ -1304,7 +1306,7 @@ void QgsRasterLayer::draw (QPainter * theQPainter,
13041306
// a "Gray" or "Undefined" layer drawn using a pseudocolor algorithm
13051307
case SINGLE_BAND_PSEUDO_COLOR:
13061308
//check the band is set!
1307-
if (mGrayBandName == tr("Not Set"))
1309+
if (mGrayBandName == tr(QSTRING_NOT_SET))
13081310
{
13091311
break;
13101312
}
@@ -1317,7 +1319,7 @@ void QgsRasterLayer::draw (QPainter * theQPainter,
13171319
// a "Palette" layer drawn in gray scale (using only one of the color components)
13181320
case PALETTED_SINGLE_BAND_GRAY:
13191321
//check the band is set!
1320-
if (mGrayBandName == tr("Not Set"))
1322+
if (mGrayBandName == tr(QSTRING_NOT_SET))
13211323
{
13221324
break;
13231325
}
@@ -1334,7 +1336,7 @@ void QgsRasterLayer::draw (QPainter * theQPainter,
13341336
// a "Palette" layer having only one of its color components rendered as psuedo color
13351337
case PALETTED_SINGLE_BAND_PSEUDO_COLOR:
13361338
//check the band is set!
1337-
if (mGrayBandName == tr("Not Set"))
1339+
if (mGrayBandName == tr(QSTRING_NOT_SET))
13381340
{
13391341
break;
13401342
}
@@ -1355,7 +1357,7 @@ void QgsRasterLayer::draw (QPainter * theQPainter,
13551357
case MULTI_BAND_SINGLE_BAND_GRAY:
13561358
QgsDebugMsg("MULTI_BAND_SINGLE_BAND_GRAY drawing type detected...");
13571359
//check the band is set!
1358-
if (mGrayBandName == tr("Not Set"))
1360+
if (mGrayBandName == tr(QSTRING_NOT_SET))
13591361
{
13601362
QgsDebugMsg("MULTI_BAND_SINGLE_BAND_GRAY Not Set detected..." + mGrayBandName);
13611363
break;
@@ -1371,7 +1373,7 @@ void QgsRasterLayer::draw (QPainter * theQPainter,
13711373
//a layer containing 2 or more bands, but using only one band to produce a pseudocolor image
13721374
case MULTI_BAND_SINGLE_BAND_PSEUDO_COLOR:
13731375
//check the band is set!
1374-
if (mGrayBandName == tr("Not Set"))
1376+
if (mGrayBandName == tr(QSTRING_NOT_SET))
13751377
{
13761378
break;
13771379
}
@@ -1386,9 +1388,9 @@ void QgsRasterLayer::draw (QPainter * theQPainter,
13861388
//In the case of a multiband with only two bands,
13871389
//one band will have to be mapped to more than one color
13881390
case MULTI_BAND_COLOR:
1389-
if(mRedBandName == tr("Not Set") ||
1390-
mGreenBandName == tr("Not Set") ||
1391-
mBlueBandName == tr("Not Set"))
1391+
if(mRedBandName == tr(QSTRING_NOT_SET) ||
1392+
mGreenBandName == tr(QSTRING_NOT_SET) ||
1393+
mBlueBandName == tr(QSTRING_NOT_SET))
13921394
{
13931395
break;
13941396
}
@@ -2621,9 +2623,10 @@ void QgsRasterLayer::setRedBandName(QString const & theBandNameQString)
26212623
{
26222624
QgsDebugMsg("setRedBandName : " + theBandNameQString);
26232625
//check if the band is unset
2624-
if (theBandNameQString == tr("Not Set"))
2626+
if (theBandNameQString == tr(QSTRING_NOT_SET) || theBandNameQString == QSTRING_NOT_SET )
26252627
{
2626-
mRedBandName = theBandNameQString;
2628+
// Use translated name internally
2629+
mRedBandName = tr(QSTRING_NOT_SET);
26272630
return;
26282631
}
26292632
//check if the image is paletted
@@ -2646,7 +2649,7 @@ void QgsRasterLayer::setRedBandName(QString const & theBandNameQString)
26462649
}
26472650

26482651
//if no matches were found default to not set
2649-
mRedBandName = tr("Not Set");
2652+
mRedBandName = tr(QSTRING_NOT_SET);
26502653
return;
26512654
}
26522655

@@ -2656,9 +2659,10 @@ void QgsRasterLayer::setRedBandName(QString const & theBandNameQString)
26562659
void QgsRasterLayer::setGreenBandName(QString const & theBandNameQString)
26572660
{
26582661
//check if the band is unset
2659-
if (theBandNameQString == tr("Not Set"))
2662+
if (theBandNameQString == tr(QSTRING_NOT_SET) || theBandNameQString == QSTRING_NOT_SET )
26602663
{
2661-
mGreenBandName = theBandNameQString;
2664+
// Use translated name internally
2665+
mGreenBandName = tr(QSTRING_NOT_SET);
26622666
return;
26632667
}
26642668
//check if the image is paletted
@@ -2681,17 +2685,18 @@ void QgsRasterLayer::setGreenBandName(QString const & theBandNameQString)
26812685
}
26822686

26832687
//if no matches were found default to not set
2684-
mGreenBandName = tr("Not Set");
2688+
mGreenBandName = tr(QSTRING_NOT_SET);
26852689
return;
26862690
}
26872691

26882692
//mutator for blue band name
26892693
void QgsRasterLayer::setBlueBandName(QString const & theBandNameQString)
26902694
{
26912695
//check if the band is unset
2692-
if (theBandNameQString == tr("Not Set"))
2696+
if (theBandNameQString == tr(QSTRING_NOT_SET) || theBandNameQString == QSTRING_NOT_SET)
26932697
{
2694-
mBlueBandName = theBandNameQString;
2698+
// Use translated name internally
2699+
mBlueBandName = tr(QSTRING_NOT_SET);
26952700
return;
26962701
}
26972702
//check if the image is paletted
@@ -2714,15 +2719,15 @@ void QgsRasterLayer::setBlueBandName(QString const & theBandNameQString)
27142719
}
27152720

27162721
//if no matches were found default to not set
2717-
mBlueBandName = tr("Not Set");
2722+
mBlueBandName = tr(QSTRING_NOT_SET);
27182723
return;
27192724
}
27202725

27212726
//mutator for transparent band name
27222727
void QgsRasterLayer::setTransparentBandName(QString const & theBandNameQString)
27232728
{
27242729
//check if the band is unset
2725-
if (theBandNameQString == tr("Not Set"))
2730+
if (theBandNameQString == tr(QSTRING_NOT_SET))
27262731
{
27272732
mTransparencyBandName = theBandNameQString;
27282733
return;
@@ -2747,7 +2752,7 @@ void QgsRasterLayer::setTransparentBandName(QString const & theBandNameQString)
27472752
}
27482753

27492754
//if no matches were found default to not set
2750-
mTransparencyBandName = tr("Not Set");
2755+
mTransparencyBandName = tr(QSTRING_NOT_SET);
27512756
return;
27522757
}
27532758

@@ -2756,9 +2761,10 @@ void QgsRasterLayer::setTransparentBandName(QString const & theBandNameQString)
27562761
void QgsRasterLayer::setGrayBandName(QString const & theBandNameQString)
27572762
{
27582763
//check if the band is unset
2759-
if (theBandNameQString == tr("Not Set"))
2764+
if (theBandNameQString == tr(QSTRING_NOT_SET) || theBandNameQString == QSTRING_NOT_SET )
27602765
{
2761-
mGrayBandName = theBandNameQString;
2766+
// Use translated name internally
2767+
mGrayBandName = tr(QSTRING_NOT_SET);
27622768
return;
27632769
}
27642770
//check if the image is paletted
@@ -2783,7 +2789,7 @@ void QgsRasterLayer::setGrayBandName(QString const & theBandNameQString)
27832789
}
27842790

27852791
//if no matches were found default to not set
2786-
mGrayBandName = tr("Not Set");
2792+
mGrayBandName = tr(QSTRING_NOT_SET);
27872793
return;
27882794
}
27892795

@@ -4253,8 +4259,9 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node )
42534259
snode = mnl.namedItem("mNoDataValue");
42544260
myElement = snode.toElement();
42554261
setNoDataValue(myElement.text().toDouble());
4256-
if(myElement.attribute("mValidNoDataValue", "false") != "true")
4262+
if( myElement.attribute("mValidNoDataValue", "false").compare("true") )
42574263
{
4264+
// If flag element is not true, set to false.
42584265
mValidNoDataValue = false;
42594266
}
42604267

@@ -4496,7 +4503,13 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node )
44964503

44974504
// <mRedBandName>
44984505
QDomElement mRedBandNameElement = document.createElement( "mRedBandName" );
4499-
QDomText mRedBandNameText = document.createTextNode( getRedBandName() );
4506+
QString writtenRedBandName = getRedBandName();
4507+
if ( writtenRedBandName == tr(QSTRING_NOT_SET) )
4508+
{
4509+
// Write english "not set" only.
4510+
writtenRedBandName = QSTRING_NOT_SET;
4511+
}
4512+
QDomText mRedBandNameText = document.createTextNode( writtenRedBandName );
45004513

45014514
mRedBandNameElement.appendChild( mRedBandNameText );
45024515

@@ -4505,7 +4518,13 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node )
45054518

45064519
// <mGreenBandName>
45074520
QDomElement mGreenBandNameElement = document.createElement( "mGreenBandName" );
4508-
QDomText mGreenBandNameText = document.createTextNode( getGreenBandName() );
4521+
QString writtenGreenBandName = getGreenBandName();
4522+
if ( writtenGreenBandName == tr(QSTRING_NOT_SET) )
4523+
{
4524+
// Write english "not set" only.
4525+
writtenGreenBandName = QSTRING_NOT_SET;
4526+
}
4527+
QDomText mGreenBandNameText = document.createTextNode( writtenGreenBandName );
45094528

45104529
mGreenBandNameElement.appendChild( mGreenBandNameText );
45114530

@@ -4514,7 +4533,13 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node )
45144533

45154534
// <mBlueBandName>
45164535
QDomElement mBlueBandNameElement = document.createElement( "mBlueBandName" );
4517-
QDomText mBlueBandNameText = document.createTextNode( getBlueBandName() );
4536+
QString writtenBlueBandName = getBlueBandName();
4537+
if ( writtenBlueBandName == tr(QSTRING_NOT_SET) )
4538+
{
4539+
// Write english "not set" only.
4540+
writtenBlueBandName = QSTRING_NOT_SET;
4541+
}
4542+
QDomText mBlueBandNameText = document.createTextNode( writtenBlueBandName );
45184543

45194544
mBlueBandNameElement.appendChild( mBlueBandNameText );
45204545

@@ -4523,7 +4548,13 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node )
45234548

45244549
// <mGrayBandName>
45254550
QDomElement mGrayBandNameElement = document.createElement( "mGrayBandName" );
4526-
QDomText mGrayBandNameText = document.createTextNode( getGrayBandName() );
4551+
QString writtenGrayBandName = getGrayBandName();
4552+
if ( writtenGrayBandName == tr(QSTRING_NOT_SET) )
4553+
{
4554+
// Write english "not set" only.
4555+
writtenGrayBandName = QSTRING_NOT_SET;
4556+
}
4557+
QDomText mGrayBandNameText = document.createTextNode( writtenGrayBandName );
45274558

45284559
mGrayBandNameElement.appendChild( mGrayBandNameText );
45294560
rasterPropertiesElement.appendChild( mGrayBandNameElement );

‎src/core/raster/qgsrasterlayer.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
181181
{
182182
Q_OBJECT
183183
public:
184+
// Static constant defining flag for XML
185+
static const QString QSTRING_NOT_SET;
184186

185187
//
186188
// Static methods:

0 commit comments

Comments
 (0)
Please sign in to comment.