From a20334d0265148076b107918797b11289a4baf7c Mon Sep 17 00:00:00 2001 From: Eiren Rain Date: Tue, 13 Jul 2021 17:25:15 +0300 Subject: [PATCH] Fixed trackers ping not being displayed --- src/main/java/io/eiren/gui/TrackersList.java | 26 +++++++++----------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/io/eiren/gui/TrackersList.java b/src/main/java/io/eiren/gui/TrackersList.java index 13df27a02e..474e44cfe0 100644 --- a/src/main/java/io/eiren/gui/TrackersList.java +++ b/src/main/java/io/eiren/gui/TrackersList.java @@ -176,10 +176,8 @@ public void actionPerformed(ActionEvent e) { add(status = new JLabel(t.getStatus().toString().toLowerCase()), c(1, 4, 0, GridBagConstraints.FIRST_LINE_START)); add(new JLabel("Battery:"), c(2, 4, 0, GridBagConstraints.FIRST_LINE_START)); add(bat = new JLabel("0"), c(3, 4, 0, GridBagConstraints.FIRST_LINE_START)); - if(t instanceof ReferenceAdjustedTracker) { - add(new JLabel("Raw:"), c(0, 5, 0, GridBagConstraints.FIRST_LINE_START)); - add(raw = new JLabel("0 0 0 0"), s(c(1, 5, 0, GridBagConstraints.FIRST_LINE_START), 3, 1)); - } + add(new JLabel("Raw:"), c(0, 5, 0, GridBagConstraints.FIRST_LINE_START)); + add(raw = new JLabel("0 0 0 0"), s(c(1, 5, 0, GridBagConstraints.FIRST_LINE_START), 3, 1)); setBorder(BorderFactory.createLineBorder(new Color(0x663399), 4, true)); TrackersList.this.add(this); @@ -208,16 +206,16 @@ public void update() { } if(t instanceof TrackerWithBattery) bat.setText(StringUtils.prettyNumber(((TrackerWithBattery) t).getBatteryVoltage(), 1)); - if(t instanceof IMUTracker) - ping.setText(String.valueOf(((IMUTracker) t).ping)); - if(t instanceof ReferenceAdjustedTracker) { - ReferenceAdjustedTracker t2 = (ReferenceAdjustedTracker) t; - t2.getTracker().getRotation(q); - raw.setText(StringUtils.prettyNumber(q.getX(), 4) - + " " + StringUtils.prettyNumber(q.getY(), 4) - + " " + StringUtils.prettyNumber(q.getZ(), 4) - + " " + StringUtils.prettyNumber(q.getW(), 4)); - } + Tracker t2 = t; + if(t instanceof ReferenceAdjustedTracker) + t2 = ((ReferenceAdjustedTracker) t).getTracker(); + if(t2 instanceof IMUTracker) + ping.setText(String.valueOf(((IMUTracker) t2).ping)); + t2.getRotation(q); + raw.setText(StringUtils.prettyNumber(q.getX(), 4) + + " " + StringUtils.prettyNumber(q.getY(), 4) + + " " + StringUtils.prettyNumber(q.getZ(), 4) + + " " + StringUtils.prettyNumber(q.getW(), 4)); } }