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

persistent of time, level and draw type of meteorology data

Browse Source
This commit is contained in:
wyq 2021-09-09 23:40:33 +08:00
parent e7c949bdc9
commit b746fa0a5e
5 changed files with 85 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meteoinfo-data/src/main/java/org/meteoinfo/data/meteodata/MeteoDataInfo.java
View File

@ -67,6 +67,7 @@ public class MeteoDataInfo {
private int _levelIdx;
private int _latIdx;
private int _lonIdx;
private DrawType2D drawType2D;
/// <summary>
/// Is Lont/Lat
/// </summary>
@ -267,6 +268,22 @@ public class MeteoDataInfo {
_latIdx = value;
}
/**
* Get DrawType2D
* @return DrawType2D
*/
public DrawType2D getDrawType2D() {
return this.drawType2D;
}
/**
* Set DrawType2D
* @param value DrawType2D
*/
public void setDrawType2D(DrawType2D value) {
this.drawType2D = value;
}
/**
* Get Meteo U/V setting
*

6
meteoinfo-lab/milconfig.xml
View File

@ -21,12 +21,12 @@
<OpenedFiles>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf_sombrero.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\map\topology\difference_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contourf_map.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contourfm_2.py"/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf_sombrero.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\map\topology\difference_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contourf_map.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contourfm_2.py"/>
</RecentFiles>
</File>
<Font>
@ -34,5 +34,5 @@
</Font>
<LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
<Figure DoubleBuffering="true"/>
<Startup MainFormLocation="-7,0" MainFormSize="1419,795"/>
<Startup MainFormLocation="-7,-7" MainFormSize="1293,693"/>
</MeteoInfo>

2
meteoinfo-map/config.xml
View File

@ -8,5 +8,5 @@
<ScriptLanguage Language="Jython"/>
<LookFeel LafDecorated="true" Name="FlatLightLaf"/>
<Figure DoubleBuffering="true"/>
<Startup MainFormLocation="-7,-7" MainFormSize="1293,693" ShowMeteoDataDlg="false"/>
<Startup MainFormLocation="-7,-7" MainFormSize="1293,693" ShowMeteoDataDlg="true"/>
</MeteoInfo>

5
meteoinfo-map/default.mip
View File

@ -2,13 +2,12 @@
<MeteoInfo File="default.mip" Type="projectfile">
<MapFrames>
<MapFrame Active="true" DrawGridLabel="true" DrawGridLine="false" DrawNeatLine="true" Expanded="true" GridFontName="Arial" GridFontSize="12" GridLineColor="0xff808080" GridLineSize="1.0" GridLineStyle="DASH" GridXDelt="10.0" GridXOrigin="-180.0" GridYDelt="10.0" GridYOrigin="-90.0" Height="364" Left="48" Name="New Map Frame" NeatLineColor="0xff000000" NeatLineSize="1.0" Order="0" Top="30" Width="776">
<Extents xMax="1.4641954417758651E7" xMin="6820686.104558709" yMax="6975934.872413158" yMin="2922054.0434102565"/>
<Extents xMax="180.0" xMin="-180.0" yMax="83.62359619140625" yMin="-90.0"/>
<MapProperty BackColor="0xffffffff" ForeColor="0xff000000" HighSpeedWheelZoom="true" MultiGlobalDraw="true" PointSmoothingMode="true" SelectColor="0xff66ffff" SmoothingMode="false" XYScaleFactor="1.0"/>
<GridLine DrawGridLine="false" DrawGridTickLine="false" GridLineColor="0xff808080" GridLineSize="1.0" GridLineStyle="DASH"/>
<MaskOut MaskLayer="china.shp" SetMaskLayer="false"/>
<Projection IsLonLatMap="false" ProjStr="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 "/>
<Projection IsLonLatMap="true" ProjStr="+title=long/lat:WGS84 +proj=longlat +ellps=WGS84 +datum=WGS84 +units=degrees "/>
<GroupLayer>
<Layer Handle="1" IsMaskout="false" LayerDrawType="IMAGE" LayerName="WebMap_BingSatelliteMap" LayerType="WEB_MAP_LAYER" TransparencyPerc="0" Visible="true" WebMapProvider="BingSatelliteMap"/>
<Layer AvoidCollision="false" Expanded="false" FileName="..\..\..\..\Distribution\Java\MeteoInfo\MeteoInfo\map\cn_province.shp" Handle="2" IsMaskout="false" LayerDrawType="MAP" LayerName="cn_province.shp" LayerType="VECTOR_LAYER" ShapeType="POLYGON_Z" TransparencyPerc="0" Visible="true">
<LegendScheme BreakNum="1" FieldName="" HasNoData="false" LegendType="SINGLE_SYMBOL" MaxValue="0.0" MinValue="0.0" ShapeType="POLYGON_Z" UNDEF="-9999.0">
<Breaks>

120
meteoinfo-map/src/main/java/org/meteoinfo/map/forms/FrmMeteoData.java
View File

@ -23,16 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.DefaultListModel;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
import javax.swing.*;
import com.formdev.flatlaf.extras.FlatSVGIcon;
import com.formdev.flatlaf.extras.FlatSVGUtils;
@ -76,7 +67,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
private final List<MeteoDataInfo> _dataInfoList;
private MeteoDataInfo _meteoDataInfo = new MeteoDataInfo();
private MeteoUVSet meteoUVSet = new MeteoUVSet();
DrawType2D _2DDrawType;
//DrawType2D _2DDrawType;
private GridData _gridData;
private StationData _stationData = new StationData();
boolean _useSameLegendScheme = false;
@ -936,21 +927,23 @@ public class FrmMeteoData extends javax.swing.JDialog {
//Set times
//Lab_Time.Text = Resources.GlobalResource.ResourceManager.GetString("Time_Text");
this.jComboBox_Time.removeAllItems();
//this.jComboBox_Time.removeAllItems();
if (var.getTDimension() != null) {
DateTimeFormatter sdf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
List<LocalDateTime> times = var.getTimes();
DefaultComboBoxModel comboBoxModel = new DefaultComboBoxModel();
for (i = 0; i < times.size(); i++) {
this.jComboBox_Time.addItem(sdf.format(times.get(i)));
comboBoxModel.addElement(sdf.format(times.get(i)));
}
this.jComboBox_Time.setModel(comboBoxModel);
if (this.jComboBox_Time.getItemCount() > _meteoDataInfo.getTimeIndex()) {
this.jComboBox_Time.setSelectedIndex(_meteoDataInfo.getTimeIndex());
}
}
//Set levels
this.jComboBox_Level.removeAllItems();
if (var.getZDimension() == null) {
this.jComboBox_Level.removeAllItems();
if (this._meteoDataInfo.isSWATHData()) {
Variable lonvar = _meteoDataInfo.getDataInfo().getVariable("longitude");
org.meteoinfo.ndarray.Dimension ldim = var.getLevelDimension(lonvar);
@ -970,9 +963,11 @@ public class FrmMeteoData extends javax.swing.JDialog {
this.jComboBox_Level.setSelectedIndex(0);
}
} else {
DefaultComboBoxModel comboBoxModel = new DefaultComboBoxModel();
for (i = 0; i < var.getZDimension().getLength(); i++) {
this.jComboBox_Level.addItem(String.valueOf(var.getZDimension().getDimValue().get(i)));
comboBoxModel.addElement(String.valueOf(var.getZDimension().getDimValue().get(i)));
}
this.jComboBox_Level.setModel(comboBoxModel);
if (this.jComboBox_Level.getItemCount() > _meteoDataInfo.getLevelIndex()) {
this.jComboBox_Level.setSelectedIndex(_meteoDataInfo.getLevelIndex());
}
@ -1003,7 +998,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
private void jComboBox_DrawTypeActionPerformed(java.awt.event.ActionEvent evt) {
// TODO add your handling code here:
if (this.jComboBox_DrawType.getItemCount() > 0) {
_2DDrawType = DrawType2D.valueOf(this.jComboBox_DrawType.getSelectedItem().toString());
this._meteoDataInfo.setDrawType2D((DrawType2D) this.jComboBox_DrawType.getSelectedItem());
this.jButton_Draw.setEnabled(true);
_useSameLegendScheme = false;
@ -1023,7 +1018,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
//Set CHB_ColorVar visible
java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("bundle/Bundle_FrmMeteoData");
switch (_2DDrawType) {
switch (this._meteoDataInfo.getDrawType2D()) {
case VECTOR:
case BARB:
this.jCheckBox_ColorVar.setText(bundle.getString("FrmMeteoData.jCheckBox_ColorVar.text"));
@ -1507,7 +1502,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
private void jButton_SettingActionPerformed(java.awt.event.ActionEvent evt) {
// TODO add your handling code here:
if (_meteoDataInfo.isStationData() || _meteoDataInfo.isSWATHData()) {
switch (_2DDrawType) {
switch (this._meteoDataInfo.getDrawType2D()) {
case CONTOUR:
case SHADED:
case GRID_POINT:
@ -1544,7 +1539,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
break;
}
} else if (_meteoDataInfo.isGridData()) {
switch (_2DDrawType) {
switch (this._meteoDataInfo.getDrawType2D()) {
case CONTOUR:
case GRID_FILL:
case GRID_POINT:
@ -1662,7 +1657,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
}
private void jCheckBox_ColorVarActionPerformed(java.awt.event.ActionEvent evt) {
switch (_2DDrawType) {
switch (this._meteoDataInfo.getDrawType2D()) {
case VECTOR:
case BARB:
this.windColor = this.jCheckBox_ColorVar.isSelected();
@ -2298,42 +2293,47 @@ public class FrmMeteoData extends javax.swing.JDialog {
updateProjection();
//Set draw type
this.jComboBox_DrawType.removeAllItems();
//this.jComboBox_DrawType.removeAllItems();
DefaultComboBoxModel comboBoxModel = new DefaultComboBoxModel();
if (_meteoDataInfo.isGridData()) {
this.jComboBox_DrawType.addItem(DrawType2D.RASTER.toString());
this.jComboBox_DrawType.addItem(DrawType2D.CONTOUR.toString());
this.jComboBox_DrawType.addItem(DrawType2D.SHADED.toString());
this.jComboBox_DrawType.addItem(DrawType2D.GRID_FILL.toString());
this.jComboBox_DrawType.addItem(DrawType2D.GRID_POINT.toString());
this.jComboBox_DrawType.addItem(DrawType2D.VECTOR.toString());
this.jComboBox_DrawType.addItem(DrawType2D.BARB.toString());
this.jComboBox_DrawType.addItem(DrawType2D.STREAMLINE.toString());
comboBoxModel.addElement(DrawType2D.RASTER);
comboBoxModel.addElement(DrawType2D.CONTOUR);
comboBoxModel.addElement(DrawType2D.SHADED);
comboBoxModel.addElement(DrawType2D.GRID_FILL);
comboBoxModel.addElement(DrawType2D.GRID_POINT);
comboBoxModel.addElement(DrawType2D.VECTOR);
comboBoxModel.addElement(DrawType2D.BARB);
comboBoxModel.addElement(DrawType2D.STREAMLINE);
} else if (_meteoDataInfo.isStationData()) {
switch (_meteoDataInfo.getDataType()) {
case HYSPLIT_PARTICLE:
this.jComboBox_DrawType.addItem(DrawType2D.STATION_POINT.toString());
comboBoxModel.addElement(DrawType2D.STATION_POINT);
break;
default:
this.jComboBox_DrawType.addItem(DrawType2D.STATION_POINT.toString());
this.jComboBox_DrawType.addItem(DrawType2D.STATION_INFO.toString());
this.jComboBox_DrawType.addItem(DrawType2D.WEATHER_SYMBOL.toString());
this.jComboBox_DrawType.addItem(DrawType2D.STATION_MODEL.toString());
this.jComboBox_DrawType.addItem(DrawType2D.VECTOR.toString());
this.jComboBox_DrawType.addItem(DrawType2D.BARB.toString());
this.jComboBox_DrawType.addItem(DrawType2D.CONTOUR.toString());
this.jComboBox_DrawType.addItem(DrawType2D.SHADED.toString());
this.jComboBox_DrawType.addItem(DrawType2D.STREAMLINE.toString());
comboBoxModel.addElement(DrawType2D.STATION_POINT);
comboBoxModel.addElement(DrawType2D.STATION_INFO);
comboBoxModel.addElement(DrawType2D.WEATHER_SYMBOL);
comboBoxModel.addElement(DrawType2D.STATION_MODEL);
comboBoxModel.addElement(DrawType2D.VECTOR);
comboBoxModel.addElement(DrawType2D.BARB);
comboBoxModel.addElement(DrawType2D.CONTOUR);
comboBoxModel.addElement(DrawType2D.SHADED);
comboBoxModel.addElement(DrawType2D.STREAMLINE);
break;
}
} else if (_meteoDataInfo.isSWATHData()) {
this.jComboBox_DrawType.addItem(DrawType2D.RASTER.toString());
this.jComboBox_DrawType.addItem(DrawType2D.STATION_POINT.toString());
comboBoxModel.addElement(DrawType2D.RASTER);
comboBoxModel.addElement(DrawType2D.STATION_POINT);
} else {
this.jComboBox_DrawType.addItem(DrawType2D.TRAJECTORY_LINE.toString());
this.jComboBox_DrawType.addItem(DrawType2D.TRAJECTORY_POINT.toString());
this.jComboBox_DrawType.addItem(DrawType2D.TRAJECTORY_START_POINT.toString());
comboBoxModel.addElement(DrawType2D.TRAJECTORY_LINE);
comboBoxModel.addElement(DrawType2D.TRAJECTORY_POINT);
comboBoxModel.addElement(DrawType2D.TRAJECTORY_START_POINT);
}
this.jComboBox_DrawType.setSelectedIndex(0);
this.jComboBox_DrawType.setModel(comboBoxModel);
if (this._meteoDataInfo.getDrawType2D() == null) {
this._meteoDataInfo.setDrawType2D((DrawType2D) this.jComboBox_DrawType.getItemAt(0));
}
this.jComboBox_DrawType.setSelectedItem(this._meteoDataInfo.getDrawType2D());
//Set vars
_isLoading = true;
@ -2583,7 +2583,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
}
}
switch (_2DDrawType) {
switch (this._meteoDataInfo.getDrawType2D()) {
case STATION_POINT:
case VECTOR:
case BARB:
@ -2606,7 +2606,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
private MapLayer drawTraj(String varName) {
DataInfo aDataInfo = _meteoDataInfo.getDataInfo();
VectorLayer aLayer = null;
switch (_2DDrawType) {
switch (this._meteoDataInfo.getDrawType2D()) {
case TRAJECTORY_LINE:
aLayer = DrawMeteoData.createTrajLineLayer((ITrajDataInfo) aDataInfo, varName);
_lastAddedLayerHandle = _parent.getMapDocument().getActiveMapFrame().insertPolylineLayer(aLayer);
@ -2627,7 +2627,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
}
private void createLegendScheme_Grid() {
switch (_2DDrawType) {
switch (this._meteoDataInfo.getDrawType2D()) {
case CONTOUR:
_legendScheme = LegendManage.createLegendSchemeFromGridData(_gridData,
LegendType.UNIQUE_VALUE, ShapeTypes.POLYLINE);
@ -2667,7 +2667,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
}
private LegendScheme createLegendScheme_Station() {
switch (_2DDrawType) {
switch (this._meteoDataInfo.getDrawType2D()) {
case STATION_POINT:
_legendScheme = LegendManage.createLegendSchemeFromStationData(_stationData,
LegendType.GRADUATED_COLOR, ShapeTypes.POINT);
@ -2779,7 +2779,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
}
//Create layer
switch (_2DDrawType) {
switch (this._meteoDataInfo.getDrawType2D()) {
case CONTOUR:
lName = "Contour_" + lName;
//LegendManage.setContoursAndColors(aLS, _cValues, _cColors);
@ -2876,11 +2876,15 @@ public class FrmMeteoData extends javax.swing.JDialog {
if (aVLayer.getShapeType() == ShapeTypes.POLYGON) {
_lastAddedLayerHandle = _parent.getMapDocument().getActiveMapFrame().insertPolygonLayer(aVLayer);
} else {
if (_2DDrawType == DrawType2D.VECTOR || _2DDrawType == DrawType2D.BARB) {
_lastAddedLayerHandle = _parent.getMapDocument().getActiveMapFrame().addWindLayer(aVLayer,
_meteoDataInfo.EarthWind);
} else {
_lastAddedLayerHandle = _parent.getMapDocument().getActiveMapFrame().insertPolylineLayer(aVLayer);
switch (this._meteoDataInfo.getDrawType2D()) {
case VECTOR:
case BARB:
_lastAddedLayerHandle = _parent.getMapDocument().getActiveMapFrame().addWindLayer(aVLayer,
_meteoDataInfo.EarthWind);
break;
default:
_lastAddedLayerHandle = _parent.getMapDocument().getActiveMapFrame().insertPolylineLayer(aVLayer);
break;
}
}
} else {
@ -2901,7 +2905,7 @@ public class FrmMeteoData extends javax.swing.JDialog {
hasNoData = false;
}
boolean ifAddLayer = true;
switch (_2DDrawType) {
switch (this._meteoDataInfo.getDrawType2D()) {
case STATION_POINT:
LegendManage.setContoursAndColors(aLS, _cValues, _cColors);
LName = "StationPoint_" + LName;
@ -2940,14 +2944,14 @@ public class FrmMeteoData extends javax.swing.JDialog {
if (stUVData != null) {
StationData stUData = stUVData[0];
StationData stVData = stUVData[1];
switch (_2DDrawType) {
switch (this._meteoDataInfo.getDrawType2D()) {
case VECTOR:
case BARB:
if (this.windColor) {
LegendManage.setContoursAndColors(aLS, _cValues, _cColors);
}
if (_2DDrawType == DrawType2D.VECTOR) {
if (this._meteoDataInfo.getDrawType2D() == DrawType2D.VECTOR) {
LName = "Vector_" + LName;
if (this.windColor) {
aLayer = DrawMeteoData.createSTVectorLayer(stUData, stVData, _stationData,