From 4c4d0f591f94428ed7e5d2f4ae5df5c5087d8c26 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期三, 18 六月 2025 09:51:35 +0800
Subject: [PATCH] 求解器版本升级到2.2
---
src/main/java/com/se/nsl/domain/dto/Zarr2Tif.java | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/se/nsl/domain/dto/Zarr2Tif.java b/src/main/java/com/se/nsl/domain/dto/Zarr2Tif.java
index ac573b0..4233587 100644
--- a/src/main/java/com/se/nsl/domain/dto/Zarr2Tif.java
+++ b/src/main/java/com/se/nsl/domain/dto/Zarr2Tif.java
@@ -17,9 +17,11 @@
private String terrain_file;
- private String start_timestamp;
+// private String start_timestamp;
- private List<Integer> frame_range;
+// private List<Integer> frame_range;
+
+ private List<Object> range;
private boolean fliplr;
@@ -27,23 +29,32 @@
public Zarr2Tif() {
variables = new ArrayList<>(Arrays.asList("depth", "xmomentum", "ymomentum"));
- frame_range = null;
+// frame_range = null;
fliplr = false;
flipud = false;
}
- public Zarr2Tif(String zarrFile, String geotiffDir, String terrainFile, String startTimestamp) {
+// public Zarr2Tif(String zarrFile, String geotiffDir, String terrainFile, String startTimestamp) {
+// this();
+//
+// this.zarr_file = zarrFile.replace("\\", "/");
+// this.geotiff_dir = geotiffDir.replace("\\", "/");
+// this.terrain_file = terrainFile.replace("\\", "/");
+// this.start_timestamp = startTimestamp;
+// }
+
+ public Zarr2Tif(String zarrFile, String geotiffDir, String terrainFile, List<Object> range) {
this();
this.zarr_file = zarrFile.replace("\\", "/");
this.geotiff_dir = geotiffDir.replace("\\", "/");
this.terrain_file = terrainFile.replace("\\", "/");
- this.start_timestamp = startTimestamp;
+ this.range = range;
}
- public Zarr2Tif(String zarrFile, String geotiffDir, String terrainFile, Date startTime) {
- this(zarrFile, geotiffDir, terrainFile, StringHelper.YMDHMS_FORMAT.format(startTime));
- }
+// public Zarr2Tif(String zarrFile, String geotiffDir, String terrainFile, Date startTime) {
+// this(zarrFile, geotiffDir, terrainFile, StringHelper.YMDHMS_FORMAT.format(startTime));
+// }
public List<String> getVariables() {
return variables;
@@ -77,20 +88,28 @@
this.terrain_file = terrain_file;
}
- public String getStart_timestamp() {
- return start_timestamp;
+// public String getStart_timestamp() {
+// return start_timestamp;
+// }
+//
+// public void setStart_timestamp(String start_timestamp) {
+// this.start_timestamp = start_timestamp;
+// }
+
+// public List<Integer> getFrame_range() {
+// return frame_range;
+// }
+//
+// public void setFrame_range(List<Integer> frame_range) {
+// this.frame_range = frame_range;
+// }
+
+ public List<Object> getRange() {
+ return range;
}
- public void setStart_timestamp(String start_timestamp) {
- this.start_timestamp = start_timestamp;
- }
-
- public List<Integer> getFrame_range() {
- return frame_range;
- }
-
- public void setFrame_range(List<Integer> frame_range) {
- this.frame_range = frame_range;
+ public void setRange(List<Object> range) {
+ this.range = range;
}
public boolean isFliplr() {
--
Gitblit v1.9.3