From 0afe9d2ef8bf06f1b1f93749c19eb3d90ec78f58 Mon Sep 17 00:00:00 2001 From: lucas lelievre Date: Sat, 11 Jun 2022 19:15:27 +0200 Subject: [PATCH] Fix optional in the feeder and bring back none option in the gui (#194) --- src/main/java/dev/slimevr/gui/TrackersList.java | 16 +++++++++++----- .../platform/windows/WindowsNamedPipeBridge.java | 2 +- .../dev/slimevr/vr/trackers/TrackerPosition.java | 6 +++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/dev/slimevr/gui/TrackersList.java b/src/main/java/dev/slimevr/gui/TrackersList.java index 705431ff1..a76220bc9 100644 --- a/src/main/java/dev/slimevr/gui/TrackersList.java +++ b/src/main/java/dev/slimevr/gui/TrackersList.java @@ -181,22 +181,28 @@ public class TrackersList extends EJBoxNoStretch { desSelect = new JComboBox<>(), s(c(0, row, 2, GridBagConstraints.FIRST_LINE_START), 2, 1) ); + desSelect.addItem("NONE"); for (TrackerPosition p : TrackerPosition.values) { desSelect.addItem(p.name()); } if (cfg.designation != null) { TrackerPosition .getByDesignation(cfg.designation) - .ifPresent( - trackerPosition -> desSelect.setSelectedItem(trackerPosition.name()) + .ifPresentOrElse( + trackerPosition -> desSelect.setSelectedItem(trackerPosition.name()), + () -> desSelect.setSelectedItem("NONE") ); } desSelect.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - TrackerPosition p = TrackerPosition - .valueOf(String.valueOf(desSelect.getSelectedItem())); - t.setBodyPosition(p); + if (desSelect.getSelectedItem() == "NONE") { + t.setBodyPosition(null); + } else { + TrackerPosition p = TrackerPosition + .valueOf(String.valueOf(desSelect.getSelectedItem())); + t.setBodyPosition(p); + } server.trackerUpdated(t); } }); diff --git a/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java index 9573c1285..b87c1a8f7 100644 --- a/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java @@ -114,7 +114,7 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements ); TrackerRole role = TrackerRole.getById(trackerAdded.getTrackerRole()); if (role != null) { - TrackerPosition.getByTrackerRole(role).ifPresent(tracker::setBodyPosition); + tracker.setBodyPosition(TrackerPosition.getByTrackerRole(role).orElse(null)); } return tracker; } diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java index 8c6018c94..687c70757 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java @@ -1,5 +1,7 @@ package dev.slimevr.vr.trackers; +import solarxr_protocol.datatypes.BodyPart; + import java.lang.reflect.Modifier; import java.util.EnumMap; import java.util.HashMap; @@ -7,8 +9,6 @@ import java.util.Map; import java.util.Optional; import java.util.logging.Level; -import solarxr_protocol.datatypes.BodyPart; - /** * Represents a position on the body that a tracker could be placed. Any bone is @@ -135,7 +135,7 @@ public enum TrackerPosition { } public static Optional getByBodyPart(int bodyPart) { - if (bodyPart < 0 || bodyPart >= TrackerPosition.byBodyPart.length) { + if (bodyPart <= 0 || bodyPart >= TrackerPosition.byBodyPart.length) { return Optional.empty(); } return Optional.of(TrackerPosition.byBodyPart[bodyPart]);