From dd480080c94e074ffcdd5b33820e9e0e2b7fab71 Mon Sep 17 00:00:00 2001 From: Kusal Ekanayake Date: Sun, 23 Apr 2017 14:57:26 +1200 Subject: [PATCH 1/8] Updated .mailmap to have the correct username for Kusal Ekanayake. --- .mailmap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 99d9ff08..c283ee3c 100644 --- a/.mailmap +++ b/.mailmap @@ -16,4 +16,5 @@ # https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html # http://stacktoheap.com/blog/2013/01/06/using-mailmap-to-fix-authors-list-in-git/ -Michael Rausch \ No newline at end of file +Michael Rausch +Kusal Ekanayake kre39 \ No newline at end of file From fdb84b66759ab5bac70a338128b79c7d969c32fa Mon Sep 17 00:00:00 2001 From: Haoming Yin Date: Sun, 23 Apr 2017 18:51:36 +1200 Subject: [PATCH 2/8] Update .mailmap for Haoming Yin's information. --- .mailmap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index c283ee3c..10e3c891 100644 --- a/.mailmap +++ b/.mailmap @@ -17,4 +17,5 @@ # http://stacktoheap.com/blog/2013/01/06/using-mailmap-to-fix-authors-list-in-git/ Michael Rausch -Kusal Ekanayake kre39 \ No newline at end of file +Kusal Ekanayake kre39 +Haoming Yin \ No newline at end of file From 672194adb4260864d05b5b0b192031c95640366a Mon Sep 17 00:00:00 2001 From: Peter Galloway Date: Sun, 23 Apr 2017 19:04:45 +1200 Subject: [PATCH 3/8] changed Peter Galloway's name to specified format --- .mailmap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 10e3c891..c1005f48 100644 --- a/.mailmap +++ b/.mailmap @@ -18,4 +18,5 @@ Michael Rausch Kusal Ekanayake kre39 -Haoming Yin \ No newline at end of file +Haoming Yin +Peter Galloway Peter \ No newline at end of file From b6fd90e9d7f8127cbc16b750dcf14690084b933d Mon Sep 17 00:00:00 2001 From: Zhi You Tan Date: Mon, 24 Apr 2017 18:33:06 +1200 Subject: [PATCH 4/8] Updated .mailmap for Zhi You Tan's information --- .mailmap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index c1005f48..6bb0a96c 100644 --- a/.mailmap +++ b/.mailmap @@ -19,4 +19,5 @@ Michael Rausch Kusal Ekanayake kre39 Haoming Yin -Peter Galloway Peter \ No newline at end of file +Peter Galloway Peter +Zhi You Tan zyt10 \ No newline at end of file From a77423b937b765eb0393d8acc12688d53eae7552 Mon Sep 17 00:00:00 2001 From: Michael Rausch Date: Mon, 1 May 2017 00:07:56 +1200 Subject: [PATCH 5/8] Added other email to .mailmap --- .mailmap | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 6bb0a96c..e6a6f21e 100644 --- a/.mailmap +++ b/.mailmap @@ -16,8 +16,10 @@ # https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html # http://stacktoheap.com/blog/2013/01/06/using-mailmap-to-fix-authors-list-in-git/ -Michael Rausch +Michael Rausch Kusal Ekanayake kre39 Haoming Yin Peter Galloway Peter -Zhi You Tan zyt10 \ No newline at end of file +Zhi You Tan zyt10 + + From 24667991f1d9b6b19b4e512bbb474e1ab7d8a999 Mon Sep 17 00:00:00 2001 From: William Muir Date: Thu, 4 May 2017 14:39:29 +1200 Subject: [PATCH 6/8] Merge on to master Final Push --- src/main/java/seng302/controllers/CanvasController.java | 9 ++++----- .../java/seng302/controllers/RaceViewController.java | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java index afd9e4d8..259311cc 100644 --- a/src/main/java/seng302/controllers/CanvasController.java +++ b/src/main/java/seng302/controllers/CanvasController.java @@ -17,6 +17,7 @@ import javafx.stage.Stage; import seng302.models.*; import seng302.models.mark.*; import seng302.models.parsers.StreamParser; +import seng302.models.parsers.StreamReceiver; import seng302.models.parsers.packets.BoatPositionPacket; import seng302.models.parsers.XMLParser; import seng302.models.parsers.XMLParser.RaceXMLObject.CompoundMark; @@ -129,13 +130,11 @@ public class CanvasController { // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay. elapsedNanos = 1000 / 60; updateRaceObjects(); - + if (StreamParser.isRaceFinished()) { + this.stop(); + } } }; - for (Mark m : raceViewController.getRace().getCourse()) { - //System.out.println(m.getName()); - } - //timer.start(); } diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java index 3b7ee6b5..a4cc2ece 100644 --- a/src/main/java/seng302/controllers/RaceViewController.java +++ b/src/main/java/seng302/controllers/RaceViewController.java @@ -309,7 +309,7 @@ public class RaceViewController extends Thread{ // } for (Yacht boat : StreamParser.getBoatsPos().values()) { - System.out.println(boat.getBoatStatus()); +// System.out.println(boat.getBoatStatus()); if (boat.getBoatStatus() == 3) { // 3 is finish status positionVbox.getChildren().add(new Text(boat.getPosition() + ". " + boat.getShortName() + " (Finished)")); From b529d621e9f3134158fae118527e5bdcbc037fe7 Mon Sep 17 00:00:00 2001 From: Peter Galloway Date: Thu, 4 May 2017 16:42:23 +1200 Subject: [PATCH 7/8] changed course size to 720x720 --- src/main/java/seng302/controllers/CanvasController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java index 259311cc..8fc7ed54 100644 --- a/src/main/java/seng302/controllers/CanvasController.java +++ b/src/main/java/seng302/controllers/CanvasController.java @@ -44,8 +44,8 @@ public class CanvasController { private final int MARK_SIZE = 10; private final int BUFFER_SIZE = 50; - private final int CANVAS_WIDTH = 1000; - private final int CANVAS_HEIGHT = 1000; + private final int CANVAS_WIDTH = 720; + private final int CANVAS_HEIGHT = 720; private final int LHS_BUFFER = BUFFER_SIZE; private final int RHS_BUFFER = BUFFER_SIZE + MARK_SIZE / 2; private final int TOP_BUFFER = BUFFER_SIZE; From 2cb09b81f8deec676a4b1ddf787c7253b056f3e5 Mon Sep 17 00:00:00 2001 From: Zhi You Tan Date: Thu, 4 May 2017 16:53:16 +1200 Subject: [PATCH 8/8] Updated .mailmap for everyone --- .mailmap | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index e6a6f21e..cad3a3a8 100644 --- a/.mailmap +++ b/.mailmap @@ -16,10 +16,12 @@ # https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html # http://stacktoheap.com/blog/2013/01/06/using-mailmap-to-fix-authors-list-in-git/ -Michael Rausch +Michael Rausch +Michael Rausch Kusal Ekanayake kre39 Haoming Yin Peter Galloway Peter Zhi You Tan zyt10 - - +Zhi You Tan Ryan Tan +Alistair McIntyre alistairjmcintyre +Calum cir27 \ No newline at end of file