to version 3.1.6

2025-12-08 20:36:05 +00:00 · 2021-09-25 23:18:40 +08:00 · 2021-09-25 23:18:40 +08:00 · 80ac8e958a
commit 80ac8e958a
parent c2d12a5e91
21 changed files with 32 additions and 34 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.1.5</version>
+        <version>3.1.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-common/pom.xml
+++ b/meteoinfo-common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.1.5</version>
+        <version>3.1.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-console/pom.xml
+++ b/meteoinfo-console/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.1.5</version>
+        <version>3.1.6</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.1.5</version>
+        <version>3.1.6</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.1.5</version>
+        <version>3.1.6</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.1.5</version>
+        <version>3.1.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/meteoinfo-geometry/pom.xml
+++ b/meteoinfo-geometry/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>MeteoInfo</artifactId>
        <groupId>org.meteothink</groupId>
-        <version>3.1.5</version>
+        <version>3.1.6</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.1.5</version>
+        <version>3.1.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- 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">
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython"/>
-    <RecentFolder Folder="D:\Working\MIScript"/>
-    <RecentFolder Folder="D:\Working\MIScript\mywork"/>
+  <Path OpenPath="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification">
    <RecentFolder Folder="D:\Working\MIScript\mywork\emission\MEIC"/>
    <RecentFolder Folder="D:\Working\MIScript\mywork\emission"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\classification"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\model_selection"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\array"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\map"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\model_selection"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification"/>
  </Path>
  <File>
    <OpenedFiles>
      <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf_sombrero.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification\classifer_iris.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\io\addfiles_datetime_1.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\io\addfiles_datetime_2.py"/>
+      <OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification\mnist_1.py"/>
+      <OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification\saturn.py"/>
    </OpenedFiles>
    <RecentFiles>
      <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf_sombrero.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification\classifer_iris.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\io\addfiles_datetime_1.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\io\addfiles_datetime_2.py"/>
+      <RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification\mnist_1.py"/>
+      <RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification\saturn.py"/>
    </RecentFiles>
  </File>
  <Font>
--- a/meteoinfo-lab/pom.xml
+++ b/meteoinfo-lab/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>org.meteothink</groupId>
        <artifactId>MeteoInfo</artifactId>
-        <version>3.1.5</version>
+        <version>3.1.6</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
@ -1370,7 +1370,7 @@ class Axes3DGL(Axes3D):

        alpha_min = kwargs.pop('alpha_min', 0.0)
        alpha_max = kwargs.pop('alpha_max', 1.0)
-        graphics = JOGLUtil.volume(data.asarray(), x.asarray(), y.asarray(), z.asarray(), cmap, \
+        graphics = JOGLUtil.volume(data.asarray(), x.asarray(), y.asarray(), z.asarray(), ls, \
                                      alpha_min, alpha_max)

        visible = kwargs.pop('visible', True)
--- a/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes$py.class
+++ b/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes$py.class
--- a/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes.py
+++ b/meteoinfo-lab/pylib/mipylib/plotlib/_mapaxes.py
@ -224,7 +224,7 @@ class MapAxes(Axes):
        
        :param x: (*float*) The location x of the scale bar.
        :param y: (*float*) The location y of the scale bar.
-        :param bartype: (*string*) Scale bar type ['scaleline_1' | 'scaleline_2' | 'alternating_bar'].
+        :param bartype: (*string*) Scale bar type ['scale_line_1' | 'scale_line_2' | 'alternating_bar'].
        :param width: (*float*) The width of the scale bar with pixel unit.
        :param height: (*float*) The height of the scale bar with pixel unit.
        :param color: (*Color*) The color of the scale bar.
--- a/meteoinfo-map/pom.xml
+++ b/meteoinfo-map/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>org.meteothink</groupId>
        <artifactId>MeteoInfo</artifactId>
-        <version>3.1.5</version>
+        <version>3.1.6</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.1.5</version>
+        <version>3.1.6</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.1.5</version>
+        <version>3.1.6</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.1.5</version>
+        <version>3.1.6</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.1.5</version>
+        <version>3.1.6</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.1.5</version>
+        <version>3.1.6</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.1.5</version>
+    <version>3.1.6</version>
    <packaging>pom</packaging>
    
    <parent>