Revision: 6674
http://sourceforge.net/p/jump-pilot/code/6674
Author: michaudm
Date: 2021-04-25 20:53:15 +0000 (Sun, 25 Apr 2021)
Log Message:
-----------
fix regression introduced in r6621 & r6662 in raster Vectorizer
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/org/openjump/core/rasterimage/algorithms/VectorizeAlgorithm.java
core/trunk/src/org/openjump/core/rasterimage/sextante/rasterWrappers/GridWrapper.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2021-03-09 06:51:39 UTC (rev 6673)
+++ core/trunk/ChangeLog 2021-04-25 20:53:15 UTC (rev 6674)
@@ -4,6 +4,18 @@
# 3. be concise but convey the change in a way that ordinary users understand
#<-------------------------------- 80 chars ---------------------------------->
+2021-04-25 mmichaud
+ * fix regression introduced in r6621 & r6662 in raster Vectorizer
+
+2021-03-09
+ * Fix GradientCanvas (synchronize with github repo)
+
+2021-02-09
+ * fix getImageInfo in RasterImageLayer
+
+2021-08-02 mmichaud
+ * Set bpp to 16b for flt, asc and txt
+
* release 1.16 Changes updated til here
****************************************
2020-12-23 ede
Modified:
core/trunk/src/org/openjump/core/rasterimage/algorithms/VectorizeAlgorithm.java
===================================================================
---
core/trunk/src/org/openjump/core/rasterimage/algorithms/VectorizeAlgorithm.java
2021-03-09 06:51:39 UTC (rev 6673)
+++
core/trunk/src/org/openjump/core/rasterimage/algorithms/VectorizeAlgorithm.java
2021-04-25 20:53:15 UTC (rev 6674)
@@ -94,7 +94,7 @@
if (val != oldVal) {
cEnd = c - 1;
// Get polygon vertices
- if (oldVal != noData) {
+ if (oldVal != noData && !Double.isNaN(oldVal)) {
coords[0] = new Coordinate(xllCorner
+ (cStart * cellSize) - cellSize, yurCorner
- (r * cellSize));
@@ -156,11 +156,11 @@
final ArrayList<Double> vals = new ArrayList<Double>();
final int nx =
gwrapper.getNX();//rstLayer.getLayerGridExtent().getNX();
final int ny = gwrapper.getNY();//
rstLayer.getLayerGridExtent().getNY();
- vals.add(nodata);
+ //vals.add(nodata);
for (int x = 0; x < nx; x++) {//cols
for (int y = 0; y < ny; y++) {//rows
final double value = gwrapper.getCellValueAsDouble(x, y, band);
- if (value != nodata) {
+ if (value != nodata && !Double.isNaN(value)) {
vals.add(gwrapper.getCellValueAsDouble(x, y, band));
}
}
@@ -219,7 +219,7 @@
for (y = 0, ID = 1; y < m_iNY; y++) {
for (x = 0; x < m_iNX; x++) {
dValue = gwrapper.getCellValueAsDouble(x, y, band);
- if (!gwrapper.isNoDataValue(dValue) && (m_Lock[y][x] == 0)) {
+ if (!Double.isNaN(dValue) && !gwrapper.isNoDataValue(dValue)
&& (m_Lock[y][x] == 0)) {
Discrete_Lock(gwrapper, x, y, ID, band);
featColl.add(Discrete_Area(gwrapper, featSchema,
attributeName, x, y, ID, band));
Modified:
core/trunk/src/org/openjump/core/rasterimage/sextante/rasterWrappers/GridWrapper.java
===================================================================
---
core/trunk/src/org/openjump/core/rasterimage/sextante/rasterWrappers/GridWrapper.java
2021-03-09 06:51:39 UTC (rev 6673)
+++
core/trunk/src/org/openjump/core/rasterimage/sextante/rasterWrappers/GridWrapper.java
2021-04-25 20:53:15 UTC (rev 6674)
@@ -93,7 +93,7 @@
public boolean isNoDataValue (double dValue){
- return (dValue == m_Layer.getNoDataValue());
+ return (Double.isNaN(dValue) || dValue ==
m_Layer.getNoDataValue());
}
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
