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

add long data type for reading dbase data file

Browse Source
This commit is contained in:
wyq 2021-10-31 21:36:28 +08:00
parent 9e670574ba
commit b2208b6cd2
5 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meteoinfo-geo/src/main/java/org/meteoinfo/geo/mapdata/FrmAttriData.java
View File

@ -337,7 +337,8 @@ package org.meteoinfo.geo.mapdata;
*/
public void setLayer(VectorLayer aLayer) {
_layer = aLayer;
_dataTable = _layer.getAttributeTable().getTable().cloneTable_Field();
//_dataTable = _layer.getAttributeTable().getTable().cloneTable_Field();
_dataTable = _layer.getAttributeTable().getTable();
this.setTitle("Attribute Data - " + _layer.getLayerName());
DataTableModel dataTableModel = new DataTableModel(_dataTable);
this.jTable1.setModel(dataTableModel);

30
meteoinfo-lab/milconfig.xml
View File

@ -1,36 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\meteo">
<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\3d\jogl"/>
<RecentFolder Folder="D:\Temp\test\emission"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\netcdf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\error"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<Path OpenPath="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\plot"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\traj"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\interpolate"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\turtle"/>
<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"/>
<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\toolbox\miml\deep_learning\classification\saturn.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf_sphere.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\common_math\interpolate\griddata_kriging.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\meteo\vort_digv_2.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\meteo\vort_digv.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification\classifer_linear_1.py"/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification\saturn.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf_sphere.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\common_math\interpolate\griddata_kriging.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\meteo\vort_digv_2.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\meteo\vort_digv.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification\classifer_linear_1.py"/>
</RecentFiles>
</File>
<Font>
@ -38,5 +32,5 @@
</Font>
<LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
<Figure DoubleBuffering="true"/>
<Startup MainFormLocation="-7,0" MainFormSize="1408,820"/>
<Startup MainFormLocation="-7,-7" MainFormSize="1293,685"/>
</MeteoInfo>

4
meteoinfo-map/config.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="config.xml" Type="configurefile">
<Path OpenPath="D:\Temp\image"/>
<Path OpenPath="D:\Temp\Map\HydroRIVERS_v10_as_shp\HydroRIVERS_v10_as_shp"/>
<Font>
<TextFont FontName="YaHei Consolas Hybrid" FontSize="14"/>
<LegendFont FontName="宋体" FontSize="12"/>
@ -8,5 +8,5 @@
<ScriptLanguage Language="Jython"/>
<LookFeel LafDecorated="true" Name="FlatLightLaf"/>
<Figure DoubleBuffering="true"/>
<Startup MainFormLocation="-7,-7" MainFormSize="1293,693" ShowMeteoDataDlg="true"/>
<Startup MainFormLocation="-7,-7" MainFormSize="1293,685" ShowMeteoDataDlg="true"/>
</MeteoInfo>

3
meteoinfo-table/src/main/java/org/meteoinfo/table/AttributeTable.java
View File

@ -471,6 +471,9 @@ public final class AttributeTable implements Cloneable {
case INT:
tempObject = Integer.parseInt(tempStr.trim());
break;
case LONG:
tempObject = Long.parseLong(tempStr.trim());
break;
case FLOAT:
tempObject = Float.parseFloat(tempStr);
break;

7
meteoinfo-table/src/main/java/org/meteoinfo/table/Field.java
View File

@ -101,8 +101,11 @@ import org.meteoinfo.ndarray.DataType;
this.setDataType(DataType.FLOAT);
break;
case 'N':
if (fNumDec == 0 && fLen <= 11){
this.setDataType(DataType.INT);
if (fNumDec == 0 && fLen <= 9){
if (fLen <= 9)
this.setDataType(DataType.INT);
else
this.setDataType(DataType.LONG);
}
else
this.setDataType(DataType.DOUBLE);