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 netcdfAll to version 5.5.4-SNAPSHOT to support Grib2 template 4.60

Browse Source
This commit is contained in:
wyq 2023-03-29 12:35:03 +08:00
parent 30430acf37
commit 9a9427098e
10 changed files with 109 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/libraries/Maven__edu_ucar_netcdfAll_5_5_3.xml → .idea/libraries/Maven__edu_ucar_netcdfAll_5_5_4_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: edu.ucar:netcdfAll:5.5.3">
<library name="Maven: edu.ucar:netcdfAll:5.5.4-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/edu/ucar/netcdfAll/5.5.3/netcdfAll-5.5.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/edu/ucar/netcdfAll/5.5.4-SNAPSHOT/netcdfAll-5.5.4-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/edu/ucar/netcdfAll/5.5.3/netcdfAll-5.5.3-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/edu/ucar/netcdfAll/5.5.4-SNAPSHOT/netcdfAll-5.5.4-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/edu/ucar/netcdfAll/5.5.3/netcdfAll-5.5.3-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/edu/ucar/netcdfAll/5.5.4-SNAPSHOT/netcdfAll-5.5.4-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

2
meteoinfo-chart/meteoinfo-chart.iml
View File

@ -96,7 +96,7 @@
<orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.2.2" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:2.0" level="project" />
<orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.3" level="project" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />

91
meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/Model.java
View File

@ -6,9 +6,10 @@ import java.util.List;
public class Model extends TriMeshGraphic {
protected Vector3f location = new Vector3f();
protected Vector3f angle = new Vector3f();
protected Vector3f location = null;
protected Vector3f rotation = null;
protected float scale = 1;
protected Vector3f direction = null;
/**
* Constructor
@ -43,30 +44,84 @@ public class Model extends TriMeshGraphic {
}
/**
* Get angle
* @return The angle
* Set location
* @param x X
* @param y Y
* @param z Z
*/
public Vector3f getAngle() {
return angle;
public void setLocation(float x, float y, float z) {
location = new Vector3f(x, y, z);
}
/**
* Set angle
* @param value Then angle
* Get rotation
* @return The rotation
*/
public void setAngle(Vector3f value) {
angle = value;
public Vector3f getRotation() {
return rotation;
}
/**
* Set angle
* @param value The angle
* Set rotation
* @param value Then rotation
*/
public void setAngle(List<Number> value) {
angle = new Vector3f(value.get(0).floatValue(), value.get(1).floatValue(),
public void setRotation(Vector3f value) {
rotation = value;
}
/**
* Set rotation
* @param value The rotation
*/
public void setRotation(List<Number> value) {
rotation = new Vector3f(value.get(0).floatValue(), value.get(1).floatValue(),
value.get(2).floatValue());
}
/**
* Get direction
* @return direction
*/
public Vector3f getDirection() {
return direction;
}
/**
* Set direction
* @param value direction
*/
public void setDirection(Vector3f value) {
direction = value;
}
/**
* Set direction
* @param value direction
*/
public void setDirection(List<Number> value) {
direction = new Vector3f(value.get(0).floatValue(), value.get(1).floatValue(), value.get(2).floatValue());
}
/**
* Set direction
* @param start Start location
* @param end End location
*/
public void setDirection(Vector3f start, Vector3f end) {
direction = end.sub(start);
}
/**
* Set look at
* @param start Start location
* @param end End location
*/
public void setLookAt(List<Number> start, List<Number> end) {
Vector3f sv = new Vector3f(start.get(0).floatValue(), start.get(1).floatValue(), start.get(2).floatValue());
Vector3f ev = new Vector3f(end.get(0).floatValue(), end.get(1).floatValue(), end.get(2).floatValue());
direction = ev.sub(sv);
}
/**
* Get scale
* @return The scale
@ -84,12 +139,12 @@ public class Model extends TriMeshGraphic {
}
/**
* Get radians angle
* Get radians rotation
* @return Radians
*/
public Vector3f getRadians() {
return new Vector3f((float) Math.toRadians(angle.x), (float) Math.toRadians(angle.y),
(float) Math.toRadians(angle.z));
public Vector3f getRotationRadians() {
return new Vector3f((float) Math.toRadians(rotation.x), (float) Math.toRadians(rotation.y),
(float) Math.toRadians(rotation.z));
}
/**

16
meteoinfo-chart/src/main/java/org/meteoinfo/chart/render/jogl/ModelRender.java
View File

@ -161,9 +161,19 @@ public class ModelRender extends JOGLGraphicRender {
gl.glPushMatrix();
FloatBuffer fb = Buffers.newDirectFloatBuffer(16);
Matrix4f modelView = new Matrix4f(this.modelViewMatrixR);
modelView.translate(this.transform.transform(model.getLocation()));
modelView.scale(model.getScale());
modelView.rotateXYZ(model.getRadians());
if (model.getLocation() != null) {
modelView.translate(this.transform.transform(model.getLocation()));
}
if (model.getScale() != 1) {
modelView.scale(model.getScale());
}
if (model.getRotation() != null) {
modelView.rotateXYZ(model.getRotationRadians());
}
if (model.getDirection() != null) {
modelView.lookAlong(model.getDirection(), new Vector3f(modelView.m30(), modelView.m31(),
modelView.m32() + 1));
}
gl.glLoadMatrixf(modelView.get(fb));
if (useShader) {

2
meteoinfo-data/meteoinfo-data.iml
View File

@ -49,7 +49,7 @@
<orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.2.2" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:2.0" level="project" />
<orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.3" level="project" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />

2
meteoinfo-data/pom.xml
View File

@ -43,7 +43,7 @@
<dependency>
<groupId>edu.ucar</groupId>
<artifactId>netcdfAll</artifactId>
<version>5.5.3</version>
<version>5.5.4-SNAPSHOT</version>
<!--<scope>system</scope>
<systemPath>${project.basedir}/lib/netcdfAll-5.5.3-SNAPSHOT.jar</systemPath>-->
</dependency>

2
meteoinfo-geo/meteoinfo-geo.iml
View File

@ -104,7 +104,7 @@
<orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.2.2" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:2.0" level="project" />
<orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.3" level="project" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />

2
meteoinfo-lab/meteoinfo-lab.iml
View File

@ -85,7 +85,7 @@
<orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.2.2" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:2.0" level="project" />
<orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.3" level="project" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />

24
meteoinfo-lab/milconfig.xml
View File

@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model">
<RecentFolder Folder="D:\Working\MIScript\cuace_dust"/>
<RecentFolder Folder="D:\Working\MIScript\cuace_dust\py"/>
<RecentFolder Folder="D:\Working\MIScript\cuace_dust\py\plot"/>
<Path OpenPath="D:\Working\MIScript\Jython\mis\io\grib">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\array"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\mesh"/>
@ -12,21 +9,26 @@
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\calc"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\web"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\burf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<RecentFolder Folder="D:\Working\MIScript\cuace_dust\py\plot"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot"/>
<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\model\obj_airplane_line.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\io\web\web_4.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model\obj_car_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model\obj_airplane_model.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot\air_path_model.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\io\grib\test_read_ec_s2s.py"/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model\obj_airplane_line.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\io\web\web_4.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model\obj_car_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model\obj_airplane_model.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot\air_path_model.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\io\grib\test_read_ec_s2s.py"/>
</RecentFiles>
</File>
<Font>
@ -34,5 +36,5 @@
</Font>
<LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
<Figure DoubleBuffering="true"/>
<Startup MainFormLocation="-7,0" MainFormSize="1361,797"/>
<Startup MainFormLocation="-7,0" MainFormSize="1361,777"/>
</MeteoInfo>

2
meteoinfo-map/meteoinfo-map.iml
View File

@ -75,7 +75,7 @@
<orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.2.2" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:2.0" level="project" />
<orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.3" level="project" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.4-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />