diff --git a/meteoinfo-chart/pom.xml b/meteoinfo-chart/pom.xml index c4bb8b6a..47511c77 100644 --- a/meteoinfo-chart/pom.xml +++ b/meteoinfo-chart/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-common/pom.xml b/meteoinfo-common/pom.xml index 127954f4..678e1f81 100644 --- a/meteoinfo-common/pom.xml +++ b/meteoinfo-common/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java b/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java index b96afdc3..ea547b38 100644 --- a/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java +++ b/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java @@ -65,7 +65,7 @@ import java.util.zip.ZipInputStream; public static String getVersion(){ String version = GlobalUtil.class.getPackage().getImplementationVersion(); if (version == null || version.equals("")) { - version = "3.1.7"; + version = "3.2.0"; } return version; } diff --git a/meteoinfo-console/pom.xml b/meteoinfo-console/pom.xml index 2dee3fdd..36153bf7 100644 --- a/meteoinfo-console/pom.xml +++ b/meteoinfo-console/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-data/pom.xml b/meteoinfo-data/pom.xml index acd3c73d..0ae5b09a 100644 --- a/meteoinfo-data/pom.xml +++ b/meteoinfo-data/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-dataframe/pom.xml b/meteoinfo-dataframe/pom.xml index 64272082..bfe69c75 100644 --- a/meteoinfo-dataframe/pom.xml +++ b/meteoinfo-dataframe/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-geo/pom.xml b/meteoinfo-geo/pom.xml index 1a96ac7d..b985a2c7 100644 --- a/meteoinfo-geo/pom.xml +++ b/meteoinfo-geo/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-geometry/pom.xml b/meteoinfo-geometry/pom.xml index 21c12b58..407194c8 100644 --- a/meteoinfo-geometry/pom.xml +++ b/meteoinfo-geometry/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-image/pom.xml b/meteoinfo-image/pom.xml index 0bb21b6b..cde92789 100644 --- a/meteoinfo-image/pom.xml +++ b/meteoinfo-image/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-lab/milconfig.xml b/meteoinfo-lab/milconfig.xml index b87b3d2a..ef9cbc84 100644 --- a/meteoinfo-lab/milconfig.xml +++ b/meteoinfo-lab/milconfig.xml @@ -1,21 +1,21 @@ - - - - + - + + + + @@ -23,12 +23,18 @@ + + + + + + @@ -36,5 +42,5 @@
- + diff --git a/meteoinfo-lab/pom.xml b/meteoinfo-lab/pom.xml index 71a257f2..5068364a 100644 --- a/meteoinfo-lab/pom.xml +++ b/meteoinfo-lab/pom.xml @@ -4,7 +4,7 @@ org.meteothink MeteoInfo - 3.1.7 + 3.2.0 meteoinfo-lab jar diff --git a/meteoinfo-lab/pylib/mipylib/dataset/dimdatafile$py.class b/meteoinfo-lab/pylib/mipylib/dataset/dimdatafile$py.class index b3a5c171..7f4cd7cb 100644 Binary files a/meteoinfo-lab/pylib/mipylib/dataset/dimdatafile$py.class and b/meteoinfo-lab/pylib/mipylib/dataset/dimdatafile$py.class differ diff --git a/meteoinfo-lab/pylib/mipylib/dataset/dimdatafile.py b/meteoinfo-lab/pylib/mipylib/dataset/dimdatafile.py index 497130c0..136decd6 100644 --- a/meteoinfo-lab/pylib/mipylib/dataset/dimdatafile.py +++ b/meteoinfo-lab/pylib/mipylib/dataset/dimdatafile.py @@ -440,7 +440,7 @@ class DimDataFile(object): var.addattr('name', v.name) else: for attr in v.attributes: - var.addattr(attr.getName(), attr.getStringValue()) + var.addattr(attr.getName(), attr.getValue()) #Create netCDF file self.ncfile.create() diff --git a/meteoinfo-lab/pylib/mipylib/dataset/dimvariable$py.class b/meteoinfo-lab/pylib/mipylib/dataset/dimvariable$py.class index 88437317..2d8865c7 100644 Binary files a/meteoinfo-lab/pylib/mipylib/dataset/dimvariable$py.class and b/meteoinfo-lab/pylib/mipylib/dataset/dimvariable$py.class differ diff --git a/meteoinfo-lab/pylib/mipylib/dataset/dimvariable.py b/meteoinfo-lab/pylib/mipylib/dataset/dimvariable.py index b71e3a65..6dffd5c1 100644 --- a/meteoinfo-lab/pylib/mipylib/dataset/dimvariable.py +++ b/meteoinfo-lab/pylib/mipylib/dataset/dimvariable.py @@ -447,12 +447,19 @@ class DimVariable(object): def addattr(self, attrname, attrvalue): if self.attributes is None: self.attributes = [] + if isinstance(attrvalue, Array): attrvalue = np.NDArray(attrvalue) + if isinstance(attrvalue, np.NDArray): if attrvalue.size == 1: attrvalue = attrvalue[0] - attr = Attribute(attrname, attrvalue) + attr = Attribute(attrname, attrvalue) + else: + attr = Attribute(attrname, attrvalue._array) + else: + attr = Attribute(attrname, attrvalue) + self.attributes.append(attr) if not self.ncvariable is None: diff --git a/meteoinfo-lab/pylib/mipylib/numeric/core/_dtype$py.class b/meteoinfo-lab/pylib/mipylib/numeric/core/_dtype$py.class index 2f583fd4..7517a126 100644 Binary files a/meteoinfo-lab/pylib/mipylib/numeric/core/_dtype$py.class and b/meteoinfo-lab/pylib/mipylib/numeric/core/_dtype$py.class differ diff --git a/meteoinfo-lab/pylib/mipylib/numeric/core/_dtype.py b/meteoinfo-lab/pylib/mipylib/numeric/core/_dtype.py index 657b4087..6740058f 100644 --- a/meteoinfo-lab/pylib/mipylib/numeric/core/_dtype.py +++ b/meteoinfo-lab/pylib/mipylib/numeric/core/_dtype.py @@ -1,7 +1,7 @@ from org.meteoinfo.ndarray import DataType as JDataType __all__ = [ - 'byte','char','int','integer','int32','int16','short','int64','long','float','float32','float64', + 'byte','char','int','integer','int32','int16','short','int64','uint','long','float','float32','float64', 'double','str','string','complex','date','datetime' ] @@ -9,6 +9,7 @@ _dtype_dict = dict(byte = JDataType.BYTE, char = JDataType.CHAR, boolean = JDataType.BOOLEAN, int = JDataType.INT, + uint = JDataType.UINT, short = JDataType.SHORT, long = JDataType.LONG, float = JDataType.FLOAT, @@ -99,7 +100,7 @@ class DataType(object): return 'b' elif self.name == 'int16' or self.name == 'short': return 'h' - elif self.name == 'int' or self.name == 'integer' or self.name == 'int32': + elif self.name == 'int' or self.name == 'integer' or self.name == 'int32' or self.name == 'uint': return 'l' elif self.name == 'int64' or self.name == 'long': return 'q' @@ -124,7 +125,7 @@ class DataType(object): if self.name == 'bool' or self.name == 'boolean': return 'b' elif self.name == 'int' or self.name == 'integer' or self.name == 'int32' or self.name == 'int16' or \ - self.name == 'short' or self.name == 'int64' or self.name == 'long': + self.name == 'uint' or self.name == 'short' or self.name == 'int64' or self.name == 'long': return 'i' elif self.name == 'float' or self.name == 'float64' or self.name == 'double': return 'f' @@ -169,6 +170,7 @@ class dtype(DataType): bool = DataType('boolean') boolean = DataType('boolean') int = DataType('int') + uint = DataType('uint') integer = DataType('int') int32 = DataType('int') int16 = DataType('short') @@ -211,6 +213,7 @@ int32 = DataType('int') int16 = DataType('short') short = DataType('short') int64 = DataType('long') +uint = DataType('uint') long = DataType('long') float = DataType('float') float32 = DataType('float') diff --git a/meteoinfo-map/pom.xml b/meteoinfo-map/pom.xml index fe1c6650..52046453 100644 --- a/meteoinfo-map/pom.xml +++ b/meteoinfo-map/pom.xml @@ -4,7 +4,7 @@ org.meteothink MeteoInfo - 3.1.7 + 3.2.0 meteoinfo-map jar diff --git a/meteoinfo-math/pom.xml b/meteoinfo-math/pom.xml index ec9535a2..dfcc89a0 100644 --- a/meteoinfo-math/pom.xml +++ b/meteoinfo-math/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-ndarray/pom.xml b/meteoinfo-ndarray/pom.xml index 8e7c9ef7..deef5009 100644 --- a/meteoinfo-ndarray/pom.xml +++ b/meteoinfo-ndarray/pom.xml @@ -5,7 +5,7 @@ org.meteothink MeteoInfo - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-projection/pom.xml b/meteoinfo-projection/pom.xml index 55450105..530f395d 100644 --- a/meteoinfo-projection/pom.xml +++ b/meteoinfo-projection/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-table/pom.xml b/meteoinfo-table/pom.xml index 997b96b5..8e6de697 100644 --- a/meteoinfo-table/pom.xml +++ b/meteoinfo-table/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/meteoinfo-ui/pom.xml b/meteoinfo-ui/pom.xml index 9baae926..b7749174 100644 --- a/meteoinfo-ui/pom.xml +++ b/meteoinfo-ui/pom.xml @@ -5,7 +5,7 @@ MeteoInfo org.meteothink - 3.1.7 + 3.2.0 4.0.0 diff --git a/pom.xml b/pom.xml index 2ba1df41..16527d91 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.meteothink MeteoInfo - 3.1.7 + 3.2.0 pom