From 986405365e82654ac4157a314fb2038d6195e232 Mon Sep 17 00:00:00 2001 From: Jan Felix Wiebe Date: Thu, 29 Dec 2016 23:10:37 +0100 Subject: [PATCH 1/9] reworked bus connection for better error handling --- .../c3seidenstrasse/networkcontroller/route/Network.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/de/c3seidenstrasse/networkcontroller/route/Network.java b/src/de/c3seidenstrasse/networkcontroller/route/Network.java index a45267a..9f3cead 100644 --- a/src/de/c3seidenstrasse/networkcontroller/route/Network.java +++ b/src/de/c3seidenstrasse/networkcontroller/route/Network.java @@ -27,7 +27,7 @@ public class Network implements Runnable { private final Thread t; - private final SssConnection sssc; + private SssConnection sssc = null; private final Map idMap; @@ -47,10 +47,10 @@ private Network(final boolean withNetwork) { } this.getRoot().create33c3(); - if (withNetwork) { + try { this.sssc = new SssConnection(this, "/dev/ttyUSB0"); - } else { - this.sssc = null; + } catch (final UnsatisfiedLinkError e) { + System.err.println("Could not connect bus!"); } this.t = new Thread(this, "NetworkWorker"); From 7f02a2f3c53bf67b137bb6cce4411f5dea60853d Mon Sep 17 00:00:00 2001 From: Jan Felix Wiebe Date: Thu, 29 Dec 2016 23:17:53 +0100 Subject: [PATCH 2/9] adjusted display size --- src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml index abfa260..c861ea5 100644 --- a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml +++ b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml @@ -7,7 +7,7 @@ - + From 8106c8fcbd1d055aeb398667d193f4daec1aa995 Mon Sep 17 00:00:00 2001 From: Jan Felix Wiebe Date: Thu, 29 Dec 2016 23:18:29 +0100 Subject: [PATCH 3/9] added scrolling to last entry --- .../networkcontroller/gui/NetworkScreenController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreenController.java b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreenController.java index 62a098a..f791e1c 100644 --- a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreenController.java +++ b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreenController.java @@ -11,6 +11,7 @@ import de.c3seidenstrasse.networkcontroller.utils.RouteNotFoundException; import javafx.application.Platform; import javafx.collections.FXCollections; +import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.scene.control.TreeItem; @@ -48,6 +49,9 @@ public Network init() { // Message Queue this.messageLog.setItems(this.n.getBusProtocolHistory()); this.messageLog.prefHeightProperty().bind(this.rightVbox.heightProperty().divide(2)); + this.n.getBusProtocolHistory().addListener((ListChangeListener) c -> { + this.messageLog.scrollTo(this.n.getBusProtocolHistory().size()); + }); // Transport Queue this.transportLog.prefHeightProperty().bind(this.rightVbox.heightProperty().divide(2)); From a290594f9fdead6cab43f6c5d7f4d61806a1200c Mon Sep 17 00:00:00 2001 From: Jan Felix Wiebe Date: Thu, 29 Dec 2016 23:57:30 +0100 Subject: [PATCH 4/9] added interconnect feature --- .../networkcontroller/gui/NetworkScreen.fxml | 9 +-- .../gui/NetworkScreenController.java | 34 ++++----- .../networkcontroller/route/Interconnect.java | 75 +++++++++++++++++++ 3 files changed, 92 insertions(+), 26 deletions(-) create mode 100644 src/de/c3seidenstrasse/networkcontroller/route/Interconnect.java diff --git a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml index c861ea5..e19e972 100644 --- a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml +++ b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml @@ -28,17 +28,16 @@ -