Skip to content

Alert itrusion refactoring #134

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
Abhiram98 wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Alert itrusion refactoring #134

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
acfff40
rename gg, g2
Abhiram98 Aug 4, 2024
d76be94
split long method 'paint'
Abhiram98 Aug 4, 2024
f00bc28
convert for loop to foreach
Abhiram98 Aug 4, 2024
cbdb07f
use ternary operator
Abhiram98 Aug 4, 2024
4142aee
rename askForLaterRepaint -> repaintRequest
Abhiram98 Aug 4, 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
Prev Previous commit
rename askForLaterRepaint -> repaintRequest
  • Loading branch information
@Abhiram98
Abhiram98 committed Aug 4, 2024
commit 4142aeeb1800f728da4fab70efb84e7edab10efc
8 changes: 4 additions & 4 deletions ...ns-dev/alert-intrusion/src/java/pt/lsts/neptus/plugins/alertintrusion/AlertIntrusion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ public void paint(Graphics2D g, StateRenderer2D renderer) {
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
sdf.setTimeZone(TimeZone.getTimeZone("UTC"));

AtomicBoolean askForLaterRepaint = new AtomicBoolean(false);
AtomicBoolean repaintRequest = new AtomicBoolean(false);

boolean recreateImage = layerPainter.paintPhaseStartTestRecreateImageAndRecreate(g, renderer);
if (recreateImage) {
Expand All @@ -310,14 +310,14 @@ public void paint(Graphics2D g, StateRenderer2D renderer) {
graphicsContext.translate(20, 100);
boolean res = !graphicsContext.drawImage(colregImage, null, null);
if (res) {
askForLaterRepaint.compareAndSet(false, true);
repaintRequest.compareAndSet(false, true);
}
graphicsContext.dispose();

createInfoLabel(imageGraphics);
}

AtomicReference<String> shipClosest = detectAndRenderClosestCollision(renderer, sdf, askForLaterRepaint, imageGraphics);
AtomicReference<String> shipClosest = detectAndRenderClosestCollision(renderer, sdf, repaintRequest, imageGraphics);

Point2D indicatorPoint = new Point2D.Double(20 + 25, 100 + 25);
AtomicReference<Short> mainlookAngle = new AtomicReference<>((short) 0);
Expand Down Expand Up @@ -369,7 +369,7 @@ public void paint(Graphics2D g, StateRenderer2D renderer) {
}

layerPainter.paintPhaseEndFinishImageRecreateAndPaintImageCacheToRenderer(g, renderer);
if (askForLaterRepaint.get()) {
if (repaintRequest.get()) {
layerPainter.triggerImageRebuild();
renderer.invalidate();
renderer.repaint(10);
Expand Down