archive-gh-me/MeteoInfo
1
0
Fork 0
mirror of https://github.com/meteoinfo/MeteoInfo.git synced 2025-12-08 20:36:05 +00:00
Code Issues Projects Releases Wiki Activity

bugfix of __setitem__ in NDArray

Browse Source
This commit is contained in:
wyq 2024-09-05 22:23:59 +08:00
parent d0f556f076
commit f94f3dd9bf
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java
View File

@ -67,7 +67,7 @@ import java.util.zip.ZipInputStream;
public static String getVersion() {
String version = GlobalUtil.class.getPackage().getImplementationVersion();
if (version == null || version.equals("")) {
version = "3.9.3";
version = "3.9.4";
}
return version;
}

2
meteoinfo-geometry/src/main/java/org/meteoinfo/geometry/graphic/Line2DGraphic.java
View File

@ -107,7 +107,7 @@ public class Line2DGraphic extends Graphic {
continue;
}
points.add(new PointD(x, y));
cb = legendScheme.findLegendBreak(c);
cb = legendScheme.findLegendBreakAlways(c);
cbc.add(cb);
}
if (this.shape == null) {

8
meteoinfo-lab/milconfig.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types\plot">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart\legend"/>
<Path OpenPath="D:\Temp\test">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\slice"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\imshow"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\radar"/>
@ -16,17 +15,18 @@
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\animation"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\plot"/>
<RecentFolder Folder="D:\Temp\test"/>
</Path>
<File>
<OpenedFiles>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\slice\slice_2d.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\funny\ghost_halloween.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\funny\math_man.py"/>
<OpenedFile File="D:\Temp\test\test.py"/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\slice\slice_2d.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\funny\ghost_halloween.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\funny\math_man.py"/>
<RecentFile File="D:\Temp\test\test.py"/>
</RecentFiles>
</File>
<Font>

8
meteoinfo-ndarray/src/main/java/org/meteoinfo/ndarray/math/ArrayMath.java
View File

@ -6576,7 +6576,7 @@ public class ArrayMath {
iter.setObjectNext(v);
}
}
r = Array.factory(a.getDataType(), a.getShape(), r.getStorage());
r = Array.factory(a.getDataType(), a.getIndex(), r.getStorage());
return r;
}
@ -6613,7 +6613,7 @@ public class ArrayMath {
iter.setObjectNext(v);
}
}
r = Array.factory(a.getDataType(), a.getShape(), r.getStorage());
r = Array.factory(a.getDataType(), a.getIndex(), r.getStorage());
return r;
}
@ -6639,7 +6639,7 @@ public class ArrayMath {
iter.setObjectNext(v.getObject(index));
index.incr();
}
r = Array.factory(a.getDataType(), a.getShape(), r.getStorage());
r = Array.factory(a.getDataType(), a.getIndex(), r.getStorage());
return r;
}
@ -6665,7 +6665,7 @@ public class ArrayMath {
iter.setObjectCurrent(v.getObject(index));
index.incr();
}
r = Array.factory(a.getDataType(), a.getShape(), r.getStorage());
r = Array.factory(a.getDataType(), a.getIndex(), r.getStorage());
return r;
}

3
meteoinfo-render2d/src/main/java/org/meteoinfo/render/java2d/Draw.java
View File

@ -3332,6 +3332,9 @@ public class Draw {
path.lineTo(p.X, p.Y);
aPLB = (PolylineBreak) pbc.get(i);
if (aPLB == null) {
return;
}
Color aColor = aPLB.getColor();
Float size = aPLB.getWidth();
float[] dashPattern = getDashPattern(aPLB.getStyle());

2
pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<revision>3.9.3</revision>
<revision>3.9.4</revision>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.release>8</maven.compiler.release>