From 724d1ece4ab868baa54c57bee4d3892c994bb15d Mon Sep 17 00:00:00 2001 From: Pedro Costa Date: Wed, 17 Jan 2024 13:39:32 +0000 Subject: [PATCH 1/2] sidescan/SidescanPanel: Code cleanup, remove redudantant assignment. --- .../pt/lsts/neptus/plugins/sidescan/SidescanPanel.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins-dev/echosounder/src/java/pt/lsts/neptus/plugins/sidescan/SidescanPanel.java b/plugins-dev/echosounder/src/java/pt/lsts/neptus/plugins/sidescan/SidescanPanel.java index 609cc2c0fa..619dafc265 100644 --- a/plugins-dev/echosounder/src/java/pt/lsts/neptus/plugins/sidescan/SidescanPanel.java +++ b/plugins-dev/echosounder/src/java/pt/lsts/neptus/plugins/sidescan/SidescanPanel.java @@ -415,9 +415,7 @@ void updateImage(long currentTime, long lastUpdateTime) { ArrayList list = ssParser.getLinesBetween(firstPingTime + lastUpdateTime, firstPingTime + currentTime, subsystem, autoEGN ? SidescanHistogramNormalizer.HISTOGRAM_DEFAULT_PARAMATERS : sidescanParams); - ArrayList drawList = new ArrayList<>(list); - - for (SidescanLine l : drawList) { + for (SidescanLine l : list) { // Update the rangeMax to the ruler if (l.getRange() != getRangeForRuler()) { setRangeForRuler(l.getRange()); @@ -460,7 +458,7 @@ void updateImage(long currentTime, long lastUpdateTime) { int d = 0; - for (SidescanLine sidescanLine : drawList) { + for (SidescanLine sidescanLine : list) { sidescanLine.setYPos(yref - d); d += sidescanLine.getYSize(); if (sidescanLine.getData().length <= 0) { @@ -499,11 +497,11 @@ void updateImage(long currentTime, long lastUpdateTime) { if (sidescanLine.getYPos() > image.getHeight()) removeList.add(sidescanLine); } - lineList.addAll(drawList); + lineList.addAll(list); lineList.removeAll(removeList); } - drawList.clear(); + list.clear(); removeList.clear(); } From 0a7b0febf54501a60bb59d6fe957b775c822af9a Mon Sep 17 00:00:00 2001 From: Pedro Costa Date: Wed, 17 Jan 2024 15:56:26 +0000 Subject: [PATCH 2/2] sidescan/SidescanPanel: Code cleanup, remove redudantant assignment. --- .../pt/lsts/neptus/plugins/sidescan/SidescanPanel.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins-dev/echosounder/src/java/pt/lsts/neptus/plugins/sidescan/SidescanPanel.java b/plugins-dev/echosounder/src/java/pt/lsts/neptus/plugins/sidescan/SidescanPanel.java index 619dafc265..e51b685fbf 100644 --- a/plugins-dev/echosounder/src/java/pt/lsts/neptus/plugins/sidescan/SidescanPanel.java +++ b/plugins-dev/echosounder/src/java/pt/lsts/neptus/plugins/sidescan/SidescanPanel.java @@ -489,13 +489,11 @@ void updateImage(long currentTime, long lastUpdateTime) { // g2d.drawImage(sidescanLine.image, 0, sidescanLine.ypos, null); } synchronized (lineList) { - SidescanLine sidescanLine; // Must be in synchronized block for (SidescanLine line : lineList) { - sidescanLine = line; - sidescanLine.setYPos(sidescanLine.getYPos() + yref); - if (sidescanLine.getYPos() > image.getHeight()) - removeList.add(sidescanLine); + line.setYPos(line.getYPos() + yref); + if (line.getYPos() > image.getHeight()) + removeList.add(line); } lineList.addAll(list); lineList.removeAll(removeList);