Revision: 6656
http://sourceforge.net/p/jump-pilot/code/6656
Author: michaudm
Date: 2020-12-22 11:43:18 +0000 (Tue, 22 Dec 2020)
Log Message:
-----------
fix #517 : raster styling of float32 image
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java
core/trunk/src/org/openjump/core/rasterimage/styler/ui/StretchedPanel.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2020-12-21 14:59:14 UTC (rev 6655)
+++ core/trunk/ChangeLog 2020-12-22 11:43:18 UTC (rev 6656)
@@ -4,6 +4,9 @@
# 3. be concise but convey the change in a way that ordinary users understand
#<-------------------------------- 80 chars ---------------------------------->
+2020-12-22 mmichaud
+ * fix #517 : raster styling of float32 image
+
2020-12-21 ede
* update finnish translation courtesy of Jukka Rahkonen
Modified: core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java
2020-12-21 14:59:14 UTC (rev 6655)
+++ core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java
2020-12-22 11:43:18 UTC (rev 6656)
@@ -550,7 +550,9 @@
} else {
rasterSymbology = new
RasterSymbology(RasterSymbology.TYPE_RAMP);
}
-
rasterSymbology.addColorMapEntry(metadata.getNoDataValue(), transparentColor);
+ if (!Double.isNaN(metadata.getNoDataValue())) {
+
rasterSymbology.addColorMapEntry(metadata.getNoDataValue(), transparentColor);
+ }
rasterSymbology.addColorMapEntry(metadata.getStats().getMin(0), Color.WHITE);
rasterSymbology.addColorMapEntry(metadata.getStats().getMax(0), Color.BLACK);
setSymbology(rasterSymbology);
Modified:
core/trunk/src/org/openjump/core/rasterimage/styler/ui/StretchedPanel.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/styler/ui/StretchedPanel.java
2020-12-21 14:59:14 UTC (rev 6655)
+++ core/trunk/src/org/openjump/core/rasterimage/styler/ui/StretchedPanel.java
2020-12-22 11:43:18 UTC (rev 6656)
@@ -252,7 +252,7 @@
colorMapEntries = rasterSymbology.getColorMapEntries();
// Convert values to relative values
- ColorMapEntry[] relColMapEntries = new
ColorMapEntry[rasterSymbology.getColorMapEntries().length - 1];
+ ColorMapEntry[] relColMapEntries = new
ColorMapEntry[rasterSymbology.getColorMapEntries().length];
double minVal = 0;
if(rasterSymbology.getColorMapEntries()[0].getColor() != null) {
minVal = rasterSymbology.getColorMapEntries()[0].getUpperValue();
@@ -260,10 +260,11 @@
minVal = rasterSymbology.getColorMapEntries()[1].getUpperValue();
}
double maxVal =
rasterSymbology.getColorMapEntries()[rasterSymbology.getColorMapEntries().length-1].getUpperValue();
-
+
+ relColMapEntries[0] = new ColorMapEntry(0,
rasterSymbology.getColorMapEntries()[0].getColor());
for(int i=1; i<rasterSymbology.getColorMapEntries().length; i++) {
double relVal =
(rasterSymbology.getColorMapEntries()[i].getUpperValue() - minVal) / (maxVal -
minVal);
- relColMapEntries[i-1] = new ColorMapEntry(relVal,
rasterSymbology.getColorMapEntries()[i].getColor());
+ relColMapEntries[i] = new ColorMapEntry(relVal,
rasterSymbology.getColorMapEntries()[i].getColor());
}
GUIUtils.updateGradientComboBoxes(relColMapEntries, width, height);
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
