Skip to content

sidescan/SidescanPanel: Code cleanup, remove redudantant assignment. #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pmdacosta wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

sidescan/SidescanPanel: Code cleanup, remove redudantant assignment. #133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
724d1ec
sidescan/SidescanPanel: Code cleanup, remove redudantant assignment.
pmdacosta Jan 17, 2024
0a7b0fe
sidescan/SidescanPanel: Code cleanup, remove redudantant assignment.
pmdacosta Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions plugins-dev/echosounder/src/java/pt/lsts/neptus/plugins/sidescan/SidescanPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,7 @@ void updateImage(long currentTime, long lastUpdateTime) {
ArrayList<SidescanLine> list = ssParser.getLinesBetween(firstPingTime + lastUpdateTime, firstPingTime
+ currentTime, subsystem, autoEGN ? SidescanHistogramNormalizer.HISTOGRAM_DEFAULT_PARAMATERS : sidescanParams);

ArrayList<SidescanLine> 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());
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -491,19 +489,17 @@ 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(drawList);
lineList.addAll(list);
lineList.removeAll(removeList);
}

drawList.clear();
list.clear();
removeList.clear();
}

Expand Down