Skip to content

Commit 2607def

Browse files
committed
soi/SoiInteraction: Erased vertical profiles display functionality.
1 parent 4c92543 commit 2607def

File tree

2 files changed

+3
-488
lines changed

2 files changed

+3
-488
lines changed

plugins-dev/soi/src/java/pt/lsts/neptus/soi/SoiInteraction.java

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,8 @@ public class SoiInteraction extends SimpleRendererInteraction implements Configu
105105

106106
@NeptusProperty(name = "Audio Notifications", userLevel = LEVEL.REGULAR)
107107
public boolean audioNotifications = true;
108-
109-
@NeptusProperty(name = "Maximum profile age (hours)", userLevel = LEVEL.REGULAR,
110-
description = "Profiles older than this age will be hidden")
111-
public int oldestProfiles = 24;
112-
113-
@NeptusProperty(name = "Use salinity colormap for profiles", userLevel = LEVEL.REGULAR)
114-
public boolean colorizeSalinity = false;
115-
116-
@NeptusProperty(name = "Show profile values", userLevel = LEVEL.REGULAR)
117-
public boolean profileValues = true;
118-
119-
private final VerticalProfileViewer profileView = new VerticalProfileViewer(oldestProfiles);
108+
109+
120110

121111
public SoiInteraction(ConsoleLayout console) {
122112
super(console);
@@ -313,24 +303,6 @@ protected void setParams(String vehicle, LinkedHashMap<String, String> params) {
313303
}
314304
}
315305

316-
@Subscribe
317-
public void on(VerticalProfile msg) {
318-
profileView.addProfile(msg);
319-
getConsole().post(Notification.success(I18n.text("Profile from "+msg.getSourceName()),
320-
I18n.textf("Received %param profile from %vehicle.",
321-
msg.getParameter() != null ? msg.getParameter().name().toLowerCase() : "unknown type", msg.getSourceName())));
322-
323-
if (audioNotifications) {
324-
VehicleType v = VehiclesHolder.getVehicleById(msg.getSourceName());
325-
String vName = "Vehicle";
326-
if (v != null)
327-
vName = v.getNickname();
328-
329-
say(vName+ " profile");
330-
331-
}
332-
}
333-
334306
private void say(String text) {
335307
if (audioNotifications) {
336308
SpeechUtil.removeStringsFromQueue(text);
@@ -462,19 +434,10 @@ public void mouseClicked(MouseEvent event, StateRenderer2D source) {
462434

463435
popup.add("Change plug-in settings").addActionListener(e -> {
464436
PluginUtils.editPluginProperties(SoiInteraction.this, true);
465-
profileView.setOldestProfiles(oldestProfiles);
466437
});
467438

468439
popup.show(source, event.getX(), event.getY());
469440
}
470-
else {
471-
profileView.mouseClicked(event, source);
472-
}
473-
}
474-
475-
@Override
476-
public void mouseMoved(MouseEvent event, StateRenderer2D source) {
477-
profileView.mouseMoved(event, source);
478441
}
479442

480443
private void sendCommand(SoiCommand cmd, final String system) {
@@ -488,15 +451,11 @@ public void paint(Graphics2D g, StateRenderer2D renderer) {
488451
if (!active && hideIfInactive)
489452
return;
490453

491-
SoiStateRenderer.paintStatic(g, renderer);
492-
profileView.setColorizeSalinity(colorizeSalinity);
493-
profileView.setValuesTable(profileValues);
494-
profileView.paint(g, renderer);
454+
SoiStateRenderer.paintStatic(g, renderer);
495455
}
496456

497457
@Override
498458
public void propertiesChanged() {
499-
profileView.setOldestProfiles(oldestProfiles);
500459
repaint();
501460
}
502461

0 commit comments

Comments
 (0)