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

Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop

Browse Source
This commit is contained in:
Calum
2017-05-04 12:46:07 +12:00
parent 3aefb14faf 8521b68855
commit c7b6261602
6 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/App.java
+2 -2
View File
@@ -1,7 +1,6 @@
package seng302; package seng302;
import javafx.application.Application; import javafx.application.Application;
import javafx.application.Platform;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.Parent; import javafx.scene.Parent;
import javafx.scene.Scene; import javafx.scene.Scene;
@@ -20,8 +19,9 @@ public class App extends Application
primaryStage.setMaximized(true); primaryStage.setMaximized(true);
primaryStage.show(); primaryStage.show();
primaryStage.setOnCloseRequest(e -> { primaryStage.setOnCloseRequest(e -> {
Platform.exit(); System.exit(0);
}); });
} }
src/main/java/seng302/models/parsers/StreamParser.java
+47 -44
View File
@@ -1,7 +1,6 @@
package seng302.models.parsers; package seng302.models.parsers;
import javafx.geometry.Point3D;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
@@ -12,7 +11,6 @@ import seng302.models.parsers.packets.StreamPacket;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.text.DateFormat; import java.text.DateFormat;
@@ -110,48 +108,53 @@ public class StreamParser extends Thread{
* @param packet the packet to be looked at * @param packet the packet to be looked at
*/ */
private static void parsePacket(StreamPacket packet) { private static void parsePacket(StreamPacket packet) {
switch (packet.getType()){ try{
case HEARTBEAT: switch (packet.getType()){
extractHeartBeat(packet); case HEARTBEAT:
break; extractHeartBeat(packet);
case RACE_STATUS: break;
extractRaceStatus(packet); case RACE_STATUS:
break; extractRaceStatus(packet);
case DISPLAY_TEXT_MESSAGE: break;
extractDisplayMessage(packet); case DISPLAY_TEXT_MESSAGE:
break; extractDisplayMessage(packet);
case XML_MESSAGE: break;
extractXmlMessage(packet); case XML_MESSAGE:
break; extractXmlMessage(packet);
case RACE_START_STATUS: break;
extractRaceStartStatus(packet); case RACE_START_STATUS:
break; extractRaceStartStatus(packet);
case YACHT_EVENT_CODE: break;
extractYachtEventCode(packet); case YACHT_EVENT_CODE:
break; extractYachtEventCode(packet);
case YACHT_ACTION_CODE: break;
extractYachtActionCode(packet); case YACHT_ACTION_CODE:
break; extractYachtActionCode(packet);
case CHATTER_TEXT: break;
extractChatterText(packet); case CHATTER_TEXT:
break; extractChatterText(packet);
case BOAT_LOCATION: break;
extractBoatLocation(packet); case BOAT_LOCATION:
break; extractBoatLocation(packet);
case MARK_ROUNDING: break;
extractMarkRounding(packet); case MARK_ROUNDING:
break; extractMarkRounding(packet);
case COURSE_WIND: break;
extractCourseWind(packet); case COURSE_WIND:
break; extractCourseWind(packet);
case AVG_WIND: break;
extractAvgWind(packet); case AVG_WIND:
break; extractAvgWind(packet);
default: break;
break; default:
//System.out.println(packet.getType().toString()); break;
} //System.out.println(packet.getType().toString());
} }
}
catch (NullPointerException e){
System.out.println("Error parsing packet");
}
}
/** /**
* Extracts the seq num used in the heartbeat packet * Extracts the seq num used in the heartbeat packet
src/main/java/seng302/server/ServerThread.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class ServerThread implements Runnable, Observer {
thereAreBoatsNotFinished = true; thereAreBoatsNotFinished = true;
} }
BoatSubMessage m = new BoatSubMessage(b.getSourceID(), boatStatus, b.getLastPassedCorner().getSeqID(), 0, 0, 0, 0); BoatSubMessage m = new BoatSubMessage(b.getSourceID(), boatStatus, b.getLastPassedCorner().getSeqID(), 0, 0, b.getEstimatedTimeTillFinish(), b.getEstimatedTimeTillFinish());
boatSubMessages.add(m); boatSubMessages.add(m);
} }
src/main/java/seng302/server/messages/BoatSubMessage.java
+18 -25
View File
@@ -1,6 +1,5 @@
package seng302.server.messages; package seng302.server.messages;
import java.io.DataOutputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
/** /**
@@ -16,6 +15,8 @@ public class BoatSubMessage{
private long numberPenaltiesServed; private long numberPenaltiesServed;
private long estimatedTimeAtNextMark; private long estimatedTimeAtNextMark;
private long estimatedTimeAtFinish; private long estimatedTimeAtFinish;
private ByteBuffer buff = ByteBuffer.allocate(getSize());
private int buffPos = 0;
/** /**
* Boat Sub message from section 4.2 of the AC35 streaming data interface spec * Boat Sub message from section 4.2 of the AC35 streaming data interface spec
@@ -45,47 +46,39 @@ public class BoatSubMessage{
return MESSAGE_SIZE; return MESSAGE_SIZE;
} }
private void putInBuffer(byte[] bytes, long val){
byte[] tmp = bytes.clone();
Message.reverse(tmp);
buff.put(tmp);
buffPos += tmp.length;
buff.position(buffPos);
}
/** /**
* @return a ByteBuffer containing this boat status message * @return a ByteBuffer containing this boat status message
*/ */
public ByteBuffer getByteBuffer(){ public ByteBuffer getByteBuffer(){
ByteBuffer buff = ByteBuffer.allocate(getSize());
int buffPos = 0;
// Source ID, 4 bytes // Source ID, 4 bytes
buff.put(ByteBuffer.allocate(4).putInt((int) sourceId).array()); putInBuffer(Message.intToByteArray(sourceId, 4), 4);
buffPos += 4;
buff.position(buffPos);
// Boat Status, 1 byte // Boat Status, 1 byte
buff.put(ByteBuffer.allocate(1).put((byte) (boatStatus.getCode() & 0xff)).array()); putInBuffer(ByteBuffer.allocate(1).put((byte) (boatStatus.getCode() & 0xff)).array(), 1);
buffPos += 1;
buff.position(buffPos);
// Leg number, 1 byte // Leg number, 1 byte
buff.put(ByteBuffer.allocate(1).put((byte) (legNumber & 0xff)).array()); putInBuffer(ByteBuffer.allocate(1).put((byte) (legNumber & 0xff)).array(), 1);
buffPos += 1;
buff.position(buffPos);
// Number of penalties awarded, 1 byte // Number of penalties awarded, 1 byte
buff.put(ByteBuffer.allocate(1).put((byte) (numberPenaltiesAwarded & 0xff)).array()); putInBuffer(ByteBuffer.allocate(1).put((byte) (numberPenaltiesAwarded & 0xff)).array(), 1);
buffPos += 1;
buff.position(buffPos);
// Number of penalties served, 1 byte // Number of penalties served, 1 byte
buff.put(ByteBuffer.allocate(1).put((byte) (numberPenaltiesServed & 0xff)).array()); putInBuffer(ByteBuffer.allocate(1).put((byte) (numberPenaltiesServed & 0xff)).array(), 1);
buffPos += 1;
buff.position(buffPos);
// Estimated time at next mark, 6 bytes // Estimated time at next mark, 6 bytes
buff.put(ByteBuffer.allocate(6).putInt((int) estimatedTimeAtNextMark).array()); putInBuffer(Message.intToByteArray((int) estimatedTimeAtNextMark, 6),6);
buffPos += 6;
buff.position(buffPos);
// Estimated time at finish, 6 bytes // Estimated time at finish, 6 bytes
buff.put(ByteBuffer.allocate(6).putInt((int) estimatedTimeAtFinish).array()); putInBuffer(Message.intToByteArray((int) estimatedTimeAtFinish, 6), 6);
buffPos += 6;
buff.position(buffPos);
return buff; return buff;
} }
src/main/java/seng302/server/messages/Message.java
+1 -1
View File
@@ -140,7 +140,7 @@ public abstract class Message {
* @param size number of bytes * @param size number of bytes
*/ */
void putBytes(ByteBuffer bytes, int size){ void putBytes(ByteBuffer bytes, int size){
buffer.put(bytes); buffer.put(bytes.array());
moveBufferPositionBy(size); moveBufferPositionBy(size);
} }
src/main/java/seng302/server/simulator/Boat.java
+6
View File
@@ -11,6 +11,7 @@ public class Boat {
private double speed; // in mm/sec private double speed; // in mm/sec
private String boatName, shortName, shorterName; private String boatName, shortName, shorterName;
private boolean isFinished; private boolean isFinished;
private long estimatedTimeTillFinish;
private Corner lastPassedCorner, headingCorner; private Corner lastPassedCorner, headingCorner;
@@ -18,6 +19,7 @@ public class Boat {
this.sourceID = sourceID; this.sourceID = sourceID;
this.boatName = boatName; this.boatName = boatName;
this.isFinished = false; this.isFinished = false;
estimatedTimeTillFinish = 0;
} }
/** /**
@@ -116,4 +118,8 @@ public class Boat {
public void setFinished(boolean finished) { public void setFinished(boolean finished) {
isFinished = finished; isFinished = finished;
} }
public long getEstimatedTimeTillFinish(){
return (long) (getSpeed()) + System.currentTimeMillis();
}
} }