michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made start/finish lines a different color.

Browse Source 
#story[923]
This commit is contained in:
Alistair McIntyre
2017-05-22 15:10:05 +12:00
parent be633c0e60
commit 78573fa837
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/App.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class App extends Application {
//Change the StreamReceiver in this else block to change the default data source. //Change the StreamReceiver in this else block to change the default data source.
else{ else{
// sr = new StreamReceiver("localhost", 4949, "RaceStream"); // sr = new StreamReceiver("localhost", 4949, "RaceStream");
sr = new StreamReceiver("localhost", 4949, "RaceStream"); sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
} }
sr.start(); sr.start();
src/main/java/seng302/controllers/CanvasController.java
+2 -3
View File
@@ -254,9 +254,9 @@ public class CanvasController {
} }
private void initializeMarks() { private void initializeMarks() {
Map<Integer, Mark> allMarks = StreamParser.getXmlObject().getRaceXML().getCompoundMarks(); ArrayList<Mark> allMarks = StreamParser.getXmlObject().getRaceXML().getCompoundMarks();
System.out.println(allMarks); System.out.println(allMarks);
for (Mark mark : allMarks.values()) { for (Mark mark : allMarks) {
if (mark.getMarkType() == MarkType.SINGLE_MARK) { if (mark.getMarkType() == MarkType.SINGLE_MARK) {
SingleMark sMark = (SingleMark) mark; SingleMark sMark = (SingleMark) mark;
@@ -270,7 +270,6 @@ public class CanvasController {
} }
} }
group.getChildren().addAll(markGroups); group.getChildren().addAll(markGroups);
System.out.println(group.getChildren());
} }
class ResizableCanvas extends Canvas { class ResizableCanvas extends Canvas {
src/main/java/seng302/models/stream/XMLParser.java
+10 -8
View File
@@ -235,7 +235,7 @@ public class XMLParser {
//Non atomic race attributes //Non atomic race attributes
private ArrayList<Participant> participants; private ArrayList<Participant> participants;
private Map<Integer, Mark> course; private ArrayList<Mark> course;
private ArrayList<Corner> compoundMarkSequence; private ArrayList<Corner> compoundMarkSequence;
private ArrayList<Limit> courseLimit; private ArrayList<Limit> courseLimit;
@@ -312,22 +312,24 @@ public class XMLParser {
} }
private Map<Integer, Mark> createCompoundMarks(Element docEle) { private ArrayList<Mark> createCompoundMarks(Element docEle) {
Map<Integer, Mark> cMarks = new HashMap<>(); ArrayList<Mark> cMarks = new ArrayList<>();
NodeList cMarkList = docEle.getElementsByTagName("Course").item(0).getChildNodes(); NodeList cMarkList = docEle.getElementsByTagName("Course").item(0).getChildNodes();
for (int i = 0; i < cMarkList.getLength(); i++) { for (int i = 0; i < cMarkList.getLength(); i++) {
Node cMarkNode = cMarkList.item(i); Node cMarkNode = cMarkList.item(i);
if (cMarkNode.getNodeName().equals("CompoundMark")) { if (cMarkNode.getNodeName().equals("CompoundMark")) {
Integer markID = getNodeAttributeInt(cMarkNode, "CompoundMarkID");
Mark mark = createMark(cMarkNode); Mark mark = createMark(cMarkNode);
if (mark != null) { if (mark != null) {
cMarks.put(markID, mark); cMarks.add(mark);
} }
} }
} }
// This is awful but it works.
cMarks.get(0).setName("Start");
cMarks.get(cMarks.size()-1).setName("Finish");
return cMarks; return cMarks;
} }
@@ -397,7 +399,7 @@ public class XMLParser {
return participants; return participants;
} }
public Map<Integer, Mark> getCompoundMarks() { public ArrayList<Mark> getCompoundMarks() {
return course; return course;
} }