archive-gh-me/MeteoInfo
1
0
Fork 0
mirror of https://github.com/meteoinfo/MeteoInfo.git synced 2026-02-01 17:20:51 +00:00
Code Issues Projects Releases Wiki Activity

update getString function

Browse Source
This commit is contained in:
wyq 2020-10-02 17:03:29 +08:00
parent 1089207700
commit 2d32ed997d
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MeteoInfoLab/milconfig.xml
View File

@ -1,30 +1,34 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\toolbox\miml\regression">
<Path OpenPath="D:\Working\MIScript\Jython\mis\io\burf">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\wind"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\polar"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\array"/>
<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\burf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\model_persistence"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\classification"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\cluster"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\regression"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\classification"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\burf"/>
</Path>
<File>
<OpenedFiles>
<OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\mnist_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\cluster\specc_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\io\burf\bufr_cma_3.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\io\burf\add_cma_lookup.py"/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\mnist_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\cluster\specc_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\io\burf\bufr_cma_3.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\io\burf\add_cma_lookup.py"/>
</RecentFiles>
</File>
<Font>

2
MeteoInfoLab/pom.xml
View File

@ -75,7 +75,7 @@
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<excludeArtifactIds>MeteoInfoLib,meteoinfo-console</excludeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<!--<excludeTransitive>true</excludeTransitive>-->
</configuration>
</execution>
</executions>

16
MeteoInfoLib/src/main/java/org/meteoinfo/math/ArrayUtil.java
View File

@ -1676,18 +1676,16 @@ public class ArrayUtil {
char[] data = (char[]) a.getStorage();
if (!encoding.toUpperCase().equals("UTF-8")) {
Charset cs = Charset.forName("UTF-8");
CharBuffer cb = CharBuffer.allocate(data.length);
cb.put(data);
cb.flip();
ByteBuffer bb = cs.encode(cb);
cs = Charset.forName(encoding);
cb = cs.decode(bb);
data = cb.array();
try {
byte[] bytes = String.valueOf(data).getBytes("UTF-8");
return new String(bytes, encoding);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
}
return new String(data);
return String.valueOf(data);
}
/**