From 9667057ec434741f4cc316c9ec0b9f30fc37bd5b Mon Sep 17 00:00:00 2001 From: xiaowuler Date: Fri, 18 Mar 2022 10:04:31 +0800 Subject: [PATCH] modify cut configuration --- .../radarresolver/weather/domain/CommonBlock.java | 10 +++++----- .../{ScanConfiguration.java => CutConfiguration.java} | 4 ++-- .../xiaowuler/radarresolver/weather/domain/Radial.java | 1 + .../radarresolver/weather/resolver/RadarReader.java | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) rename 04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/{ScanConfiguration.java => CutConfiguration.java} (97%) diff --git a/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/CommonBlock.java b/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/CommonBlock.java index bf2d234..cdf1033 100644 --- a/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/CommonBlock.java +++ b/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/CommonBlock.java @@ -17,19 +17,19 @@ public class CommonBlock { private GenericHeader genericHeader; private SiteConfiguration siteConfiguration; private TaskConfiguration taskConfiguration; - private List scanConfigurations; + private List cutConfigurations; public CommonBlock(ICustomInputStream ICustomInputStream) throws IOException { this.genericHeader = new GenericHeader(ICustomInputStream); this.siteConfiguration = new SiteConfiguration(ICustomInputStream); this.taskConfiguration = new TaskConfiguration(ICustomInputStream); - addScanConfigurations(ICustomInputStream); + addCutConfigurations(ICustomInputStream); } - private void addScanConfigurations(ICustomInputStream ICustomInputStream) throws IOException { - this.scanConfigurations = new ArrayList<>(taskConfiguration.getCutNumber()); + private void addCutConfigurations(ICustomInputStream ICustomInputStream) throws IOException { + this.cutConfigurations = new ArrayList<>(taskConfiguration.getCutNumber()); for(int index = 0; index < taskConfiguration.getCutNumber(); index++){ - scanConfigurations.add(new ScanConfiguration(ICustomInputStream)); + cutConfigurations.add(new CutConfiguration(ICustomInputStream)); } } } diff --git a/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/ScanConfiguration.java b/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/CutConfiguration.java similarity index 97% rename from 04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/ScanConfiguration.java rename to 04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/CutConfiguration.java index 015e782..e33f0a3 100644 --- a/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/ScanConfiguration.java +++ b/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/CutConfiguration.java @@ -11,7 +11,7 @@ import com.xiaowuler.radarresolver.custom.ICustomInputStream; * @createTime: 2022-03-09 10:47 */ @Data -public class ScanConfiguration { +public class CutConfiguration { private int processMode; private int waveForm; private float PRF1; @@ -57,7 +57,7 @@ public class ScanConfiguration { private short groundClutterFilterWindow; private byte[] reserved; - public ScanConfiguration(ICustomInputStream ICustomInputStream) throws IOException { + public CutConfiguration(ICustomInputStream ICustomInputStream) throws IOException { this.processMode = ICustomInputStream.readInt(); this.waveForm = ICustomInputStream.readInt(); this.PRF1 = ICustomInputStream.readFloat(); diff --git a/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/Radial.java b/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/Radial.java index 54300e6..aab8571 100644 --- a/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/Radial.java +++ b/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/domain/Radial.java @@ -15,6 +15,7 @@ import com.xiaowuler.radarresolver.custom.ICustomInputStream; @Data public class Radial { + private RadialHeader radialHeader; private List momentBlocks; diff --git a/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/resolver/RadarReader.java b/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/resolver/RadarReader.java index 8a2fcc6..ac82377 100644 --- a/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/resolver/RadarReader.java +++ b/04.系统编码/03.radar-resolver/src/main/java/com/xiaowuler/radarresolver/weather/resolver/RadarReader.java @@ -64,14 +64,14 @@ public class RadarReader { } public List> getCoordinate(){ - ScanConfiguration scanConfiguration = radarBlock.getCommonBlock().getScanConfigurations().get(0); + CutConfiguration cutConfiguration = radarBlock.getCommonBlock().getCutConfigurations().get(0); List radials = radarBlock.getRadialBlock().getRadials().stream().filter(r -> r.getRadialHeader().getElevationNumber() == 1).collect(Collectors.toList()); List> result = new ArrayList<>(radials.size()); for(Radial radial : radials){ double[] values = radial.getMomentBlocks().get(0).getMomentData().getData(); List rows = new ArrayList<>(values.length); for(int index = 0, len = values.length; index < len; index ++){ - rows.add(calcLonLat((index + 1) * scanConfiguration.getLogResolution(), radial.getRadialHeader().getAzimuth(), radial.getRadialHeader().getElevation(), + rows.add(calcLonLat((index + 1) * cutConfiguration.getLogResolution(), radial.getRadialHeader().getAzimuth(), radial.getRadialHeader().getElevation(), radarBlock.getCommonBlock().getSiteConfiguration().getLongitude(), radarBlock.getCommonBlock().getSiteConfiguration().getLatitude())); } result.add(rows);