Skip to content

Commit

Permalink
fix colorscale
Browse files Browse the repository at this point in the history
  • Loading branch information
ftomei committed Feb 10, 2025
1 parent 9288d73 commit 438c525
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion gis/color.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Crit3DColorScale::Crit3DColorScale()
_minimum = NODATA;
_maximum = NODATA;
_isFixedRange = false;
_isHideOutliers = false;
_isHideMinimum = false;
_isTransparent = false;

_classification = classificationMethod::EqualInterval;
Expand Down
6 changes: 3 additions & 3 deletions gis/color.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
std::vector<Crit3DColor> color;
double _minimum, _maximum;
bool _isFixedRange;
bool _isHideOutliers;
bool _isHideMinimum;
bool _isTransparent;
int _classification;

Expand Down Expand Up @@ -54,8 +54,8 @@
void setFixedRange(bool fixedRange) { _isFixedRange = fixedRange; }
bool isFixedRange() { return _isFixedRange; }

void setHideOutliers(bool hideOutliers) { _isHideOutliers = hideOutliers; }
bool isHideOutliers() { return _isHideOutliers; }
void setHideMinimum(bool isHideMinimum) { _isHideMinimum = isHideMinimum; }
bool isHideMinimum() { return _isHideMinimum; }

void setTransparent(bool transparent) { _isTransparent = transparent; }
bool isTransparent() { return _isTransparent; }
Expand Down
6 changes: 3 additions & 3 deletions graphics/mapGraphicsRasterUtm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,10 @@ bool RasterUtmObject::drawRaster(QPainter* painter)
if (isEqual(value, _rasterPointer->header->flag) || isEqual(value, NODATA))
continue;

// check outliers (transparent)
if (_rasterPointer->colorScale->isHideOutliers())
// check minimum (transparent)
if (_rasterPointer->colorScale->isHideMinimum())
{
if (isEqual(value, 0) || value <= _rasterPointer->colorScale->minimum() || value > _rasterPointer->colorScale->maximum())
if (isEqual(value, 0) || value <= _rasterPointer->colorScale->minimum())
continue;
}

Expand Down
2 changes: 1 addition & 1 deletion meteo/meteo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ bool setColorScale(meteoVariable variable, Crit3DColorScale *colorScale)
if (variable == precipitation || variable == snowFall || variable == snowWaterEquivalent
|| variable == snowLiquidWaterContent || variable == snowMelt)
{
colorScale->setHideOutliers(true);
colorScale->setHideMinimum(true);
colorScale->setTransparent(true);
}
break;
Expand Down

0 comments on commit 438c525

Please sign in to comment.