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 3.0 branch

Browse Source
This commit is contained in:
wyq 2021-03-04 23:26:35 +08:00
parent b44995be9a
commit b8a2415501
267 changed files with 41008 additions and 52798 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/compiler.xml generated
View File

@ -6,16 +6,20 @@
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="meteoinfo-ndarray" />
<module name="MeteoInfoLab" />
<module name="MeteoInfoLib" />
<module name="meteoinfo-math" />
<module name="MeteoInfoMap" />
<module name="meteoinfo-console" />
<module name="meteoinfo-ndarray" />
<module name="meteoinfo-common" />
<module name="MeteoInfoLib" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="MeteoInfo" target="1.8" />
<module name="meteoinfo-common" target="1.8" />
<module name="meteoinfo-console" target="1.8" />
<module name="meteoinfo-math" target="1.8" />
<module name="meteoinfo-ndarray" target="1.8" />
<module name="MeteoInfoLab" target="1.8" />
<module name="MeteoInfoLib" target="1.8" />

4
.idea/encodings.xml generated
View File

@ -11,8 +11,12 @@
<file url="file://$PROJECT_DIR$/MeteoInfoMap" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/MeteoInfoMap/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/MeteoInfoMap/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-common/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-console/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-console/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-math/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-math/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-ndarray/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/meteoinfo-ndarray/src/main/resources" charset="UTF-8" />
</component>

2
.idea/modules.xml generated
View File

@ -6,7 +6,9 @@
<module fileurl="file://$PROJECT_DIR$/MeteoInfoLab/MeteoInfoLab.iml" filepath="$PROJECT_DIR$/MeteoInfoLab/MeteoInfoLab.iml" />
<module fileurl="file://$PROJECT_DIR$/MeteoInfoLib/MeteoInfoLib.iml" filepath="$PROJECT_DIR$/MeteoInfoLib/MeteoInfoLib.iml" />
<module fileurl="file://$PROJECT_DIR$/MeteoInfoMap/MeteoInfoMap.iml" filepath="$PROJECT_DIR$/MeteoInfoMap/MeteoInfoMap.iml" />
<module fileurl="file://$PROJECT_DIR$/meteoinfo-common/meteoinfo-common.iml" filepath="$PROJECT_DIR$/meteoinfo-common/meteoinfo-common.iml" />
<module fileurl="file://$PROJECT_DIR$/meteoinfo-console/meteoinfo-console.iml" filepath="$PROJECT_DIR$/meteoinfo-console/meteoinfo-console.iml" />
<module fileurl="file://$PROJECT_DIR$/meteoinfo-math/meteoinfo-math.iml" filepath="$PROJECT_DIR$/meteoinfo-math/meteoinfo-math.iml" />
<module fileurl="file://$PROJECT_DIR$/meteoinfo-ndarray/meteoinfo-ndarray.iml" filepath="$PROJECT_DIR$/meteoinfo-ndarray/meteoinfo-ndarray.iml" />
</modules>
</component>

9
MeteoInfoLab/MeteoInfoLab.iml
View File

@ -22,6 +22,15 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="MeteoInfoLib" />
<orderEntry type="module" module-name="meteoinfo-math" />
<orderEntry type="module" module-name="meteoinfo-common" />
<orderEntry type="library" name="Maven: com.google.guava:guava:28.0-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.8.1" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.2" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.17" level="project" />
<orderEntry type="module" module-name="meteoinfo-ndarray" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.4.1" level="project" />

17
MeteoInfoLab/milconfig.xml
View File

@ -1,29 +1,32 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\netcdf">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\linalg"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\satellite\calipso"/>
<Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\burf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\grib"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\radar"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\wrf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\interpolation"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\satellite"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\hdf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\satellite\modis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\netcdf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/>
<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"/>
</Path>
<File>
<OpenedFiles>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\city_streamslice_zslice_index.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\netcdf\dimension_reverse.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\meteo\hdivg.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot_cuace_3d_particles_relief.py"/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\city_streamslice_zslice_index.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\netcdf\dimension_reverse.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\meteo\hdivg.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot_cuace_3d_particles_relief.py"/>
</RecentFiles>
</File>
<Font>

BIN
MeteoInfoLab/pylib/mipylib/dataset/__init__$py.class
View File

Binary file not shown.

1
MeteoInfoLab/pylib/mipylib/dataset/__init__.py
View File

@ -1,5 +1,6 @@
import midata
from .midata import *
import ncutil
from .dimvariable import DimVariable
__all__ = ['ncutil', 'DimVariable']

BIN
MeteoInfoLab/pylib/mipylib/dataset/dimvariable$py.class
View File

Binary file not shown.

2
MeteoInfoLab/pylib/mipylib/dataset/dimvariable.py
View File

@ -6,7 +6,7 @@
#-----------------------------------------------------
from org.meteoinfo.ndarray import Dimension, DimensionType, Range, Array, MAMath
from org.meteoinfo.math import ArrayMath, ArrayUtil
from org.meteoinfo.global import PointD
from org.meteoinfo.common import PointD
from org.meteoinfo.projection import KnownCoordinateSystems, Reproject
from org.meteoinfo.data.meteodata import Attribute
from ucar.nc2 import Attribute as NCAttribute

BIN
MeteoInfoLab/pylib/mipylib/geolib/geoutil$py.class
View File

Binary file not shown.

2
MeteoInfoLab/pylib/mipylib/geolib/geoutil.py
View File

@ -6,7 +6,7 @@
#-----------------------------------------------------
from org.meteoinfo.shape import ShapeUtil, PointShape
from org.meteoinfo.global import PointD
from org.meteoinfo.common import PointD
import mipylib.numeric as np
__all__ = [

BIN
MeteoInfoLab/pylib/mipylib/geolib/migeo$py.class
View File

Binary file not shown.

4
MeteoInfoLab/pylib/mipylib/geolib/migeo.py
View File

@ -16,8 +16,8 @@ from org.meteoinfo.math import ArrayMath, ArrayUtil
from org.meteoinfo.data.mapdata import MapDataManage, AttributeTable
from org.meteoinfo.projection import KnownCoordinateSystems, Reproject
from org.meteoinfo.projection.info import ProjectionInfo
from org.meteoinfo.global import PointD
from org.meteoinfo.io import IOUtil
from org.meteoinfo.common import PointD
from org.meteoinfo.common.io import IOUtil
from org.meteoinfo.geoprocess.analysis import ResampleMethods
from milayer import MILayer

BIN
MeteoInfoLab/pylib/mipylib/miutil$py.class
View File

Binary file not shown.

4
MeteoInfoLab/pylib/mipylib/miutil.py
View File

@ -5,8 +5,8 @@
# Note: Jython
#-----------------------------------------------------
from org.meteoinfo.global import PointD
from org.meteoinfo.global.util import JDateUtil
from org.meteoinfo.common import PointD
from org.meteoinfo.common.util import JDateUtil
from org.meteoinfo.ndarray import Complex
from org.meteoinfo.shape import PointShape, ShapeUtil
from java.util import Locale

BIN
MeteoInfoLab/pylib/mipylib/numeric/core/dimarray$py.class
View File

Binary file not shown.

2
MeteoInfoLab/pylib/mipylib/numeric/core/dimarray.py
View File

@ -9,7 +9,7 @@ from org.meteoinfo.data import GridData, GridArray
from org.meteoinfo.math import ArrayMath, ArrayUtil
from org.meteoinfo.geoprocess import GeometryUtil
from org.meteoinfo.geoprocess.analysis import ResampleMethods
from org.meteoinfo.global import PointD
from org.meteoinfo.common import PointD
from org.meteoinfo.ndarray import Array, Range, MAMath, DataType, Dimension, DimensionType
from multiarray import NDArray
import math

BIN
MeteoInfoLab/pylib/mipylib/plotlib/_axes$py.class
View File

Binary file not shown.

2
MeteoInfoLab/pylib/mipylib/plotlib/_axes.py
View File

@ -14,7 +14,7 @@ from org.meteoinfo.chart.axis import Axis, LonLatAxis, TimeAxis, LogAxis
from org.meteoinfo.legend import LegendManage, BarBreak, PolygonBreak, PolylineBreak, \
PointBreak, LineStyles, PointStyle, LegendScheme, LegendType
from org.meteoinfo.shape import ShapeTypes, Graphic, GraphicCollection
from org.meteoinfo.global import MIMath, Extent
from org.meteoinfo.common import MIMath, Extent
from org.meteoinfo.layer import MapLayer
from java.awt import Font, Color, BasicStroke

BIN
MeteoInfoLab/pylib/mipylib/plotlib/_mapaxes$py.class
View File

Binary file not shown.

2
MeteoInfoLab/pylib/mipylib/plotlib/_mapaxes.py
View File

@ -16,7 +16,7 @@ from org.meteoinfo.map import MapView
from org.meteoinfo.legend import BreakTypes, LegendManage, LegendScheme, LegendType
from org.meteoinfo.shape import Shape, PolylineShape, PolygonShape, ShapeTypes, Graphic
from org.meteoinfo.projection.info import ProjectionInfo
from org.meteoinfo.global import Extent
from org.meteoinfo.common import Extent
from org.meteoinfo.layer import LayerTypes, WebMapLayer
from org.meteoinfo.data.mapdata.webmap import WebMapProvider
from org.meteoinfo.layout import ScaleBarType

2
MeteoInfoLab/src/main/java/org/meteoinfo/laboratory/MeteoInfoLab.java
View File

@ -21,9 +21,9 @@ import com.formdev.flatlaf.FlatDarculaLaf;
import com.formdev.flatlaf.FlatDarkLaf;
import com.formdev.flatlaf.FlatIntelliJLaf;
import com.formdev.flatlaf.FlatLightLaf;
import org.meteoinfo.common.util.GlobalUtil;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.util.FontUtil;
import org.meteoinfo.global.util.GlobalUtil;
import org.meteoinfo.laboratory.gui.FrmMain;
import org.meteoinfo.console.jython.MyPythonInterpreter;
import org.python.core.Py;

2
MeteoInfoLab/src/main/java/org/meteoinfo/laboratory/gui/EditorDockable.java
View File

@ -39,11 +39,11 @@ import com.formdev.flatlaf.extras.FlatSVGIcon;
import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
import org.fife.ui.rsyntaxtextarea.TextEditorPane;
import org.fife.ui.rsyntaxtextarea.Theme;
import org.meteoinfo.common.GenericFileFilter;
import org.meteoinfo.console.editor.JTextAreaPrintStream;
import org.meteoinfo.console.editor.JTextAreaWriter;
import org.meteoinfo.console.editor.MITextEditorPane;
import org.meteoinfo.console.editor.TextEditor;
import org.meteoinfo.global.GenericFileFilter;
import org.meteoinfo.console.jython.JIntrospect;
import org.meteoinfo.ui.ButtonTabComponent;
import org.python.util.PythonInterpreter;

2
MeteoInfoLab/src/main/java/org/meteoinfo/laboratory/gui/FileExplorer.java
View File

@ -22,7 +22,7 @@ import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
import com.formdev.flatlaf.extras.FlatSVGIcon;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.common.util.JDateUtil;
import org.meteoinfo.laboratory.event.CurrentPathChangedEvent;
import org.meteoinfo.laboratory.event.ICurrentPathChangedListener;
import org.meteoinfo.table.IconRenderer;

3
MeteoInfoLab/src/main/java/org/meteoinfo/laboratory/gui/FrmAbout.java
View File

@ -4,6 +4,8 @@
*/
package org.meteoinfo.laboratory.gui;
import org.meteoinfo.common.util.GlobalUtil;
import java.awt.Cursor;
import java.awt.Desktop;
import java.io.IOException;
@ -11,7 +13,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.meteoinfo.global.util.GlobalUtil;
/**
*

3
MeteoInfoLab/src/main/java/org/meteoinfo/laboratory/gui/FrmAppsManager.java
View File

@ -15,9 +15,10 @@ import java.util.logging.Logger;
import javax.swing.DefaultListModel;
import javax.swing.JFrame;
import javax.xml.parsers.ParserConfigurationException;
import org.meteoinfo.common.util.GlobalUtil;
import org.meteoinfo.laboratory.application.Application;
import org.meteoinfo.laboratory.application.AppCollection;
import org.meteoinfo.global.util.GlobalUtil;
import org.meteoinfo.plugin.IPlugin;
import org.meteoinfo.ui.CheckBoxListEntry;
import org.python.core.PyObject;

9
MeteoInfoLib/MeteoInfoLib.iml
View File

@ -12,6 +12,15 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="meteoinfo-math" />
<orderEntry type="module" module-name="meteoinfo-common" />
<orderEntry type="library" name="Maven: com.google.guava:guava:28.0-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.8.1" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.2" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.17" level="project" />
<orderEntry type="module" module-name="meteoinfo-ndarray" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.4.1" level="project" />

5
MeteoInfoLib/pom.xml
View File

@ -47,6 +47,11 @@
</repositories>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>meteoinfo-math</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>meteoinfo-ndarray</artifactId>

6718
MeteoInfoLib/src/main/java/org/meteoinfo/bak/ArrayMath.java
View File

File diff suppressed because it is too large Load Diff

5546
MeteoInfoLib/src/main/java/org/meteoinfo/bak/ArrayUtil.java
View File

File diff suppressed because it is too large Load Diff

2
MeteoInfoLib/src/main/java/org/meteoinfo/chart/Chart.java
View File

@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import org.meteoinfo.chart.plot.MapPlot;
import org.meteoinfo.chart.plot.Plot;
import org.meteoinfo.common.PointF;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.PointF;
/**
*

4
MeteoInfoLib/src/main/java/org/meteoinfo/chart/ChartColorBar.java
View File

@ -17,10 +17,10 @@ import java.util.ArrayList;
import java.util.List;
import org.meteoinfo.chart.plot.XAlign;
import org.meteoinfo.chart.plot.YAlign;
import org.meteoinfo.common.PointD;
import org.meteoinfo.common.PointF;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.PointD;
import org.meteoinfo.global.PointF;
import org.meteoinfo.legend.ColorBreak;
import org.meteoinfo.legend.LegendScheme;
import org.meteoinfo.legend.LegendType;

3
MeteoInfoLib/src/main/java/org/meteoinfo/chart/ChartElement.java
View File

@ -13,11 +13,12 @@
*/
package org.meteoinfo.chart;
import org.meteoinfo.common.PointF;
import org.meteoinfo.global.event.ILocationChangedListener;
import org.meteoinfo.global.event.ISizeChangedListener;
import org.meteoinfo.global.event.LocationChangedEvent;
import org.meteoinfo.global.event.SizeChangedEvent;
import org.meteoinfo.global.PointF;
import java.awt.Color;
import java.awt.Rectangle;
import javax.swing.event.EventListenerList;

2
MeteoInfoLib/src/main/java/org/meteoinfo/chart/ChartLegend.java
View File

@ -13,8 +13,8 @@
*/
package org.meteoinfo.chart;
import org.meteoinfo.common.PointF;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.PointF;
import org.meteoinfo.legend.ColorBreak;
import org.meteoinfo.legend.LegendScheme;
import org.meteoinfo.legend.PointBreak;

4
MeteoInfoLib/src/main/java/org/meteoinfo/chart/ChartNorthArrow.java
View File

@ -13,9 +13,9 @@
*/
package org.meteoinfo.chart;
import com.l2fprod.common.beans.BaseBeanInfo;
import org.meteoinfo.common.PointF;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.PointF;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Graphics2D;

6
MeteoInfoLib/src/main/java/org/meteoinfo/chart/ChartPanel.java
View File

@ -81,11 +81,11 @@ import org.meteoinfo.chart.plot.AbstractPlot2D;
import org.meteoinfo.chart.plot.Plot3D;
import org.meteoinfo.chart.plot.PlotType;
import org.meteoinfo.chart.plot3d.Projector;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.GenericFileFilter;
import org.meteoinfo.common.PointF;
import org.meteoinfo.ndarray.DataType;
import org.meteoinfo.data.mapdata.Field;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.GenericFileFilter;
import org.meteoinfo.global.PointF;
import org.meteoinfo.image.ImageUtil;
import org.meteoinfo.layer.LayerTypes;
import org.meteoinfo.layer.MapLayer;

2
MeteoInfoLib/src/main/java/org/meteoinfo/chart/ChartScaleBar.java
View File

@ -15,7 +15,7 @@ import java.awt.RenderingHints;
import java.awt.geom.AffineTransform;
import java.awt.geom.Line2D;
import org.meteoinfo.chart.plot.MapPlot;
import org.meteoinfo.global.PointF;
import org.meteoinfo.common.PointF;
import org.meteoinfo.layout.ScaleBarType;
import org.meteoinfo.layout.ScaleBarUnits;

2
MeteoInfoLib/src/main/java/org/meteoinfo/chart/ChartText.java
View File

@ -18,8 +18,8 @@ import java.util.Arrays;
import java.util.List;
import org.meteoinfo.chart.plot.XAlign;
import org.meteoinfo.chart.plot.YAlign;
import org.meteoinfo.common.Extent;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.Extent;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.meteoinfo.shape.Shape;

2
MeteoInfoLib/src/main/java/org/meteoinfo/chart/ChartText3D.java
View File

@ -12,8 +12,8 @@ package org.meteoinfo.chart;
import java.awt.Point;
import org.meteoinfo.chart.plot3d.Projector;
import org.meteoinfo.common.Extent3D;
import org.meteoinfo.data.DataMath;
import org.meteoinfo.global.Extent3D;
import org.meteoinfo.shape.PointZ;
/**

3
MeteoInfoLib/src/main/java/org/meteoinfo/chart/ChartWindArrow.java
View File

@ -11,9 +11,10 @@ import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.geom.Rectangle2D;
import org.meteoinfo.common.PointF;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.PointF;
import org.meteoinfo.layer.VectorLayer;
import org.meteoinfo.legend.ArrowBreak;
import org.meteoinfo.shape.GraphicCollection;

4
MeteoInfoLib/src/main/java/org/meteoinfo/chart/axis/Axis.java
View File

@ -23,10 +23,10 @@ import org.meteoinfo.chart.Location;
import org.meteoinfo.chart.plot.AbstractPlot2D;
import org.meteoinfo.chart.plot.XAlign;
import org.meteoinfo.chart.plot.YAlign;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.util.JDateUtil;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.legend.LineStyles;
import org.meteoinfo.ndarray.util.BigDecimalUtil;

2
MeteoInfoLib/src/main/java/org/meteoinfo/chart/axis/LogAxis.java
View File

@ -8,8 +8,8 @@ package org.meteoinfo.chart.axis;
import java.util.ArrayList;
import java.util.List;
import org.meteoinfo.chart.ChartText;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.MIMath;
/**
*

2
MeteoInfoLib/src/main/java/org/meteoinfo/chart/axis/ProjLonLatAxis.java
View File

@ -8,8 +8,8 @@ package org.meteoinfo.chart.axis;
import java.util.ArrayList;
import java.util.List;
import org.meteoinfo.chart.ChartText;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.projection.KnownCoordinateSystems;
import org.meteoinfo.projection.info.ProjectionInfo;
import org.meteoinfo.projection.Reproject;

3
MeteoInfoLib/src/main/java/org/meteoinfo/chart/axis/TimeAxis.java
View File

@ -8,10 +8,9 @@ package org.meteoinfo.chart.axis;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import org.meteoinfo.chart.ChartText;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.common.util.JDateUtil;
/**
*

3
MeteoInfoLib/src/main/java/org/meteoinfo/chart/jogl/GLChartPanel.java
View File

@ -18,7 +18,6 @@ import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.imageio.*;
import javax.imageio.metadata.IIOInvalidTreeException;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
import javax.imageio.stream.ImageOutputStream;
@ -26,7 +25,7 @@ import javax.swing.*;
import org.meteoinfo.chart.IChartPanel;
import org.meteoinfo.chart.MouseMode;
import org.meteoinfo.global.Extent3D;
import org.meteoinfo.common.Extent3D;
import org.meteoinfo.image.ImageUtil;
import org.w3c.dom.Element;

7
MeteoInfoLib/src/main/java/org/meteoinfo/chart/jogl/IsosurfaceGraphics.java
View File

@ -8,8 +8,9 @@ package org.meteoinfo.chart.jogl;
import java.util.ArrayList;
import java.util.List;
import org.meteoinfo.chart.plot3d.GraphicCollection3D;
import org.meteoinfo.global.Extent3D;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.common.Extent3D;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.geoprocess.GeometryUtil;
import org.meteoinfo.shape.PointZ;
/**
@ -49,7 +50,7 @@ public class IsosurfaceGraphics extends GraphicCollection3D {
*/
public void addTriangle(PointZ[] triangle) {
this.triangles.add(triangle);
Extent3D extent = MIMath.getExtent(triangle);
Extent3D extent = GeometryUtil.getExtent(triangle);
if (this.triangles.size() == 1)
this.setExtent(extent);
else

4
MeteoInfoLib/src/main/java/org/meteoinfo/chart/jogl/JOGLUtil.java
View File

@ -15,8 +15,8 @@ import java.util.Random;
import org.meteoinfo.chart.jogl.mc.MarchingCubes;
import org.meteoinfo.chart.jogl.mc.CallbackMC;
import org.meteoinfo.chart.plot3d.GraphicCollection3D;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.Extent3D;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.Extent3D;
import org.meteoinfo.layer.ImageLayer;
import org.meteoinfo.legend.ColorBreak;
import org.meteoinfo.legend.LegendScheme;

13
MeteoInfoLib/src/main/java/org/meteoinfo/chart/jogl/Plot3DGL.java
View File

@ -6,15 +6,12 @@
package org.meteoinfo.chart.jogl;
import com.jogamp.opengl.*;
import com.jogamp.opengl.fixedfunc.GLLightingFunc;
import com.jogamp.opengl.glu.GLU;
import com.jogamp.opengl.glu.GLUquadric;
import com.jogamp.opengl.glu.GLUtessellator;
import com.jogamp.opengl.glu.GLUtessellatorCallback;
import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil;
import com.jogamp.opengl.util.awt.TextRenderer;
import com.jogamp.opengl.util.texture.Texture;
import com.jogamp.opengl.util.texture.TextureCoords;
import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
import com.jogamp.opengl.util.gl2.GLUT;
import com.jogamp.opengl.math.VectorUtil;
@ -33,7 +30,6 @@ import java.util.logging.Logger;
import javax.imageio.ImageIO;
import javax.swing.JFrame;
import jogamp.opengl.glu.tessellator.GLUtessellatorImpl;
import org.meteoinfo.chart.ChartColorBar;
import org.meteoinfo.chart.ChartLegend;
import org.meteoinfo.chart.ChartText;
@ -41,23 +37,18 @@ import org.meteoinfo.chart.ChartText3D;
import org.meteoinfo.chart.Margin;
import org.meteoinfo.chart.axis.Axis;
import org.meteoinfo.chart.jogl.tessellator.Primitive;
import org.meteoinfo.chart.jogl.tessellator.PrimitiveTessellator;
import org.meteoinfo.chart.jogl.tessellator.TessPolygon;
import org.meteoinfo.chart.jogl.tessellator.TriangleTessellator;
import org.meteoinfo.chart.plot.*;
import org.meteoinfo.chart.plot3d.GraphicCollection3D;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.Extent3D;
import org.meteoinfo.data.Dataset;
import org.meteoinfo.geoprocess.GeometryUtil;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.Extent3D;
import org.meteoinfo.global.util.FontUtil;
import org.meteoinfo.legend.*;
import org.meteoinfo.math.meteo.MeteoMath;
import org.meteoinfo.shape.*;
import static org.meteoinfo.shape.ShapeTypes.PointZ;
/**
*
* @author wyq

2
MeteoInfoLib/src/main/java/org/meteoinfo/chart/jogl/SurfaceGraphics.java
View File

@ -6,7 +6,7 @@
package org.meteoinfo.chart.jogl;
import org.meteoinfo.chart.plot3d.GraphicCollection3D;
import org.meteoinfo.global.Extent3D;
import org.meteoinfo.common.Extent3D;
import org.meteoinfo.legend.ColorBreak;
import org.meteoinfo.legend.LegendScheme;
import org.meteoinfo.legend.PolygonBreak;

2
MeteoInfoLib/src/main/java/org/meteoinfo/chart/jogl/Transform.java
View File

@ -1,6 +1,6 @@
package org.meteoinfo.chart.jogl;
import org.meteoinfo.global.Extent3D;
import org.meteoinfo.common.Extent3D;
import org.meteoinfo.shape.PointZ;
public class Transform {

6
MeteoInfoLib/src/main/java/org/meteoinfo/chart/plot/AbstractPlot2D.java
View File

@ -27,11 +27,9 @@ import org.meteoinfo.chart.Location;
import org.meteoinfo.chart.Margin;
import org.meteoinfo.chart.axis.Axis;
import org.meteoinfo.chart.axis.LogAxis;
import static org.meteoinfo.chart.plot.Plot.MINIMUM_HEIGHT_TO_DRAW;
import static org.meteoinfo.chart.plot.Plot.MINIMUM_WIDTH_TO_DRAW;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.PointF;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.PointF;
/**
*

25
MeteoInfoLib/src/main/java/org/meteoinfo/chart/plot/GraphicFactory.java
View File

@ -18,20 +18,19 @@ import java.util.List;
import org.apache.commons.lang3.ArrayUtils;
import org.meteoinfo.chart.ChartText;
import org.meteoinfo.chart.plot3d.GraphicCollection3D;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.math.ArrayUtil;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.Extent3D;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.PointD;
import org.meteoinfo.data.GridArray;
import org.meteoinfo.data.GridData;
import org.meteoinfo.data.XYListDataset;
import org.meteoinfo.data.analysis.Statistics;
import org.meteoinfo.drawing.ContourDraw;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.geoprocess.GeometryUtil;
import org.meteoinfo.legend.PointStyle;
import org.meteoinfo.geoprocess.GeoComputation;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.Extent3D;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.global.PointD;
import org.meteoinfo.layer.ImageLayer;
import org.meteoinfo.layer.VectorLayer;
import org.meteoinfo.legend.ArrowLineBreak;
@ -48,6 +47,8 @@ import org.meteoinfo.legend.PointBreak;
import org.meteoinfo.legend.PolygonBreak;
import org.meteoinfo.legend.PolylineBreak;
import org.meteoinfo.legend.StreamlineBreak;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.math.ArrayUtil;
import org.meteoinfo.math.meteo.MeteoMath;
import org.meteoinfo.ndarray.*;
import org.meteoinfo.ndarray.util.BigDecimalUtil;
@ -3100,7 +3101,7 @@ public class GraphicFactory {
}
aPolyline.setPoints(pList);
aPolyline.setValue(v);
aPolyline.setExtent(MIMath.getPointsExtent(pList));
aPolyline.setExtent(GeometryUtil.getPointsExtent(pList));
switch (ls.getLegendType()) {
case UniqueValue:
@ -3216,7 +3217,7 @@ public class GraphicFactory {
}
aPolyline.setPoints(pList);
aPolyline.setValue(v);
aPolyline.setExtent(MIMath.getPointsExtent(pList));
aPolyline.setExtent(GeometryUtil.getPointsExtent(pList));
cbb = ls.findLegendBreak(v);
graphics.add(new Graphic(aPolyline, cbb));
}
@ -3325,7 +3326,7 @@ public class GraphicFactory {
}
aPolyline.setPoints(pList);
aPolyline.setValue(v);
aPolyline.setExtent(MIMath.getPointsExtent(pList));
aPolyline.setExtent(GeometryUtil.getPointsExtent(pList));
cbb = ls.findLegendBreak(v);
graphics.add(new Graphic(aPolyline, cbb));
}
@ -3391,7 +3392,7 @@ public class GraphicFactory {
}
PolygonShape aPolygonShape = new PolygonShape();
aPolygonShape.setPoints(pList);
aPolygonShape.setExtent(MIMath.getPointsExtent(pList));
aPolygonShape.setExtent(GeometryUtil.getPointsExtent(pList));
aPolygonShape.lowValue = v;
if (poly.HasHoles()) {
for (PolyLine holeLine : poly.HoleLines) {
@ -3555,7 +3556,7 @@ public class GraphicFactory {
}
PolygonZShape aPolygonShape = new PolygonZShape();
aPolygonShape.setPoints(pList);
aPolygonShape.setExtent(MIMath.getPointsExtent(pList));
aPolygonShape.setExtent(GeometryUtil.getPointsExtent(pList));
aPolygonShape.lowValue = v;
if (poly.HasHoles()) {
switch (zdir) {
@ -3734,7 +3735,7 @@ public class GraphicFactory {
}
PolygonZShape aPolygonShape = new PolygonZShape();
aPolygonShape.setPoints(pList);
aPolygonShape.setExtent(MIMath.getPointsExtent(pList));
aPolygonShape.setExtent(GeometryUtil.getPointsExtent(pList));
aPolygonShape.lowValue = v;
if (poly.HasHoles()) {
switch (zdir) {

9
MeteoInfoLib/src/main/java/org/meteoinfo/chart/plot/MapPlot.java
View File

@ -28,15 +28,14 @@ import org.meteoinfo.chart.ChartScaleBar;
import org.meteoinfo.chart.ChartText;
import org.meteoinfo.chart.Location;
import org.meteoinfo.chart.axis.LonLatAxis;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.PointD;
import org.meteoinfo.common.PointF;
import org.meteoinfo.data.Dataset;
import org.meteoinfo.data.mapdata.webmap.IWebMapPanel;
import org.meteoinfo.data.mapdata.webmap.TileLoadListener;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.Direction;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.global.PointD;
import org.meteoinfo.global.PointF;
import org.meteoinfo.layer.LayerCollection;
import org.meteoinfo.layer.MapLayer;
import org.meteoinfo.legend.LabelBreak;

3
MeteoInfoLib/src/main/java/org/meteoinfo/chart/plot/PiePlot.java
View File

@ -11,8 +11,9 @@ import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
import org.meteoinfo.common.PointF;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.PointF;
import org.meteoinfo.legend.ColorBreak;
import org.meteoinfo.legend.PolygonBreak;
import org.meteoinfo.shape.ArcShape;

15
MeteoInfoLib/src/main/java/org/meteoinfo/chart/plot/Plot2D.java
View File

@ -35,16 +35,17 @@ import org.meteoinfo.chart.ChartLegend;
import org.meteoinfo.chart.ChartText;
import org.meteoinfo.chart.axis.LogAxis;
import org.meteoinfo.chart.axis.TimeAxis;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.PointD;
import org.meteoinfo.common.PointF;
import org.meteoinfo.data.Dataset;
import org.meteoinfo.drawing.Draw;
import static org.meteoinfo.drawing.Draw.getHatchImage;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.global.PointD;
import org.meteoinfo.global.PointF;
import org.meteoinfo.geoprocess.GeometryUtil;
import org.meteoinfo.legend.ArrowBreak;
import org.meteoinfo.legend.BarBreak;
import static org.meteoinfo.legend.BreakTypes.LabelBreak;
import org.meteoinfo.legend.ColorBreak;
import org.meteoinfo.legend.ColorBreakCollection;
import org.meteoinfo.legend.LabelBreak;
@ -767,7 +768,7 @@ public class Plot2D extends AbstractPlot2D {
aY = (float) sXY[1];
points.add(new PointD(aX, aY));
}
Extent aExtent = MIMath.getPointsExtent(points);
Extent aExtent = GeometryUtil.getPointsExtent(points);
rect.x = (int) aExtent.minX;
rect.y = (int) aExtent.minY;
rect.width = (int) (aExtent.maxX - aExtent.minX);
@ -779,7 +780,7 @@ public class Plot2D extends AbstractPlot2D {
}
private List<PointF> drawPolygon(Graphics2D g, Polygon aPG, PolygonBreak aPGB,
boolean isSelected, Rectangle2D area) {
boolean isSelected, Rectangle2D area) {
int len = aPG.getOutLine().size();
GeneralPath path = new GeneralPath(GeneralPath.WIND_EVEN_ODD, len);
PointD wPoint;

9
MeteoInfoLib/src/main/java/org/meteoinfo/chart/plot/Plot3D.java
View File

@ -10,7 +10,6 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
@ -31,13 +30,13 @@ import org.meteoinfo.chart.axis.Axis;
import org.meteoinfo.chart.axis.LogAxis;
import org.meteoinfo.chart.plot3d.GraphicCollection3D;
import org.meteoinfo.chart.plot3d.Projector;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.Extent3D;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.PointF;
import org.meteoinfo.data.DataMath;
import org.meteoinfo.data.Dataset;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.Extent3D;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.global.PointF;
import org.meteoinfo.legend.*;
import org.meteoinfo.math.sort.QuickSort;
import org.meteoinfo.shape.*;

4
MeteoInfoLib/src/main/java/org/meteoinfo/chart/plot/PolarPlot.java
View File

@ -16,11 +16,11 @@ import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.List;
import org.meteoinfo.chart.Margin;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.drawing.Draw;
import static org.meteoinfo.drawing.Draw.getDashPattern;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.legend.LineStyles;
import org.meteoinfo.shape.Graphic;
import org.meteoinfo.shape.GraphicCollection;

6
MeteoInfoLib/src/main/java/org/meteoinfo/chart/plot/XY1DPlot.java
View File

@ -18,6 +18,9 @@ import java.util.logging.Logger;
import org.meteoinfo.chart.ChartLegend;
import org.meteoinfo.chart.Location;
import org.meteoinfo.chart.axis.TimeAxis;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.PointF;
import org.meteoinfo.data.Dataset;
import org.meteoinfo.data.XYDataset;
import org.meteoinfo.data.XYErrorSeriesData;
@ -25,9 +28,6 @@ import org.meteoinfo.data.XYListDataset;
import org.meteoinfo.data.XYSeriesData;
import org.meteoinfo.data.XYYSeriesData;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.global.PointF;
import org.meteoinfo.global.colors.ColorUtil;
import org.meteoinfo.legend.ColorBreak;
import org.meteoinfo.legend.LegendScheme;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/DataMath.java
View File

@ -14,9 +14,10 @@
package org.meteoinfo.data;
import java.util.ArrayList;
import org.meteoinfo.global.MIMath;
import java.util.Arrays;
import java.util.List;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.table.ColumnData;
/**

2
MeteoInfoLib/src/main/java/org/meteoinfo/data/DataRange.java
View File

@ -5,7 +5,7 @@
*/
package org.meteoinfo.data;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.common.MIMath;
/**
*

9
MeteoInfoLib/src/main/java/org/meteoinfo/data/GridArray.java
View File

@ -13,16 +13,13 @@
*/
package org.meteoinfo.data;
import org.meteoinfo.math.ArrayUtil;
import org.meteoinfo.math.ArrayMath;
import java.io.BufferedWriter;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.MIMath;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
@ -31,6 +28,10 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JOptionPane;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.math.ArrayUtil;
import org.meteoinfo.ndarray.*;
import org.meteoinfo.ndarray.util.BigDecimalUtil;
import org.meteoinfo.data.meteodata.GridDataSetting;

8
MeteoInfoLib/src/main/java/org/meteoinfo/data/GridData.java
View File

@ -14,10 +14,12 @@
package org.meteoinfo.data;
import java.io.BufferedReader;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.PointD;
import org.meteoinfo.geoprocess.GeoComputation;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.global.PointD;
import java.io.BufferedWriter;
import java.io.DataOutputStream;
import java.io.File;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/SeriesUtil.java
View File

@ -5,10 +5,11 @@
*/
package org.meteoinfo.data;
import org.meteoinfo.math.ArrayMath;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.ndarray.Array;
/**

8
MeteoInfoLib/src/main/java/org/meteoinfo/data/StationData.java
View File

@ -17,17 +17,19 @@ import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.PointD;
import org.meteoinfo.data.meteodata.GridDataSetting;
import org.meteoinfo.geoprocess.analysis.InterpolationSetting;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.MIMath;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.meteoinfo.geoprocess.GeoComputation;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.PointD;
import org.meteoinfo.layer.VectorLayer;
import org.meteoinfo.projection.info.ProjectionInfo;
import org.meteoinfo.projection.Reproject;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/StationTableData.java
View File

@ -13,7 +13,8 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JOptionPane;
import org.meteoinfo.global.util.GlobalUtil;
import org.meteoinfo.common.util.GlobalUtil;
import org.meteoinfo.ndarray.DataType;
import org.meteoinfo.projection.KnownCoordinateSystems;
import org.meteoinfo.projection.info.ProjectionInfo;

5
MeteoInfoLib/src/main/java/org/meteoinfo/data/TableData.java
View File

@ -26,9 +26,10 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.swing.JOptionPane;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.util.GlobalUtil;
import org.meteoinfo.data.analysis.Statistics;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.global.util.GlobalUtil;
import org.meteoinfo.ndarray.DataType;
import org.meteoinfo.table.DataColumn;
import org.meteoinfo.table.DataRow;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/TableUtil.java
View File

@ -15,8 +15,9 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.meteoinfo.common.util.GlobalUtil;
import org.meteoinfo.data.analysis.Statistics;
import org.meteoinfo.global.util.GlobalUtil;
import org.meteoinfo.table.DataColumn;
import org.meteoinfo.table.DataRow;
import org.meteoinfo.table.DataTable;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/TimeTableData.java
View File

@ -17,11 +17,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.swing.JOptionPane;
import org.meteoinfo.common.util.GlobalUtil;
import org.meteoinfo.data.analysis.Statistics;
import org.meteoinfo.table.DataColumn;
import org.meteoinfo.table.DataRow;
import org.meteoinfo.table.DataTable;
import org.meteoinfo.global.util.GlobalUtil;
import org.meteoinfo.ndarray.DataType;
/**

5
MeteoInfoLib/src/main/java/org/meteoinfo/data/XYArrayDataset.java
View File

@ -5,11 +5,12 @@
*/
package org.meteoinfo.data;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.MIMath;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.MIMath;
/**
*

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/XYDataset.java
View File

@ -5,8 +5,9 @@
*/
package org.meteoinfo.data;
import org.meteoinfo.common.Extent;
import java.util.List;
import org.meteoinfo.global.Extent;
/**
*

5
MeteoInfoLib/src/main/java/org/meteoinfo/data/XYListDataset.java
View File

@ -7,8 +7,9 @@ package org.meteoinfo.data;
import java.util.ArrayList;
import java.util.List;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.ndarray.Array;
/**

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/XYSeriesData.java
View File

@ -7,7 +7,8 @@ package org.meteoinfo.data;
import java.util.ArrayList;
import java.util.List;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.common.MIMath;
import ucar.ma2.Array;
/**

2
MeteoInfoLib/src/main/java/org/meteoinfo/data/dataframe/Column.java
View File

@ -7,8 +7,8 @@ package org.meteoinfo.data.dataframe;
import java.text.DecimalFormat;
import org.joda.time.DateTime;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.ndarray.Array;
import org.meteoinfo.ndarray.DataType;

10
MeteoInfoLib/src/main/java/org/meteoinfo/data/dataframe/DataFrame.java
View File

@ -28,9 +28,9 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.math.ArrayUtil;
import org.meteoinfo.common.util.GlobalUtil;
import org.meteoinfo.common.util.JDateUtil;
import org.meteoinfo.common.util.TypeUtils;
import org.meteoinfo.data.dataframe.impl.Aggregation;
import org.meteoinfo.data.dataframe.impl.Function;
import org.meteoinfo.data.dataframe.impl.Grouping;
@ -40,8 +40,8 @@ import org.meteoinfo.data.dataframe.impl.Sorting;
import org.meteoinfo.data.dataframe.impl.Views;
import org.meteoinfo.data.dataframe.impl.WindowFunction;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.util.GlobalUtil;
import org.meteoinfo.global.util.TypeUtils;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.math.ArrayUtil;
import org.meteoinfo.ndarray.Array;
import org.meteoinfo.ndarray.InvalidRangeException;
import org.meteoinfo.ndarray.Range;

4
MeteoInfoLib/src/main/java/org/meteoinfo/data/dataframe/DateTimeIndex.java
View File

@ -13,11 +13,11 @@ import java.util.List;
import java.time.LocalDateTime;
import java.time.temporal.TemporalAmount;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.common.util.JDateUtil;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.ndarray.Array;
import org.meteoinfo.ndarray.DataType;
import org.meteoinfo.math.ArrayMath;
/**
*

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/dataframe/Index.java
View File

@ -10,8 +10,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.ndarray.Array;
import org.meteoinfo.ndarray.DataType;

5
MeteoInfoLib/src/main/java/org/meteoinfo/data/dataframe/Series.java
View File

@ -15,14 +15,15 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.common.util.JDateUtil;
import org.meteoinfo.data.dataframe.impl.Grouping;
import org.meteoinfo.data.dataframe.impl.KeyFunction;
import org.meteoinfo.data.dataframe.impl.TimeFunction;
import org.meteoinfo.data.dataframe.impl.TimeFunctions;
import org.meteoinfo.data.dataframe.impl.Views;
import org.meteoinfo.data.dataframe.impl.WindowFunction;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.ndarray.Array;
import org.meteoinfo.ndarray.DataType;
import org.meteoinfo.ndarray.InvalidRangeException;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/dataframe/impl/Grouping.java
View File

@ -26,10 +26,11 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.meteoinfo.math.ArrayUtil;
import org.meteoinfo.data.dataframe.DataFrame;
import org.meteoinfo.data.dataframe.Series;
import org.meteoinfo.data.dataframe.impl.Transforms.CumulativeFunction;
import org.meteoinfo.math.ArrayUtil;
import org.meteoinfo.ndarray.Array;
public class Grouping

2
MeteoInfoLib/src/main/java/org/meteoinfo/data/dataframe/impl/WindowFunction.java
View File

@ -5,7 +5,7 @@
*/
package org.meteoinfo.data.dataframe.impl;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.common.util.JDateUtil;
import java.time.LocalDateTime;
import java.time.Period;

2
MeteoInfoLib/src/main/java/org/meteoinfo/data/mapdata/AttributeTable.java
View File

@ -17,7 +17,7 @@ import org.meteoinfo.table.DataColumn;
import org.meteoinfo.table.DataRow;
import org.meteoinfo.table.DataTable;
import org.meteoinfo.ndarray.DataType;
import org.meteoinfo.io.EndianDataOutputStream;
import org.meteoinfo.common.io.EndianDataOutputStream;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;

16
MeteoInfoLib/src/main/java/org/meteoinfo/data/mapdata/MapDataManage.java
View File

@ -13,13 +13,13 @@
*/
package org.meteoinfo.data.mapdata;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.PointD;
import org.meteoinfo.common.util.GlobalUtil;
import org.meteoinfo.data.GridData;
import org.meteoinfo.data.mapdata.geotiff.GeoTiff;
import org.meteoinfo.data.meteodata.DrawMeteoData;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.util.GlobalUtil;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.global.PointD;
import org.meteoinfo.geoprocess.GeometryUtil;
import org.meteoinfo.ndarray.DataType;
import org.meteoinfo.layer.ImageLayer;
import org.meteoinfo.layer.LayerDrawType;
@ -53,7 +53,7 @@ import org.meteoinfo.data.meteodata.ascii.ASCIIGridDataInfo;
import org.meteoinfo.data.meteodata.ascii.SurferGridDataInfo;
import org.meteoinfo.data.meteodata.bandraster.BILDataInfo;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.io.IOUtil;
import org.meteoinfo.common.io.IOUtil;
import org.meteoinfo.layer.RasterLayer;
import org.meteoinfo.legend.LegendScheme;
import org.meteoinfo.legend.LegendType;
@ -293,7 +293,7 @@ public class MapDataManage {
PolylineShape aPolyline = new PolylineShape();
aPolyline.setValue(lineNum);
aPolyline.setPoints(pList);
aPolyline.setExtent(MIMath.getPointsExtent(pList));
aPolyline.setExtent(GeometryUtil.getPointsExtent(pList));
aPolyline.setPartNum(1);
aPolyline.parts = new int[1];
aPolyline.parts[0] = 0;
@ -521,7 +521,7 @@ public class MapDataManage {
}
PolylineShape aPLS = new PolylineShape();
aPLS.setValue(i);
aPLS.setExtent(MIMath.getPointsExtent(pList));
aPLS.setExtent(GeometryUtil.getPointsExtent(pList));
aPLS.setPoints(pList);
int sNum = aLayer.getShapeNum();
@ -554,7 +554,7 @@ public class MapDataManage {
PolygonShape aPGS = new PolygonShape();
aPGS.lowValue = i;
aPGS.highValue = i;
aPGS.setExtent(MIMath.getPointsExtent(pList));
aPGS.setExtent(GeometryUtil.getPointsExtent(pList));
aPGS.setPoints(pList);
int sNum = aLayer.getShapeNum();

8
MeteoInfoLib/src/main/java/org/meteoinfo/data/mapdata/ShapeFileManage.java
View File

@ -13,9 +13,9 @@
*/
package org.meteoinfo.data.mapdata;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.PointD;
import org.meteoinfo.io.EndianDataOutputStream;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.PointD;
import org.meteoinfo.common.io.EndianDataOutputStream;
import org.meteoinfo.layer.LayerDrawType;
import org.meteoinfo.layer.VectorLayer;
import org.meteoinfo.legend.LegendManage;
@ -47,8 +47,6 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.meteoinfo.projection.info.ProjectionInfo;
import org.locationtech.proj4j.CRSFactory;
import org.locationtech.proj4j.CoordinateReferenceSystem;
import org.meteoinfo.shape.PointM;
import org.meteoinfo.shape.PointZShape;
import org.meteoinfo.shape.PolygonMShape;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/mapdata/geotiff/GeoTiff.java
View File

@ -28,12 +28,13 @@ import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.data.GridArray;
import org.meteoinfo.data.mapdata.geotiff.compression.CompressionDecoder;
import org.meteoinfo.data.mapdata.geotiff.compression.DeflateCompression;
import org.meteoinfo.data.mapdata.geotiff.compression.LZWCompression;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.ndarray.util.BigDecimalUtil;
import org.meteoinfo.projection.KnownCoordinateSystems;
import org.meteoinfo.projection.info.ProjectionInfo;

2
MeteoInfoLib/src/main/java/org/meteoinfo/data/mapdata/webmap/AbstractTileFactory.java
View File

@ -22,8 +22,8 @@ import java.util.logging.Logger;
import javax.swing.SwingUtilities;
import org.meteoinfo.common.util.GraphicsUtilities;
import org.meteoinfo.global.util.GeoUtil;
import org.meteoinfo.global.util.GraphicsUtilities;
/**
* The

5
MeteoInfoLib/src/main/java/org/meteoinfo/data/mathparser/MathParser.java
View File

@ -4,19 +4,18 @@
*/
package org.meteoinfo.data.mathparser;
import java.beans.Expression;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Stack;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.data.meteodata.MeteoDataInfo;
import org.meteoinfo.global.MIMath;
/**
*

2
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/DataInfo.java
View File

@ -19,7 +19,7 @@ import java.time.Period;
import java.util.ArrayList;
import java.util.List;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.common.util.JDateUtil;
import org.meteoinfo.ndarray.Array;
import org.meteoinfo.ndarray.Dimension;
import org.meteoinfo.projection.KnownCoordinateSystems;

28
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/DrawMeteoData.java
View File

@ -14,6 +14,9 @@
package org.meteoinfo.data.meteodata;
import org.apache.commons.lang3.ArrayUtils;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.PointD;
import org.meteoinfo.data.DataMath;
import org.meteoinfo.data.GridData;
import org.meteoinfo.data.StationData;
@ -21,10 +24,10 @@ import org.meteoinfo.data.dataframe.DataFrame;
import org.meteoinfo.data.mapdata.Field;
import org.meteoinfo.drawing.ContourDraw;
import org.meteoinfo.drawing.Draw;
import org.meteoinfo.geoprocess.GeometryUtil;
import org.meteoinfo.legend.MarkerType;
import org.meteoinfo.geoprocess.GeoComputation;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.global.PointD;
import org.meteoinfo.math.ArrayUtil;
import org.meteoinfo.ndarray.DataType;
import org.meteoinfo.layer.LayerDrawType;
import org.meteoinfo.layer.VectorLayer;
@ -45,10 +48,9 @@ import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.meteoinfo.math.ArrayUtil;
import org.meteoinfo.data.GridArray;
import org.meteoinfo.data.XYListDataset;
import org.meteoinfo.global.Extent;
import org.meteoinfo.layer.ImageLayer;
import org.meteoinfo.layer.RasterLayer;
import org.meteoinfo.layer.WorldFilePara;
@ -107,7 +109,7 @@ public class DrawMeteoData {
}
aPolyline.setPoints(pList);
aPolyline.setValue(i);
aPolyline.setExtent(MIMath.getPointsExtent(pList));
aPolyline.setExtent(GeometryUtil.getPointsExtent(pList));
int shapeNum = layer.getShapeNum();
try {
@ -157,7 +159,7 @@ public class DrawMeteoData {
}
aPolyline.setPoints(pList);
aPolyline.setValue(i);
aPolyline.setExtent(MIMath.getPointsExtent(pList));
aPolyline.setExtent(GeometryUtil.getPointsExtent(pList));
int shapeNum = layer.getShapeNum();
try {
@ -233,7 +235,7 @@ public class DrawMeteoData {
PolylineShape aPolyline = new PolylineShape();
aPolyline.setPoints(ps);
aPolyline.setValue(i);
aPolyline.setExtent(MIMath.getPointsExtent(ps));
aPolyline.setExtent(GeometryUtil.getPointsExtent(ps));
int shapeNum = layer.getShapeNum();
try {
@ -368,7 +370,7 @@ public class DrawMeteoData {
PolylineShape aPolyline = new PolylineShape();
aPolyline.setPoints(ps);
aPolyline.setValue(k);
aPolyline.setExtent(MIMath.getPointsExtent(ps));
aPolyline.setExtent(GeometryUtil.getPointsExtent(ps));
int shapeNum = layer.getShapeNum();
try {
@ -509,7 +511,7 @@ public class DrawMeteoData {
PolylineZShape aPolyline = new PolylineZShape();
aPolyline.setPoints(ps);
aPolyline.setValue(0);
aPolyline.setExtent(MIMath.getPointsExtent(ps));
aPolyline.setExtent(GeometryUtil.getPointsExtent(ps));
int shapeNum = layer.getShapeNum();
try {
@ -621,7 +623,7 @@ public class DrawMeteoData {
PolylineZShape aPolyline = new PolylineZShape();
aPolyline.setPoints(ps);
aPolyline.setValue(0);
aPolyline.setExtent(MIMath.getPointsExtent(ps));
aPolyline.setExtent(GeometryUtil.getPointsExtent(ps));
int shapeNum = layer.getShapeNum();
try {
@ -740,7 +742,7 @@ public class DrawMeteoData {
}
aPolyline.setPoints(pList);
aPolyline.setValue(aValue);
aPolyline.setExtent(MIMath.getPointsExtent(pList));
aPolyline.setExtent(GeometryUtil.getPointsExtent(pList));
int shapeNum = aLayer.getShapeNum();
try {
@ -826,7 +828,7 @@ public class DrawMeteoData {
}
aPolyline.setPoints(pList);
aPolyline.setValue(aValue);
aPolyline.setExtent(MIMath.getPointsExtent(pList));
aPolyline.setExtent(GeometryUtil.getPointsExtent(pList));
int shapeNum = aLayer.getShapeNum();
try {
if (aLayer.editInsertShape(aPolyline, shapeNum)) {
@ -968,7 +970,7 @@ public class DrawMeteoData {
}
PolygonShape aPolygonShape = new PolygonShape();
aPolygonShape.setPoints(pList);
aPolygonShape.setExtent(MIMath.getPointsExtent(pList));
aPolygonShape.setExtent(GeometryUtil.getPointsExtent(pList));
aPolygonShape.lowValue = aValue;
if (aPolygon.HasHoles()) {
for (PolyLine holeLine : aPolygon.HoleLines) {

2
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/GridDataSetting.java
View File

@ -13,7 +13,7 @@
*/
package org.meteoinfo.data.meteodata;
import org.meteoinfo.global.Extent;
import org.meteoinfo.common.Extent;
/**
*

7
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/MeteoDataInfo.java
View File

@ -14,6 +14,8 @@
package org.meteoinfo.data.meteodata;
import java.io.File;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.data.GridData;
import org.meteoinfo.data.StationData;
import org.meteoinfo.data.meteodata.arl.ARLDataInfo;
@ -30,14 +32,15 @@ import java.io.IOException;
import java.time.LocalDateTime;
import java.time.Duration;
import java.util.ArrayList;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.projection.info.ProjectionInfo;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.data.meteodata.mm5.MM5DataInfo;
import org.meteoinfo.data.meteodata.mm5.MM5IMDataInfo;
import org.meteoinfo.global.MIMath;
import org.meteoinfo.data.mathparser.MathParser;
import org.meteoinfo.data.mathparser.ParseException;
import org.meteoinfo.data.meteodata.awx.AWXDataInfo;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/StationModelData.java
View File

@ -13,7 +13,8 @@
*/
package org.meteoinfo.data.meteodata;
import org.meteoinfo.global.Extent;
import org.meteoinfo.common.Extent;
import java.util.ArrayList;
import java.util.List;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/Variable.java
View File

@ -13,13 +13,14 @@
*/
package org.meteoinfo.data.meteodata;
import org.meteoinfo.common.util.JDateUtil;
import org.meteoinfo.ndarray.DimensionType;
import org.meteoinfo.ndarray.Dimension;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.ndarray.DataType;
import org.meteoinfo.ndarray.Range;
import org.meteoinfo.ndarray.Section;

9
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/arl/ARLDataInfo.java
View File

@ -13,17 +13,19 @@
*/
package org.meteoinfo.data.meteodata.arl;
import org.meteoinfo.bak.ArrayMath;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.util.GlobalUtil;
import org.meteoinfo.common.util.JDateUtil;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.data.GridData;
import org.meteoinfo.data.meteodata.DataInfo;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.ndarray.Dimension;
import org.meteoinfo.ndarray.DimensionType;
import org.meteoinfo.ndarray.util.BigDecimalUtil;
import org.meteoinfo.data.meteodata.IGridDataInfo;
import org.meteoinfo.data.meteodata.Variable;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.util.GlobalUtil;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
@ -40,7 +42,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.meteoinfo.data.GridArray;
import org.meteoinfo.data.meteodata.MeteoDataType;
import org.meteoinfo.global.MIMath;
import org.locationtech.proj4j.proj.Projection;
import org.meteoinfo.projection.KnownCoordinateSystems;
import org.meteoinfo.projection.info.ProjectionInfo;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/ascii/ASCIIGridDataInfo.java
View File

@ -13,13 +13,14 @@
*/
package org.meteoinfo.data.meteodata.ascii;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.data.GridData;
import org.meteoinfo.data.meteodata.DataInfo;
import org.meteoinfo.ndarray.Dimension;
import org.meteoinfo.ndarray.DimensionType;
import org.meteoinfo.data.meteodata.IGridDataInfo;
import org.meteoinfo.data.meteodata.Variable;
import org.meteoinfo.global.MIMath;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;

9
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/ascii/LonLatStationDataInfo.java
View File

@ -13,14 +13,16 @@
*/
package org.meteoinfo.data.meteodata.ascii;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.MIMath;
import org.meteoinfo.common.util.GlobalUtil;
import org.meteoinfo.data.StationData;
import org.meteoinfo.data.meteodata.DataInfo;
import org.meteoinfo.data.meteodata.IStationDataInfo;
import org.meteoinfo.data.meteodata.StationInfoData;
import org.meteoinfo.data.meteodata.StationModelData;
import org.meteoinfo.data.meteodata.Variable;
import org.meteoinfo.global.Extent;
import org.meteoinfo.global.MIMath;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@ -34,8 +36,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JOptionPane;
import org.meteoinfo.data.meteodata.MeteoDataType;
import org.meteoinfo.global.util.GlobalUtil;
import org.meteoinfo.io.FileCharsetDetector;
import org.meteoinfo.common.io.FileCharsetDetector;
import org.meteoinfo.ndarray.Array;
import org.meteoinfo.data.meteodata.Attribute;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/awx/AWXDataInfo.java
View File

@ -15,6 +15,8 @@ import java.util.Arrays;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.meteoinfo.common.Extent;
import org.meteoinfo.data.GridArray;
import org.meteoinfo.data.GridData;
import org.meteoinfo.data.StationData;
@ -28,7 +30,6 @@ import org.meteoinfo.data.meteodata.StationInfoData;
import org.meteoinfo.data.meteodata.StationModelData;
import org.meteoinfo.data.meteodata.Variable;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.global.Extent;
import org.meteoinfo.layer.WorldFilePara;
import org.meteoinfo.projection.KnownCoordinateSystems;
import org.meteoinfo.projection.info.ProjectionInfo;

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/bandraster/GeoTiffDataInfo.java
View File

@ -18,11 +18,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.data.GridArray;
import org.meteoinfo.data.GridData;
import org.meteoinfo.data.mapdata.geotiff.GeoTiff;
import org.meteoinfo.data.meteodata.DataInfo;
import org.meteoinfo.math.ArrayMath;
import org.meteoinfo.ndarray.Dimension;
import org.meteoinfo.ndarray.DimensionType;
import org.meteoinfo.data.meteodata.IGridDataInfo;

6
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/grads/GrADSDataInfo.java
View File

@ -13,6 +13,8 @@
*/
package org.meteoinfo.data.meteodata.grads;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.util.JDateUtil;
import org.meteoinfo.data.GridData;
import org.meteoinfo.data.meteodata.DataInfo;
import org.meteoinfo.ndarray.Dimension;
@ -20,7 +22,7 @@ import org.meteoinfo.ndarray.DimensionType;
import org.meteoinfo.data.meteodata.IGridDataInfo;
import org.meteoinfo.data.meteodata.Variable;
import org.meteoinfo.global.DataConvert;
import org.meteoinfo.io.EndianDataOutputStream;
import org.meteoinfo.common.io.EndianDataOutputStream;
import org.meteoinfo.ndarray.util.BigDecimalUtil;
import org.meteoinfo.projection.KnownCoordinateSystems;
import org.meteoinfo.projection.info.ProjectionInfo;
@ -51,7 +53,6 @@ import org.meteoinfo.data.meteodata.MeteoDataType;
import org.meteoinfo.data.meteodata.StationInfoData;
import org.meteoinfo.data.meteodata.StationModelData;
import org.meteoinfo.data.meteodata.arl.ARLDataInfo;
import org.meteoinfo.global.Extent;
import org.meteoinfo.ndarray.Array;
import org.meteoinfo.ndarray.DataType;
import org.meteoinfo.ndarray.IndexIterator;
@ -59,7 +60,6 @@ import org.meteoinfo.ndarray.InvalidRangeException;
import org.meteoinfo.ndarray.Range;
import org.meteoinfo.ndarray.Section;
import org.meteoinfo.data.meteodata.Attribute;
import org.meteoinfo.global.util.JDateUtil;
/**
*

3
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/grib/grib2/GRIB2DataInfo.java
View File

@ -11,6 +11,8 @@ import java.util.Date;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.meteoinfo.common.Bytes2Number;
import org.meteoinfo.data.DataMath;
import org.meteoinfo.data.GridArray;
import org.meteoinfo.data.GridData;
@ -18,7 +20,6 @@ import org.meteoinfo.data.meteodata.DataInfo;
import org.meteoinfo.data.meteodata.IGridDataInfo;
import org.meteoinfo.data.meteodata.MeteoDataType;
import org.meteoinfo.data.meteodata.Variable;
import org.meteoinfo.global.Bytes2Number;
import org.meteoinfo.projection.info.ProjectionInfo;
import org.meteoinfo.ndarray.Array;
import org.meteoinfo.data.meteodata.Attribute;

2
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/hysplit/HYSPLITConcDataInfo.java
View File

@ -13,10 +13,10 @@
*/
package org.meteoinfo.data.meteodata.hysplit;
import org.meteoinfo.common.util.JDateUtil;
import org.meteoinfo.data.meteodata.ascii.ASCIIGridDataInfo;
import org.meteoinfo.data.GridData;
import org.meteoinfo.data.meteodata.DataInfo;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.ndarray.Dimension;
import org.meteoinfo.ndarray.DimensionType;
import org.meteoinfo.data.meteodata.IGridDataInfo;

4
MeteoInfoLib/src/main/java/org/meteoinfo/data/meteodata/hysplit/HYSPLITPartDataInfo.java
View File

@ -13,13 +13,14 @@
*/
package org.meteoinfo.data.meteodata.hysplit;
import org.meteoinfo.common.Extent;
import org.meteoinfo.common.util.JDateUtil;
import org.meteoinfo.data.StationData;
import org.meteoinfo.data.dataframe.Column;
import org.meteoinfo.data.dataframe.ColumnIndex;
import org.meteoinfo.data.dataframe.DataFrame;
import org.meteoinfo.data.dataframe.Index;
import org.meteoinfo.data.meteodata.DataInfo;
import org.meteoinfo.global.util.JDateUtil;
import org.meteoinfo.ndarray.DataType;
import org.meteoinfo.ndarray.Dimension;
import org.meteoinfo.ndarray.DimensionType;
@ -27,7 +28,6 @@ import org.meteoinfo.data.meteodata.IStationDataInfo;
import org.meteoinfo.data.meteodata.StationInfoData;
import org.meteoinfo.data.meteodata.StationModelData;
import org.meteoinfo.data.meteodata.Variable;
import org.meteoinfo.global.Extent;
import java.io.IOException;
import java.io.RandomAccessFile;

Some files were not shown because too many files have changed in this diff Show More