/ - Diff - Colony - Robotics Club

Revision 35

revised colonet style

     	Thread drawThread;
     	SelectionIndicator indicator;
     	PacketMonitor packetMonitor;
     	ColonetServerInterface csi;
     	public void init () {
-...
     		indicator.setRadius(RADIUS+3, 15);  //a tad more than the bot radius
     		packetMonitor = new PacketMonitor();
     		datalistener = new DataListener();
     		csi = new ColonetServerInterface(log);
+    	}
     	public synchronized void paint (Graphics g)
+    	{
     	public synchronized void paint (Graphics g) {
     		/*	First, redraw the graphical components in the applet.
     			This paint method overrides the built-in paint of the
     			JApplet, and we don't want to deal with redrawing the
-...
+    	}
     	public synchronized void update (Graphics g)
+    	{
     	public synchronized void update (Graphics g) {
     		paint(g);
+    	}
     	public void actionPerformed (ActionEvent e)
+    	{
     	public void actionPerformed (ActionEvent e) {
     		Object source = e.getSource();
     		if (source == btnGraph) {
     			btnGraph.setEnabled(false);
-...
+    		}
+    	}
     	private void randomize ()
+    	{
     	private void randomize () {
     		Random r = new Random();
     		StringBuilder s = new StringBuilder();
     		int count = r.nextInt(8) + 1;
     		for (int i = 0; i < count; i++)
+    		{
     			for (int j = 0; j < count; j++)
+    			{
     		for (int i = 0; i < count; i++) {
     			for (int j = 0; j < count; j++) {
     				if (r.nextBoolean())
     					s.append("" + (r.nextInt(16) + 1));
     				else
-...
     		txtInput.setText(s.toString());
+    	}
     	private void doSocket ()
+    	{
     		//make sure hostname and port are valid
     		if (txtHost.getText().equals("") || txtPort.getText().equals("")) {
     			err("Please enter a hostname and port.");
     			return;
+    		}
     		int port = 0;
     		try {
     			port = Integer.parseInt(txtPort.getText());
     		} catch (Exception e) {
     			err("Invalid port");
     			return;
+    		}
     		//make sure we aren't already connected. if so, disconnect first.
     		if (socket != null && socket.isConnected()) {
     			try {
     				out.close();
     				socket.close();
     			} catch (IOException e) {}
+    		}
     		try {
     			socket = new Socket(txtHost.getText(), port);
     		} catch (UnknownHostException e) {
     			err("Unknown Host Exception");
     			return;
     		} catch (IOException e) {
     			err("IO Exception\n\n" + e);
     			return;
     		} catch (java.security.AccessControlException e) {
     			err("Permission denied by java.security.AccessControlException."
     			+"\n\nYou may only connect to the server from which this applet was loaded.");
     			return;
+    		}
     		if (socket == null || !socket.isConnected()) {
     			err("Connection failed. Try connecting again.");
     			return;
+    		}
     		msg("Connected to " + txtHost.getText() + " on port " + port + "\n");
     		lblConnectionStatus.setText("Online");
     		try {
     			out = new OutputStreamWriter(socket.getOutputStream());
     		} catch (IOException e) {
     			warn("Could not get OutputStream from socket connection.");
+    		}
     	private void doSocket () {
     		csi.connect(txtHost.getText(), txtPort.getText());
+    	}
     	public void drawRobot (int id, int x, int y)
+    	{
     	public void drawRobot (int id, int x, int y) {
     		//save the bot in memory, so we can tell if we click on it later
     		botRect[id] = new Rectangle(x-RADIUS, y-RADIUS, 2*RADIUS, 2*RADIUS);
-...
     		canvas.drawString("" + id, x-10, y+10);
+    	}
     	public void drawConnection (int start, int end, int radius, Color color)
+    	{
     	public void drawConnection (int start, int end, int radius, Color color) {
     		final int ARROW_LENGTH = 18;
     		double angle = 2.0 * Math.PI / numBots;
-...
     		int dx_half = (int)(ARROW_LENGTH/2 * Math.sin(theta));
     		int rx = (big_dx > 0) ? endx - dx_arrow : endx + dx_arrow;
     		int ry = (big_dy > 0) ? endy + dy_arrow : endy - dy_arrow;
     		//System.out.println("" + start + "->" + end + " : dx=" + big_dx + ",dy=" + big_dy + ",dy_arrow=" + dy_arrow + ",dx_arrow=" + dx_arrow + ",theta=" + theta + ",endx=" + endx + ",endy=" + endy + ",rx=" + rx + ",ry=" + ry);
     		poly.addPoint(endx, endy);
     		poly.addPoint(rx - dx_half, ry - dy_half);
     		poly.addPoint(rx + dx_half, ry + dy_half);
     		canvas.fillPolygon(poly);
+    	}
     	public void run ()
+    	{
     		while (true)
+    		{
     	public void run () {
     		while (true) {
     			step();
     			repaint();
     			try { Thread.sleep(90); }
     				catch (InterruptedException e) { return; }
     			try {
     				Thread.sleep(90);
     			} catch (InterruptedException e) {
     				return;
+    			}
+    		}
+    	}
     	public void step ()
+    	{
     	public void step () {
     		final int DIAMETER = image.getWidth() - 2*BUFFER;
     		final int BIGRADIUS = DIAMETER / 2;
     		final int TOKENRADIUS = 40;
-...
     		numBots = rows.length;
     		String [][] entries = new String[numBots][numBots];
     		valid = true;
     		for (int i = 0; i < numBots; i++)
+    		{
     		for (int i = 0; i < numBots; i++) {
     			entries[i] = rows[i].split(" ");
     			if (entries[i].length != rows.length) valid = false;
+    		}
     		if (valid)
+    		{
     		if (valid) {
     			this.showStatus("Matrix OK");
     			// draw robots and find which one is seleced
-...
     			botRect = new Rectangle[numBots];
     			int x, y;
     			if (selectedBot >= numBots) selectedBot = 0;
     			for (int i = 0; i < numBots; i++)
+    			{
     			for (int i = 0; i < numBots; i++) {
     				x = cx - (int)(BIGRADIUS * Math.cos(i * angle));
     				y = cy - (int)(BIGRADIUS * Math.sin(i * angle));
     				drawRobot(i, x, y);
-...
     			// create an inner circle along which the connections are made.
     			// let the diameter of this circle be 2*RADIUS less than the outerDiameter.
     			// see what connections exist
     			for (int row = 0; row < numBots; row++)
+    			{
     				for(int col = 0; col < numBots; col++)
+    				{
     					if (! entries[row][col].equals("-") && entries[col][row].equals("-") && row != col) //one-way
+    					{
     						//drawConnection(row, col, BIGRADIUS-RADIUS, Color.GRAY);
     			for (int row = 0; row < numBots; row++) {
     				for(int col = 0; col < numBots; col++) {
     					if (!entries[row][col].equals("-") && entries[col][row].equals("-") && row != col) {
     						//TODO: Make a standard gray
     						drawConnection(row, col, BIGRADIUS-RADIUS, new Color(200,200,200));
+    					}
     					else if (! entries[row][col].equals("-") && ! entries[col][row].equals("-") && row != col) //two-way
+    					{
     					else if (!entries[row][col].equals("-") && ! entries[col][row].equals("-") && row != col) {
     						drawConnection(row, col, BIGRADIUS-RADIUS, Color.BLACK);
+    					}
+    				}
-...
     			indicator.draw();
     			txtInfo.setText("Packet statistics: ???");
+    		}
     		else // if matrix is not valid
+    		{
     		} else {// if matrix is not valid
     			this.showStatus("Error: Invalid matrix");
+    		}
-...
     	*	token passing or deleted if the information can be retrieved
     	*	directly from the Colonet server instead.
     	*/
     	public void moveToken ()
+    	{
     		try { tokenLoc = (tokenLoc+1)%numBots; }
     			catch (ArithmeticException e) { }  // in case numRobots is zero
     	public void moveToken () {
     		try {
     			tokenLoc = (tokenLoc+1)%numBots;
     		} catch (ArithmeticException e) {  // in case numRobots is zero
+    		}
     		packetMonitor.addTokenPass();
+    	}
-...
     	public void mouseEntered(MouseEvent e) {}
     	public void mouseReleased(MouseEvent e) {}
     	public void mouseClicked(MouseEvent e) {}
     	public void mousePressed(MouseEvent e)
+    	{
     	public void mousePressed(MouseEvent e) {
     		try {
     			for (int i = 0; i < numBots; i++)
+    			{
     			for (int i = 0; i < numBots; i++) {
     				if (botRect[i].contains(e.getPoint()))
     					selectedBot = i;
+    			}
-...
+    	}
     	private void msg (String text) {JOptionPane.showMessageDialog(null, text, "Colonet", JOptionPane.INFORMATION_MESSAGE);}
     	private void warn (String text) {JOptionPane.showMessageDialog(null, text, "Colonet", JOptionPane.WARNING_MESSAGE);}
     	private void err (String text) {JOptionPane.showMessageDialog(null, text, "Colonet", JOptionPane.ERROR_MESSAGE);}
     	/*
     	*	SelectionIndicator thread.
     	*	Graphical representation of the selection marker
-...
     	*	externally and should only run if all calculations in step() have
     	*	been completed.
     	*/
     	private class SelectionIndicator extends Thread
+    	{
     	private class SelectionIndicator extends Thread {
     		final int INDICATOR_DELAY = 100;
     		final double DTHETA = 0.3;    //larger values make the marker rotate faster
-...
     		int steps;
     		public SelectionIndicator (Graphics2D g)
+    		{
     		public SelectionIndicator (Graphics2D g) {
     			super("SelectionIndicator");
     			this.g = g;
     			running = false;
-...
     			px4 = 0; py4 = 0;
+    		}
     		public synchronized void setCenter (int sx, int sy)
+    		{
     		public synchronized void setCenter (int sx, int sy) {
     			if (sx == this.sx && sy == this.sy) return;
     			this.sx = sx;
     			this.sy = sy;
     			steps = 0;
+    		}
     		public synchronized void setRadius (int r, int dr)
+    		{
     		public synchronized void setRadius (int r, int dr) {
     			this.r = r;
     			this.dr = dr;
     			steps = 0;
+    		}
     		public void run ()
+    		{
     		public void run () {
     			running = true;
     			while (running)
+    			{
     			while (running) {
     				step();
     				try { Thread.sleep(INDICATOR_DELAY); }
     					catch (InterruptedException e) {  running = false; return; }
     				try {
     					Thread.sleep(INDICATOR_DELAY);
     				} catch (InterruptedException e) {
     					running = false;
     					return;
+    				}
+    			}
+    		}
     		private synchronized void step ()
+    		{
     		private synchronized void step () {
     			Polygon poly1_new = new Polygon();
     			Polygon poly2_new = new Polygon();
     			Polygon poly3_new = new Polygon();
-...
     			int dx_poly = (int)(dr/2 * Math.sin(theta));
     			//determine critical points
     			//kansas city shuffle!
     			px1 = sx + dx_inner;
     			py1 = sy - dy_inner;
     			rx1 = sx + dx_outer;
-...
     			if (steps < 300) steps++;
+    		}
     		public synchronized void draw ()
+    		{
     		public synchronized void draw () {
     			if (!running) return;
     			g.setColor(Color.GRAY);
     			//draw polygons
-...
     	*	Simulator thread.
+    	*
     	*/
     	private class Simulator extends Thread
+    	{
     	private class Simulator extends Thread {
     		final int SIMULATOR_DELAY = 300;
     		boolean running;
     		public Simulator ()
+    		{
     		public Simulator () {
     			super("Simulator");
     			running = false;
+    		}
     		public void run ()
+    		{
     		public void run () {
     			running = true;
     			while (running)
+    			{
     			while (running) {
     				step();
     				try { Thread.sleep(SIMULATOR_DELAY); }
     					catch (InterruptedException e) { running = false; return; }
     				try {
     					Thread.sleep(SIMULATOR_DELAY);
     				} catch (InterruptedException e) {
     					running = false;
     					return;
+    				}
+    			}
+    		}
     		private void step ()
+    		{
     		private void step () {
     			// simulate passing the token
     			moveToken();
+    		}
+    	}
-...
     	*	Currently, this counts the rate of token passes but will eventually
     	*	be modified to keep more important statistics.
     	*/
     	private class PacketMonitor extends Thread
+    	{
     	private class PacketMonitor extends Thread {
     		final int PACKETMONITOR_DELAY = 1000;
     		boolean running;
     		int tokenPasses;
     		public PacketMonitor ()
+    		{
     		public PacketMonitor () {
     			super("PacketMonitor");
     			running = false;
     			tokenPasses = 0;
+    		}
     		public void run ()
+    		{
     		public void run () {
     			running = true;
     			while (running)
+    			{
     			while (running) {
     				displayTokenPasses();
     				try { Thread.sleep(PACKETMONITOR_DELAY); }
     					catch (InterruptedException e) { running = false; return; }
     				try {
     					Thread.sleep(PACKETMONITOR_DELAY);
     				} catch (InterruptedException e) {
     					running = false;
     					return;
+    				}
+    			}
+    		}
     		public synchronized void addTokenPass ()
+    		{
     		public synchronized void addTokenPass () {
     			tokenPasses++;
+    		}
     		public synchronized void displayTokenPasses ()
+    		{
     		public synchronized void displayTokenPasses () {
     			lblTokenPasses.setText("" + tokenPasses);
     			tokenPasses = 0;
+    		}
-...
     	*	DataListener thread.
+    	*
     	*/
     	class DataListener extends Thread
+    	{
     	class DataListener extends Thread {
     		final int DATALISTENER_DELAY = 1000;
     		BufferedReader reader;
     		public DataListener ()
+    		{
     		public DataListener () {
     			super("Colonet DataListener");
+    		}
     		public void run ()
+    		{
     		public void run () {
     			String line;
     			try {
     				reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
     			} catch (IOException e) {
     				warn("Could not open input stream from socket.\nTry relooding the applet.");
+    			}
     			while (true)
+    			{
     			reader = csi.getBufferedReader();
     			while (true) {
     				try {
     					if (reader.ready())
+    					{
     					if (csi.isReady()) {
     						line = reader.readLine();
     						if (line != null)
+    						{
     							msg("Incoming data: [" + line + "]");
     						if (line != null) {
     							csi.msg("Incoming data: [" + line + "]");
     							//TODO: parse incoming data here
+    						}
+    					}
     					Thread.sleep(DATALISTENER_DELAY);
     				} catch (InterruptedException e) {
     					return;
     				} catch (IOException e) {
     					warn("IOException while reading incoming data.");
     					csi.warn("IOException while reading incoming data.");
+    				}
+    			}
+    		}
+    	}
+    }

     		addToTargets = (
 F8B84001BDB6411CA292A,
     		);
     		breakpoints = (
     		);
     		codeSenseManager = A341617F0C989B510007BEF2;
     		executables = (
 F8B8C001BDBAD11CA292A,
-...
     				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
     				PBXFileTableDataSourceColumnWidthsKey = (
 ,
 ,
 ,
 ,
 ,
 ,
-...
 ,
 ,
 ,
 .1626,
 ,
 ,
 ,
     				);
-...
     					PBXFileDataSource_Warnings_ColumnID,
     				);
     			};
     			PBXPerProjectTemplateStateSaveDate = 211328603;
     			PBXWorkspaceStateSaveDate = 211328603;
     			PBXPerProjectTemplateStateSaveDate = 211332585;
     			PBXWorkspaceStateSaveDate = 211332585;
     		};
     		sourceControlManager = A341617E0C989B510007BEF2;
     		userBuildSettings = {
-...
     	};
 E68290FEC88D7311DB9C8B = {
     		uiCtxt = {
     			sepNavIntBoundsRect = "{{0, 0}, {1388, 12194}}";
     			sepNavSelRange = "{493, 22}";
     			sepNavVisRect = "{{0, 0}, {612, 647}}";
     			sepNavIntBoundsRect = "{{0, 0}, {686, 10976}}";
     			sepNavSelRange = "{20185, 0}";
     			sepNavVisRect = "{{0, 5872}, {606, 647}}";
     			sepNavWindowFrame = "{{539, 56}, {651, 776}}";
     		};
     	};
 E68291FEC88ED911DB9C8B = {
     		uiCtxt = {
     			sepNavIntBoundsRect = "{{0, 0}, {764, 924}}";
     			sepNavSelRange = "{0, 0}";
     			sepNavVisRect = "{{0, 0}, {606, 647}}";
     			sepNavWindowFrame = "{{525, 56}, {651, 776}}";
     		};
     	};
 F8B84001BDB6411CA292A = {
     		activeExec = 0;
     		executables = (
-...
     			YES,
     		);
     		argumentStrings = (
     			example1.html,
     			index_colonet.html,
     		);
     		configStateDict = {
     		};
-...
     		customDataFormattersEnabled = 1;
     		debuggerPlugin = GDBDebugging;
     		disassemblyDisplayState = 0;
     		dylibVariantSuffix = "";
     		enableDebugStr = 1;
     		environmentEntries = (
     		);
-...
     	A34161900C989CB30007BEF2 = {
     		uiCtxt = {
     			sepNavIntBoundsRect = "{{0, 0}, {926, 4186}}";
     			sepNavSelRange = "{3282, 54}";
     			sepNavVisRect = "{{0, 1238}, {612, 647}}";
     			sepNavSelRange = "{8782, 0}";
     			sepNavVisRect = "{{0, 3539}, {606, 647}}";
     			sepNavWindowFrame = "{{15, 56}, {651, 776}}";
     		};
     	};

     	 * Display informational message box on the screen. Used for casual communicaton to the user.
     	 * @param text Text to display
     	 */
     	private void msg (String text) {
     	public void msg (String text) {
     		JOptionPane.showMessageDialog(null, text, "Colonet", JOptionPane.INFORMATION_MESSAGE);
+    	}
-...
     	 * Display warning message box on the screen. Used for minor alerts or exceptions.
     	 * @param text Text to display
     	 */
     	private void warn (String text) {
     	public void warn (String text) {
     		JOptionPane.showMessageDialog(null, text, "Colonet", JOptionPane.WARNING_MESSAGE);
+    	}
-...
     	 * Display error message box on the screen. Used for major errors or exceptions in the program.
     	 * @param text Text to display
     	 */
     	private void err (String text) {
     	public void err (String text) {
     		JOptionPane.showMessageDialog(null, text, "Colonet", JOptionPane.ERROR_MESSAGE);
+    	}

     <HTML>
     <HEAD>
     <TITLE>Simple Swing Applet Example</TITLE>
     </HEAD>
     <BODY>
     <APPLET archive="Colonet.jar" code="Colonet" width=300 height=150>
     Your browser does not support Java, so nothing is displayed.
     </APPLET>
     </BODY>
     </HTML>
     <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <head>
     	<title>Colony Control Applet - Carnegie Mellon Robotics Club</title>
     	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     	<link rel="stylesheet" type="text/css" href="colonetstyle.css" />
     </head>
     <body>
     <div class="top">
     	<h1>Colonet: Robot Graph</h1>
     	<p>Carnegie Mellon Robotics Club: Colony Project</p>
     	<img src="http://roboclub8.frc.ri.cmu.edu/mainwiki/roboclublogo.png" height="125px" width="110px" alt="RoboClub Logo" />
     </div>
     <div class="app">
     	<p>
     	<object
     		archive = "Colonet.jar"
     		type = "application/x-java-applet"
     		width = "800"
     		height = "700"
     		align = "bottom"
     		codebase = "http://roboclub1.frc.ri.cmu.edu/gui/"
     		name = "Colonet"
     		title = "Colonet" >
     		<param name = "code" value = "Colonet.class" />
     	</object>
     	<br />
     	Requires Java 5.
     	<br />
     	<a href="Colonet.java">Source Code</a>
     	<br />
     	<br />
     	</p>
     </div>
     <div class="bottom">
     	<p><b>Colony Project Home page:</b><br />
     	<a href="http://www.robotcolony.org/">www.robotcolony.org</a></p>
     	<p><b>Validator:</b><br />
     	<a href="http://validator.w3.org/check?uri=referer">
     	<img src="http://www.w3.org/Icons/valid-xhtml10-blue"
     		 alt="Valid XHTML 1.0 Transitional"
     		 height="31"
     		 width="88"
     		 border="0"
     		 />
     	</a>
     	<a href="http://jigsaw.w3.org/css-validator/validator?uri=http://roboclub1.frc.ri.cmu.edu/ColonetGUI/colonetstyle.css">
       	<img style="border:0;width:88px;height:31px"
            src="http://www.w3.org/Icons/valid-css-blue"
            alt="Valid CSS!" />
     	</a><br />
     	</p>
     </div>
     </body>
     </html>

Also available in: Unified diff

Project

General

Profile

Colony

Revision 35