update shape read function for optional measure data of PolylineZShape

2025-12-08 20:36:05 +00:00 · 2023-06-01 22:21:24 +08:00 · 2023-06-01 22:21:24 +08:00 · 81c824ebf3
commit 81c824ebf3
parent 62ff9c0fb9
28 changed files with 128 additions and 46 deletions
--- a/meteoinfo-chart/pom.xml
+++ b/meteoinfo-chart/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/GraphicFactory.java
+++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/GraphicFactory.java
@ -1726,6 +1726,68 @@ public class GraphicFactory {
        return graphics;
    }

+    /**
+     * Create 3D polygons
+     *
+     * @param xa X coordinate array
+     * @param ya Y coordinate array
+     * @param za Z coordinate array
+     * @param pgbs PolygonBreak list
+     * @return Graphics
+     */
+    public static GraphicCollection3D createPolygons3D(Array xa, Array ya, Array za, List<PolygonBreak> pgbs) {
+        xa = xa.copyIfView();
+        ya = ya.copyIfView();
+        za = za.copyIfView();
+
+        GraphicCollection3D graphics = new GraphicCollection3D();
+        double x, y, z;
+        int n = (int) xa.getSize();
+        PolygonZShape pgs;
+        PointZ p;
+        List<PointZ> points = new ArrayList<>();
+        if (xa.getRank() == 1) {
+            IndexIterator xIter = xa.getIndexIterator();
+            IndexIterator yIter = ya.getIndexIterator();
+            IndexIterator zIter = za.getIndexIterator();
+            int ii = 0;
+            while (xIter.hasNext()) {
+                x = xIter.getDoubleNext();
+                y = yIter.getDoubleNext();
+                z = zIter.getDoubleNext();
+                points.add(new PointZ(x, y, z));
+            }
+            if (points.size() > 2) {
+                points.add((PointZ) points.get(0).clone());
+                pgs = new PolygonZShape();
+                pgs.setPoints(points);
+                Graphic aGraphic = new Graphic(pgs, pgbs.get(ii));
+                graphics.add(aGraphic);
+                ii++;
+            }
+        } else {
+            int[] shape = xa.getShape();
+            int nRow = shape[0];
+            int nCol = shape[1];
+            int idx;
+            for (int i = 0; i < nCol; i++) {
+                points = new ArrayList<>();
+                for (int j = 0; j < nRow; j++) {
+                    idx = j * nCol + i;
+                    x = xa.getDouble(idx);
+                    y = ya.getDouble(idx);
+                    z = za.getDouble(idx);
+                    points.add(new PointZ(x, y, z));
+                }
+                points.add((PointZ) points.get(0).clone());
+                pgs = new PolygonZShape();
+                pgs.setPoints(points);
+                graphics.add(new Graphic(pgs, pgbs.get(i)));
+            }
+        }
+        return graphics;
+    }
+
    /**
     * Add wireframe polylines
     *
--- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/GLPlot.java
+++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/GLPlot.java
@ -2162,18 +2162,19 @@ public class GLPlot extends Plot {
        skip = getLabelGap(this.zAxis.getTickLabelFont(), tlabs, axisLen);
        float x1 = x;
        float y1 = y;
-        float tickLen = this.zAxis.getTickLength() * this.lenScale * transform.getYLength() / 2;
+        float yTickLen = this.zAxis.getTickLength() * this.lenScale * transform.getYLength() / 2;
+        float xTickLen = this.zAxis.getTickLength() * this.lenScale * transform.getXLength() / 2;
        if (x < center.x) {
            if (y > center.y) {
-                y1 += tickLen;
+                y1 += yTickLen;
            } else {
-                x1 -= tickLen;
+                x1 -= xTickLen;
            }
        } else {
            if (y > center.y) {
-                x1 += tickLen;
+                x1 += xTickLen;
            } else {
-                y1 -= tickLen;
+                y1 -= yTickLen;
            }
        }
        xAlign = XAlign.RIGHT;
--- a/meteoinfo-common/pom.xml
+++ b/meteoinfo-common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- 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.6.0-beta1";
+             version = "3.6.0";
         }
         return version;
     }
--- a/meteoinfo-console/pom.xml
+++ b/meteoinfo-console/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-data/pom.xml
+++ b/meteoinfo-data/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-dataframe/pom.xml
+++ b/meteoinfo-dataframe/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-geo/pom.xml
+++ b/meteoinfo-geo/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/mapdata/ShapeFileManage.java
+++ b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/mapdata/ShapeFileManage.java
@ -29,6 +29,7 @@ package org.meteoinfo.geo.mapdata;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+ import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@ -106,7 +107,7 @@ public class ShapeFileManage {
        loadShxFile(shxFile);

        //Open shp file 
-        DataInputStream br = new DataInputStream(new BufferedInputStream(new FileInputStream(shpFile)));
+        DataInputStream br = new DataInputStream(new BufferedInputStream(Files.newInputStream(shpFile.toPath())));
        VectorLayer aLayer;
        //byte[] arr = new byte[(int)shpFile.length()];
        byte[] arr = new byte[100];
@ -394,11 +395,13 @@ public class ShapeFileManage {
            }

            //Read measure
-            double mmin = buffer.getDouble();
-            double mmax = buffer.getDouble();
            double[] mArray = new double[numPoints];
-            for (int j = 0; j < numPoints; j++) {
-                mArray[j] = buffer.getDouble();
+            if (buffer.position() < buffer.capacity()) {
+                double mmin = buffer.getDouble();
+                double mmax = buffer.getDouble();
+                for (int j = 0; j < numPoints; j++) {
+                    mArray[j] = buffer.getDouble();
+                }
            }

            //Get pointZ list
--- a/meteoinfo-geometry/pom.xml
+++ b/meteoinfo-geometry/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-image/pom.xml
+++ b/meteoinfo-image/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-lab/milconfig.xml
+++ b/meteoinfo-lab/milconfig.xml
@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <MeteoInfo File="milconfig.xml" Type="configurefile">
-  <Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\mesh">
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\patch"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\satellite"/>
+  <Path OpenPath="D:\Working\MIScript\Jython\mis\map">
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\satellite\FY"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\funny"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\awx"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\contour"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\grib"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\contour"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\mesh"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\contour"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\fill"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\map"/>
  </Path>
  <File>
    <OpenedFiles>
      <OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\_reload.py"/>
      <OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\mainGUI.py"/>
      <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf\surfc_1.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\mesh\mesh_2.py"/>
      <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\mesh\meshc_peaks.py"/>
+      <OpenedFile File="D:\Working\MIScript\Jython\mis\map\test_shaperead-2.py"/>
    </OpenedFiles>
    <RecentFiles>
      <RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\_reload.py"/>
      <RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\mainGUI.py"/>
      <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf\surfc_1.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\mesh\mesh_2.py"/>
      <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\mesh\meshc_peaks.py"/>
+      <RecentFile File="D:\Working\MIScript\Jython\mis\map\test_shaperead-2.py"/>
    </RecentFiles>
  </File>
  <Font>
@ -38,5 +38,5 @@
  </Font>
  <LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
  <Figure DoubleBuffering="true"/>
-  <Startup MainFormLocation="-7,0" MainFormSize="1429,860"/>
+  <Startup MainFormLocation="-7,-7" MainFormSize="1293,685"/>
 </MeteoInfo>
--- a/meteoinfo-lab/pom.xml
+++ b/meteoinfo-lab/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>org.meteothink</groupId>
        <artifactId>MeteoInfo</artifactId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <artifactId>meteoinfo-lab</artifactId>
    <packaging>jar</packaging>
--- a/meteoinfo-lab/pylib/mipylib/plotlib/_axes3dgl$py.class
+++ b/meteoinfo-lab/pylib/mipylib/plotlib/_axes3dgl$py.class
--- a/meteoinfo-lab/pylib/mipylib/plotlib/_axes3dgl.py
+++ b/meteoinfo-lab/pylib/mipylib/plotlib/_axes3dgl.py
@ -368,14 +368,26 @@ class Axes3DGL(Axes3D):

        :return: Filled 3D patches.
        """
-        if color is not None:
-            kwargs['facecolor'] = color
-        lbreak, isunique = plotutil.getlegendbreak('polygon', **kwargs)
-
        x = plotutil.getplotdata(x)
        y = plotutil.getplotdata(y)
        z = plotutil.getplotdata(z)
-        graphics = GraphicFactory.createPolygons3D(x, y, z, lbreak)
+
+        lb, isunique = plotutil.getlegendbreak('polygon', **kwargs)
+        if color is None:
+            graphics = GraphicFactory.createPolygons3D(x, y, z, lb)
+        else:
+            alpha = kwargs.pop('alpha', None)
+            colors = plotutil.getcolors(color, alpha)
+            if len(colors) == 1:
+                lb.setColor(colors[0])
+                graphics = GraphicFactory.createPolygons3D(x, y, z, lb)
+            else:
+                lbs = []
+                for c in colors:
+                    nlb = lb.clone()
+                    nlb.setColor(c)
+                    lbs.append(nlb)
+                graphics = GraphicFactory.createPolygons3D(x, y, z, lbs)

        self.add_graphic(graphics)
        return graphics
--- a/meteoinfo-lab/pylib/mipylib/plotlib/_glfigure$py.class
+++ b/meteoinfo-lab/pylib/mipylib/plotlib/_glfigure$py.class
--- a/meteoinfo-lab/pylib/mipylib/plotlib/_glfigure.py
+++ b/meteoinfo-lab/pylib/mipylib/plotlib/_glfigure.py
@ -478,6 +478,10 @@ class GLFigure(GLChartPanel):
        self.axes.append(ax)
        self.getChart().addPlot(ax._axes)
        self.getChart().setCurrentPlot(self.getChart().getPlots().size())
+        if isinstance(ax, Axes3DGL):
+            self.set_mousemode("rotate")
+        else:
+            self.set_mousemode("pan")

    def remove_axes(self, ax=None):
        """
--- a/meteoinfo-lab/pylib/mipylib/plotlib/miplot$py.class
+++ b/meteoinfo-lab/pylib/mipylib/plotlib/miplot$py.class
--- a/meteoinfo-lab/pylib/mipylib/plotlib/miplot.py
+++ b/meteoinfo-lab/pylib/mipylib/plotlib/miplot.py
@ -1162,9 +1162,9 @@ def clf():
    if g_figure is None:
        return

-    if isinstance(g_figure, GLFigure):
-        delfig()
-        return
+    # if isinstance(g_figure, GLFigure):
+    #     delfig()
+    #     return

    if g_figure.getChart() is None:
        return
--- 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\nc"/>
+  <Path OpenPath="D:\Temp\test"/>
  <Font>
    <TextFont FontName="YaHei Consolas Hybrid" FontSize="14"/>
    <LegendFont FontName="宋体" FontSize="12"/>
--- a/meteoinfo-map/pom.xml
+++ b/meteoinfo-map/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>org.meteothink</groupId>
        <artifactId>MeteoInfo</artifactId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <artifactId>meteoinfo-map</artifactId>
    <packaging>jar</packaging>
--- a/meteoinfo-math/pom.xml
+++ b/meteoinfo-math/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-ndarray/pom.xml
+++ b/meteoinfo-ndarray/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>org.meteothink</groupId>
        <artifactId>MeteoInfo</artifactId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-projection/pom.xml
+++ b/meteoinfo-projection/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-table/pom.xml
+++ b/meteoinfo-table/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-ui/pom.xml
+++ b/meteoinfo-ui/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/pom.xml
+++ b/pom.xml
@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.meteothink</groupId>
    <artifactId>MeteoInfo</artifactId>
-    <version>3.6-SNAPSHOT</version>
+    <version>3.6.0</version>
    <packaging>pom</packaging>
    
    <parent>