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

update jython to version 2.7.4; update flatlaf to version 3.5.1

Browse Source
This commit is contained in:
wyq 2024-08-21 10:01:20 +08:00
parent 897a68b403
commit 6a124a2344
11 changed files with 30 additions and 15 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.2";
version = "3.9.3";
}
return version;
}

2
meteoinfo-console/pom.xml
View File

@ -20,7 +20,7 @@
<dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
<version>2.7.3</version>
<version>2.7.4</version>
</dependency>
<dependency>
<groupId>com.fifesoft</groupId>

4
meteoinfo-data/src/main/java/org/meteoinfo/data/GridArray.java
View File

@ -856,7 +856,7 @@ public class GridArray {
if (CValues.length > 1)
cDelt = CValues[1] - CValues[0];
if (floatFormat == null) {
int dNum = MIMath.getDecimalNum(min);
int dNum = this.data.getDataType().getDecimalNum();
floatFormat = "%." + String.valueOf(dNum) + "f";
}
@ -928,7 +928,7 @@ public class GridArray {
CValues = MIMath.getIntervalValues(min, max);
double cDelt = CValues[1] - CValues[0];
if (floatFormat == null) {
int dNum = MIMath.getDecimalNum(min);
int dNum = this.data.getDataType().getDecimalNum();
floatFormat = "%1$." + String.valueOf(dNum) + "f";
}

2
meteoinfo-geo/pom.xml
View File

@ -15,7 +15,7 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<freehep.version>2.4</freehep.version>
<flatlaf.version>3.5</flatlaf.version>
<flatlaf.version>3.5.1</flatlaf.version>
</properties>
<repositories>

14
meteoinfo-lab/milconfig.xml
View File

@ -1,32 +1,30 @@
<?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\meteo"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\interpolation"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/>
<Path OpenPath="D:\Working\MIScript\Jython\mis\io\grib">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\interpolate"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\radar\cinrad"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\radar"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart"/>
<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\chart\legend"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\slice"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\imshow"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\radar"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\dataconvert"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\grib"/>
</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\3d\jogl\slice\plot_cuace_3d_slice.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\io\savegrid_micaps4.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\3d\jogl\slice\plot_cuace_3d_slice.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\io\savegrid_micaps4.py"/>
</RecentFiles>
</File>
<Font>

BIN
meteoinfo-lab/pylib/mipylib/dataset/dimdatafile$py.class
View File

Binary file not shown.

1
meteoinfo-lab/pylib/mipylib/dataset/dimdatafile.py
View File

@ -39,6 +39,7 @@ class DimDataFile(object):
self.nvar = dataset.getDataInfo().getVariableNum()
self.fill_value = dataset.getMissingValue()
self.proj = dataset.getProjectionInfo()
self.projection = self.proj
self.arldata = arldata
self.bufrdata = bufrdata

BIN
meteoinfo-lab/pylib/mipylib/dataset/dimvariable$py.class
View File

Binary file not shown.

3
meteoinfo-lab/pylib/mipylib/dataset/dimvariable.py
View File

@ -48,7 +48,8 @@ class DimVariable(object):
self.dims = None
self.ndim = 0
self.attributes = None
self.proj = None if dataset is None else dataset.proj
self.proj = None if dataset is None else dataset.projection
self.projection = self.proj
def __len__(self):
len = 1

15
meteoinfo-ndarray/src/main/java/org/meteoinfo/ndarray/DataType.java
View File

@ -248,6 +248,21 @@ public enum DataType {
}
}
/**
* Get decimal number
* @return Decimal number
*/
public int getDecimalNum() {
switch (this) {
case FLOAT:
return 4;
case DOUBLE:
return 6;
default:
return 0;
}
}
///////////////////////////////////////////////////////////////////////////////////////////////
/**
* Find the DataType that matches this name.

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.2</revision>
<revision>3.9.3</revision>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.release>8</maven.compiler.release>