Skip to content

Commit

Permalink
-Removed some unneeded code for a freature that will not be in 1.0
Browse files Browse the repository at this point in the history 
-Added flags to indicate if min max values are actual computed values or estimates/userdefined
-Implemented the min/max estimate warning on gui

git-svn-id: http://svn.osgeo.org/qgis/trunk@8629 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
ersts committed Jun 9, 2008
1 parent 03fbf87 commit c5d01dc
Show file tree
Hide file tree
Showing 6 changed files with 199 additions and 180 deletions.
14 changes: 3 additions & 11 deletions python/core/qgsrasterlayer.sip
View file
Expand Up @@ -207,14 +207,6 @@ public:

/** \brief Mutator for transparent band name mapping. */
void setTransparentBandName(const QString & theBandNameQString);
//
// Accessor and mutator for transparent band name
//
/** \brief Accessor for transparent band name mapping. */
QString getTransparentLayerName();

/** \brief Mutator for transparent band name mapping. */
void setTransparentLayerName(const QString & theLayerNameQString);

//
// Accessor and mutator for gray band name
Expand Down Expand Up @@ -450,13 +442,13 @@ public:
/** \brief Mutator for mUserDefinedRGBMinMaxFlag */
void setUserDefinedRGBMinMax(bool theBool);

/** \brief Accessor for userDefinedMinMax. */
/** \brief Accessor for mUserDefinedRGBMinMaxFlag. */
bool getUserDefinedRGBMinMax();

/** \brief Mutator for mUserDefinedRGBMinMaxFlag */
/** \brief Mutator for mUserDefinedGrayMinMaxFlag */
void setUserDefinedGrayMinMax(bool theBool);

/** \brief Accessor for userDefinedMinMax. */
/** \brief Accessor for mUserDefinedGrayMinMaxFlag. */
bool getUserDefinedGrayMinMax();

public slots:
Expand Down
133 changes: 62 additions & 71 deletions src/app/qgsrasterlayerproperties.cpp
View file
Expand Up @@ -56,7 +56,9 @@ QgsRasterLayerProperties::QgsRasterLayerProperties(QgsMapLayer *lyr, QWidget *pa
TRSTRING_NOT_SET( tr("Not Set"))
{
ignoreSpinBoxEvent = false; //Short circuit signal loop between min max field and stdDev spin box

mGrayActualMinimumMaximum = false;
mRGBActualMinimumMaximum = false;

if (mRasterLayer->getDataProvider() == 0)
{
// This is a GDAL-based layer
Expand Down Expand Up @@ -277,16 +279,6 @@ QgsRasterLayerProperties::QgsRasterLayerProperties(QgsMapLayer *lyr, QWidget *pa
}

cboxTransparencyBand->addItem(TRSTRING_NOT_SET);
cboxTransparencyLayer->addItem(TRSTRING_NOT_SET);
QMap<QString, QgsMapLayer *> myLayers = QgsMapLayerRegistry::instance()->mapLayers();
QMap<QString, QgsMapLayer *>::iterator it;
for(it = myLayers.begin(); it != myLayers.end(); it++)
{
if(QgsMapLayer::RASTER == it.value()->type())
{
cboxTransparencyLayer->addItem(it.value()->name());
}
}

QString myThemePath = QgsApplication::themePath();
QPixmap myPyramidPixmap(myThemePath + "/mIconPyramid.png");
Expand Down Expand Up @@ -438,6 +430,29 @@ void QgsRasterLayerProperties::populateTransparencyTable()
tableTransparency->resizeRowsToContents();
}

/** Set the message indicating if any min max values are estimates */
void QgsRasterLayerProperties::setMinimumMaximumEstimateWarning()
{
bool myActualComputedValues = false;
if(rbtnThreeBand->isChecked())
{
myActualComputedValues = mRGBActualMinimumMaximum;
}
else
{
myActualComputedValues = mGrayActualMinimumMaximum;
}

if(myActualComputedValues)
{
lblMinMaxEstimateWarning->setText("Note: Minimum Maximum values are actual values computed from the band(s)");
}
else
{
lblMinMaxEstimateWarning->setText("Note: Minimum Maximum values are estimates or user defined");
}
}

/**
@note moved from ctor
Expand Down Expand Up @@ -584,24 +599,24 @@ void QgsRasterLayerProperties::sync()
{
if(mRasterLayer->getColorShadingAlgorithm()==QgsRasterLayer::PSEUDO_COLOR)
{
cboxColorMap->setCurrentText(tr("Pseudocolor"));
cboxColorMap->setCurrentIndex(cboxColorMap->findText(tr("Pseudocolor")));
}
else if(mRasterLayer->getColorShadingAlgorithm()==QgsRasterLayer::FREAK_OUT)
{
cboxColorMap->setCurrentText(tr("Freak Out"));
cboxColorMap->setCurrentIndex(cboxColorMap->findText(tr("Freak Out")));
}
else if(mRasterLayer->getColorShadingAlgorithm()==QgsRasterLayer::COLOR_RAMP)
{
cboxColorMap->setCurrentText(tr("Custom Colormap"));
cboxColorMap->setCurrentIndex(cboxColorMap->findText(tr("Custom Colormap")));
}
else if(mRasterLayer->getColorShadingAlgorithm()==QgsRasterLayer::USER_DEFINED)
{
cboxColorMap->setCurrentText(tr("User Defined"));
cboxColorMap->setCurrentIndex(cboxColorMap->findText(tr("User Defined")));
}
}
else
{
cboxColorMap->setCurrentText(tr("Grayscale"));
cboxColorMap->setCurrentIndex(cboxColorMap->findText(tr("Grayscale")));
}

//set whether the layer histogram should be inverted
Expand All @@ -615,14 +630,15 @@ void QgsRasterLayerProperties::sync()
}

//set the combos to the correct values
cboRed->setCurrentText(mRasterLayer->getRedBandName());
cboGreen->setCurrentText(mRasterLayer->getGreenBandName());
cboBlue->setCurrentText(mRasterLayer->getBlueBandName());
cboGray->setCurrentText(mRasterLayer->getGrayBandName());
cboRed->setCurrentIndex(cboRed->findText(mRasterLayer->getRedBandName()));
cboGreen->setCurrentIndex(cboGreen->findText(mRasterLayer->getGreenBandName()));
cboBlue->setCurrentIndex(cboBlue->findText(mRasterLayer->getBlueBandName()));
cboGray->setCurrentIndex(cboGray->findText(mRasterLayer->getGrayBandName()));

//set the stdDevs and min max values
if(mRasterLayerIsGdal && rbtnThreeBand->isChecked())
{
mRGBActualMinimumMaximum = mRasterLayer->getActualRGBMinMaxFlag();
if(mRasterLayer->getUserDefinedRGBMinMax())
{
sboxThreeBandStdDev->setValue(0.0);
Expand Down Expand Up @@ -656,10 +672,12 @@ void QgsRasterLayerProperties::sync()
leBlueMin->setText(QString::number(mRasterLayer->getMinimumValue(mRasterLayer->getBlueBandName())));
leBlueMax->setText(QString::number(mRasterLayer->getMaximumValue(mRasterLayer->getBlueBandName())));
}
setMinimumMaximumEstimateWarning();
}
}
else if(mRasterLayerIsGdal)
{
mGrayActualMinimumMaximum = mRasterLayer->getActualGrayMinMaxFlag();
if(mRasterLayer->getUserDefinedGrayMinMax())
{
sboxSingleBandStdDev->setValue(0.0);
Expand All @@ -684,37 +702,37 @@ void QgsRasterLayerProperties::sync()
leGrayMax->setText(QString::number(mRasterLayer->getMaximumValue(mRasterLayer->getGrayBandName())));
}
}

setMinimumMaximumEstimateWarning();
}

//set color scaling algorithm
if(QgsContrastEnhancement::STRETCH_TO_MINMAX == mRasterLayer->getContrastEnhancementAlgorithm())
{
cboxContrastEnhancementAlgorithm->setCurrentText(tr("Stretch To MinMax"));
cboxContrastEnhancementAlgorithm->setCurrentIndex(cboxContrastEnhancementAlgorithm->findText(tr("Stretch To MinMax")));
}
else if(QgsContrastEnhancement::STRETCH_AND_CLIP_TO_MINMAX == mRasterLayer->getContrastEnhancementAlgorithm())
{
cboxContrastEnhancementAlgorithm->setCurrentText(tr("Stretch And Clip To MinMax"));
cboxContrastEnhancementAlgorithm->setCurrentIndex(cboxContrastEnhancementAlgorithm->findText(tr("Stretch And Clip To MinMax")));
}
else if(QgsContrastEnhancement::CLIP_TO_MINMAX == mRasterLayer->getContrastEnhancementAlgorithm())
{
cboxContrastEnhancementAlgorithm->setCurrentText(tr("Clip To MinMax"));
cboxContrastEnhancementAlgorithm->setCurrentIndex(cboxContrastEnhancementAlgorithm->findText(tr("Clip To MinMax")));
}
else if(QgsContrastEnhancement::USER_DEFINED == mRasterLayer->getContrastEnhancementAlgorithm())
{
cboxContrastEnhancementAlgorithm->setCurrentText(tr("User Defined"));
cboxContrastEnhancementAlgorithm->setCurrentIndex(cboxContrastEnhancementAlgorithm->findText(tr("User Defined")));
}
else
{
cboxContrastEnhancementAlgorithm->setCurrentText(tr("No Scaling"));
cboxContrastEnhancementAlgorithm->setCurrentIndex(cboxContrastEnhancementAlgorithm->findText(tr("No Stretch")));
}

//Display the current default contrast enhancement algorithm
QSettings myQSettings;
QString myDefaultAlgorithm = myQSettings.value("/Raster/defaultContrastEnhancementAlgorithm", "NO_STRETCH").toString();
if(myDefaultAlgorithm == "NO_STRETCH")
{
labelDefaultContrastEnhancementAlgorithm->setText(tr("No Scaling"));
labelDefaultContrastEnhancementAlgorithm->setText(tr("No Stretch"));
}
if(myDefaultAlgorithm == "STRETCH_TO_MINMAX")
{
Expand All @@ -730,7 +748,7 @@ void QgsRasterLayerProperties::sync()
}
else
{
labelDefaultContrastEnhancementAlgorithm->setText(tr("No Scaling"));
labelDefaultContrastEnhancementAlgorithm->setText(tr("No Stretch"));
}


Expand All @@ -746,18 +764,8 @@ void QgsRasterLayerProperties::sync()
sliderTransparency->setValue(255 - mRasterLayer->getTransparency());
//update the transparency percentage label
sliderTransparency_valueChanged(255 - mRasterLayer->getTransparency());

int myIndex = cboxTransparencyLayer->findText(mRasterLayer->getTransparentLayerName());
if(-1 != myIndex)
{
cboxTransparencyLayer->setCurrentIndex(myIndex);
}
else
{
cboxTransparencyLayer->setCurrentIndex(cboxTransparencyLayer->findText(TRSTRING_NOT_SET));
}

myIndex = cboxTransparencyBand->findText(mRasterLayer->getTransparentBandName());
int myIndex = cboxTransparencyBand->findText(mRasterLayer->getTransparentBandName());
if(-1 != myIndex)
{
cboxTransparencyBand->setCurrentIndex(myIndex);
Expand Down Expand Up @@ -1085,7 +1093,6 @@ void QgsRasterLayerProperties::apply()
mRasterLayer->setBlueBandName(cboBlue->currentText());
mRasterLayer->setGrayBandName(cboGray->currentText());
mRasterLayer->setTransparentBandName(cboxTransparencyBand->currentText());
mRasterLayer->setTransparentLayerName(cboxTransparencyLayer->currentText());

//set the appropriate color shading type
//If USER_DEFINED do nothing, user defined can only be set programatically
Expand Down Expand Up @@ -1133,6 +1140,7 @@ void QgsRasterLayerProperties::apply()
//Set min max based on user defined values if all are set and stdDev is 0.0
if(rbtnThreeBandMinMax->isEnabled() && rbtnThreeBandMinMax->isChecked() && validUserDefinedMinMax())
{
mRasterLayer->setActualRGBMinMaxFlag(mRGBActualMinimumMaximum);
if(mRasterLayer->getRedBandName() != TRSTRING_NOT_SET)
{
mRasterLayer->setMinimumValue(cboRed->currentText(), leRedMin->text().toDouble(), false);
Expand Down Expand Up @@ -1167,6 +1175,7 @@ void QgsRasterLayerProperties::apply()
//Set min max based on user defined values if all are set and stdDev is 0.0
if(rbtnSingleBandMinMax->isEnabled() && rbtnSingleBandMinMax->isChecked() && validUserDefinedMinMax())
{
mRasterLayer->setActualGrayMinMaxFlag(mGrayActualMinimumMaximum);
if(mRasterLayer->getGrayBandName() != TRSTRING_NOT_SET)
{
mRasterLayer->setMinimumValue(cboGray->currentText(), leGrayMin->text().toDouble(), false);
Expand Down Expand Up @@ -1474,7 +1483,6 @@ void QgsRasterLayerProperties::apply()
//Becuase Min Max values can be set during the redraw if a strech is requested we need to resync after apply
if(mRasterLayerIsGdal && QgsContrastEnhancement::NO_STRETCH != mRasterLayer->getContrastEnhancementAlgorithm())
{

//set the stdDevs and min max values
if(rbtnThreeBand->isChecked())
{
Expand All @@ -1485,6 +1493,7 @@ void QgsRasterLayerProperties::apply()

if(rbtnThreeBandMinMax->isEnabled())
{
mRGBActualMinimumMaximum = mRasterLayer->getActualRGBMinMaxFlag();
if(mRasterLayer->getRedBandName() != TRSTRING_NOT_SET)
{
leRedMin->setText(QString::number(mRasterLayer->getMinimumValue(mRasterLayer->getRedBandName())));
Expand All @@ -1500,6 +1509,7 @@ void QgsRasterLayerProperties::apply()
leBlueMin->setText(QString::number(mRasterLayer->getMinimumValue(mRasterLayer->getBlueBandName())));
leBlueMax->setText(QString::number(mRasterLayer->getMaximumValue(mRasterLayer->getBlueBandName())));
}
setMinimumMaximumEstimateWarning();
}
}
else
Expand All @@ -1511,11 +1521,13 @@ void QgsRasterLayerProperties::apply()

if(rbtnSingleBandMinMax->isEnabled())
{
mGrayActualMinimumMaximum = mRasterLayer->getActualGrayMinMaxFlag();
if(mRasterLayer->getGrayBandName() != TRSTRING_NOT_SET)
{
leGrayMin->setText(QString::number(mRasterLayer->getMinimumValue(mRasterLayer->getGrayBandName())));
leGrayMax->setText(QString::number(mRasterLayer->getMaximumValue(mRasterLayer->getGrayBandName())));
}
setMinimumMaximumEstimateWarning();
}
}
}
Expand Down Expand Up @@ -1741,35 +1753,6 @@ void QgsRasterLayerProperties::on_cboxColorMap_currentIndexChanged(const QString
}
}

void QgsRasterLayerProperties::on_cboxTransparencyLayer_currentIndexChanged(const QString& theText)
{
if(theText == TRSTRING_NOT_SET)
{
cboxTransparencyBand->clear();
cboxTransparencyBand->addItem(TRSTRING_NOT_SET);
}
else
{
QMap<QString, QgsMapLayer *> myLayers = QgsMapLayerRegistry::instance()->mapLayers();
QMap<QString, QgsMapLayer *>::iterator it;
for(it = myLayers.begin(); it != myLayers.end(); it++)
{
if(theText == it.value()->name() && QgsMapLayer::RASTER == it.value()->type())
{
QgsRasterLayer* myRasterLayer = (QgsRasterLayer*)it.value();
int myBandCount = myRasterLayer->getBandCount();
cboxTransparencyBand->clear();
cboxTransparencyBand->addItem(TRSTRING_NOT_SET);
for(int bandRunner = 1; bandRunner <= myBandCount; bandRunner++)
{
cboxTransparencyBand->addItem(myRasterLayer->getRasterBandName(bandRunner));
}
break;
}
}
}
}

void QgsRasterLayerProperties::on_pbnDefaultValues_clicked()
{

Expand Down Expand Up @@ -2512,7 +2495,7 @@ void QgsRasterLayerProperties::on_rbtnThreeBand_toggled(bool theState)
mRasterLayer->getRasterLayerType() == QgsRasterLayer::PALETTE)
{
pbtnLoadMinMax->setEnabled(false);
cboxContrastEnhancementAlgorithm->setCurrentText(tr("No Stretch"));
cboxContrastEnhancementAlgorithm->setCurrentIndex(cboxContrastEnhancementAlgorithm->findText(tr("No Stretch")));
cboxContrastEnhancementAlgorithm->setEnabled(false);
labelContrastEnhancement->setEnabled(false);
sboxThreeBandStdDev->setEnabled(false);
Expand Down Expand Up @@ -2614,6 +2597,7 @@ void QgsRasterLayerProperties::userDefinedMinMax_textEdited(QString theString)
ignoreSpinBoxEvent = true;
sboxThreeBandStdDev->setValue(0.0);
}
mRGBActualMinimumMaximum = false;
}
else
{
Expand All @@ -2622,7 +2606,9 @@ void QgsRasterLayerProperties::userDefinedMinMax_textEdited(QString theString)
ignoreSpinBoxEvent = true;
sboxSingleBandStdDev->setValue(0.0);
}
mGrayActualMinimumMaximum = false;
}
setMinimumMaximumEstimateWarning();
}

void QgsRasterLayerProperties::on_mClassifyButton_clicked()
Expand Down Expand Up @@ -2737,6 +2723,7 @@ void QgsRasterLayerProperties::on_pbtnLoadMinMax_clicked()
myRasterBandStats = mRasterLayer->getRasterBandStats(mRasterLayer->getRasterBandNumber(cboBlue->currentText()));
leBlueMin->setText(QString::number(myRasterBandStats.minVal));
leBlueMax->setText(QString::number(myRasterBandStats.maxVal));
mRGBActualMinimumMaximum = true;
}
else
{
Expand All @@ -2751,6 +2738,7 @@ void QgsRasterLayerProperties::on_pbtnLoadMinMax_clicked()
mRasterLayer->computeMinimumMaximumEstimates(mRasterLayer->getRasterBandNumber(cboBlue->currentText()), myMinimumMaximum);
leBlueMin->setText(QString::number(myMinimumMaximum[0]));
leBlueMax->setText(QString::number(myMinimumMaximum[1]));
mRGBActualMinimumMaximum = false;
}

}
Expand All @@ -2762,6 +2750,7 @@ void QgsRasterLayerProperties::on_pbtnLoadMinMax_clicked()
myRasterBandStats = mRasterLayer->getRasterBandStats(mRasterLayer->getRasterBandNumber(cboGray->currentText()));
leGrayMin->setText(QString::number(myRasterBandStats.minVal));
leGrayMax->setText(QString::number(myRasterBandStats.maxVal));
mGrayActualMinimumMaximum = true;
}
else
{
Expand All @@ -2770,8 +2759,10 @@ void QgsRasterLayerProperties::on_pbtnLoadMinMax_clicked()
mRasterLayer->computeMinimumMaximumEstimates(mRasterLayer->getRasterBandNumber(cboGray->currentText()), myMinimumMaximum);
leGrayMin->setText(QString::number(myMinimumMaximum[0]));
leGrayMax->setText(QString::number(myMinimumMaximum[1]));
mGrayActualMinimumMaximum = false;
}
}
setMinimumMaximumEstimateWarning();
}
}

Expand Down

0 comments on commit c5d01dc

Please sign in to comment.