fix createRasterLayer and createStreamlineLayer functions

2025-12-08 20:36:05 +00:00 · 2023-04-04 21:22:07 +08:00 · 2023-04-04 21:22:07 +08:00 · fe7ee7345c
commit fe7ee7345c
parent 9a9427098e
8 changed files with 44 additions and 11 deletions
--- a/.idea/aws.xml
+++ b/.idea/aws.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="accountSettings">
+    <option name="activeRegion" value="us-east-1" />
+    <option name="recentlyUsedRegions">
+      <list>
+        <option value="us-east-1" />
+      </list>
+    </option>
+  </component>
+</project>
--- a/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java
+++ b/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java
@ -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.5.10";
+             version = "3.5.11";
         }
         return version;
     }
--- a/meteoinfo-data/meteoinfo-data.iml
+++ b/meteoinfo-data/meteoinfo-data.iml
@ -53,5 +53,6 @@
    <orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
  </component>
 </module>
--- a/meteoinfo-data/pom.xml
+++ b/meteoinfo-data/pom.xml
@ -62,6 +62,11 @@
            <artifactId>commons-compress</artifactId>
            <version>1.21</version>
        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
    </dependencies>

    <build>
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/GridData.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/GridData.java
@ -15,6 +15,7 @@ package org.meteoinfo.data;

 import java.io.BufferedReader;

+import org.apache.commons.lang3.ArrayUtils;
 import org.meteoinfo.common.DataConvert;
 import org.meteoinfo.common.Extent;
 import org.meteoinfo.common.MIMath;
@ -3699,6 +3700,20 @@ public class GridData {
        }
    }

+    /**
+     * Change all dimensions to be ascending
+     */
+    public void asAscending() {
+        if (this.getXDelta() < 0) {
+            ArrayUtils.reverse(xArray);
+            this.xReverse();
+        }
+        if (this.getYDelta() < 0) {
+            ArrayUtils.reverse(yArray);
+            this.yReverse();
+        }
+    }
+
    /**
     * Convert to GridArray object
     *
@ -3707,6 +3722,7 @@ public class GridData {
    public GridArray toGridArray() {
        Array a = Array.factory(DataType.DOUBLE, new int[]{this.getYNum(), this.getXNum()});
        int idx = 0;
+        this.asAscending();
        for (int i = 0; i < this.getYNum(); i++) {
            for (int j = 0; j < this.getXNum(); j++) {
                a.setDouble(idx, this.getDoubleValue(i, j));
--- a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/meteodata/DrawMeteoData.java
+++ b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/meteodata/DrawMeteoData.java
@ -1681,6 +1681,8 @@ public class DrawMeteoData {
     */
    public static VectorLayer createStreamlineLayer(GridData uData, GridData vData, int density, LegendScheme aLS,
                                                    String lName, boolean isUV) {
+        uData.asAscending();
+        vData.asAscending();
        GridData uGridData;
        GridData vGridData;
        if (isUV) {
--- a/meteoinfo-lab/milconfig.xml
+++ b/meteoinfo-lab/milconfig.xml
@ -1,34 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <MeteoInfo File="milconfig.xml" Type="configurefile">
-  <Path OpenPath="D:\Working\MIScript\Jython\mis\io\grib">
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\array"/>
+  <Path OpenPath="D:\Working\MIScript\Jython\mis\io\netcdf">
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\mesh"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\test"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\calc"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\web"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\burf"/>
    <RecentFolder Folder="D:\Working\MIScript\cuace_dust\py\plot"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\web"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\grib"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\netcdf"/>
  </Path>
  <File>
    <OpenedFiles>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model\obj_airplane_line.py"/>
      <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model\obj_airplane_model.py"/>
      <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot\air_path_model.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\io\grib\test_read_ec_s2s.py"/>
+      <OpenedFile File="D:\Working\MIScript\Jython\mis\io\netcdf\test_readnc_2.py"/>
    </OpenedFiles>
    <RecentFiles>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model\obj_airplane_line.py"/>
      <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model\obj_airplane_model.py"/>
      <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot\air_path_model.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\io\grib\test_read_ec_s2s.py"/>
+      <RecentFile File="D:\Working\MIScript\Jython\mis\io\netcdf\test_readnc_2.py"/>
    </RecentFiles>
  </File>
  <Font>
@ -36,5 +34,5 @@
  </Font>
  <LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
  <Figure DoubleBuffering="true"/>
-  <Startup MainFormLocation="-7,0" MainFormSize="1361,777"/>
+  <Startup MainFormLocation="-7,-7" MainFormSize="1293,685"/>
 </MeteoInfo>
--- a/meteoinfo-map/config.xml
+++ b/meteoinfo-map/config.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <MeteoInfo File="config.xml" Type="configurefile">
-  <Path OpenPath="D:\Temp\micaps"/>
+  <Path OpenPath="D:\Temp\nc"/>
  <Font>
    <TextFont FontName="YaHei Consolas Hybrid" FontSize="14"/>
    <LegendFont FontName="宋体" FontSize="12"/>