/trunk/code/projects/colonet/ColonetGUI/Colonet.java - Diff - Colony - Robotics Club

Revision 459

updated some colonet stuff

+    		}
+    	}
     	/**
     	* Parses a String containing visual robot position information along with
     	* canonical ID assignments.
     	*/
     	public void parsePositions (String line) {
     		String [] str = line.split(" ");
     		java.util.List <RobotIcon> newList = new ArrayList <RobotIcon> ();
     		for (int i = 2; i < str.length; i+=3) {
     			int id = Integer.parseInt(str[i]);
     			int x = Integer.parseInt(str[i+1]);
     			int y = Integer.parseInt(str[i+2]);
     			RobotIcon newIcon = new RobotIcon(x, y);
     			newIcon.id = id;
     			newList.add(newIcon);
+    		}
     		robotIcons = newList;
+    	}
     	//
     	// MouseListener methods
     	//
-...
     		        return;
+    		    }
     		    // Assign new ID and update display
     			csi.sendIDAssignment(curID, newID);
     		    robotIcons.get(selectedBot).id = newID;
     		    robotIcons.get(selectedBot).color = Color.GREEN;
     		    lblSelected.setText(" " + newID);
-...
     			super();
+    		}
     		public synchronized void setImage (BufferedImage newimg) {
     		public void setImage (BufferedImage newimg) {
     			if (img != null) {
     				img.flush();
     				img = null;
     				img = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
     				txtMatrix.append("c");
+    			}
     			System.gc();
     			img = newimg;
+    		}
     		public synchronized void setPoints (Point [] newpoints) {
     		public void setPoints (Point [] newpoints) {
     			// test code -- need to remove later
     			if (newpoints == null) {
     				Point [] p = new Point [3];
-...
     	*/
     	class WebcamLoader extends Thread
+    	{
     		final int WEBCAMLOADER_DELAY = 1000;
     		final int WEBCAMLOADER_DELAY = 200;
     		final String IMAGE_PATH = "http://roboclub9.frc.ri.cmu.edu/colonet.jpg";
     		final String LOCATIONS_PATH = "http://roboclub9.frc.ri.cmu.edu/colonet/locations.txt";
     		URL imagePath;
     		URI locationsPath;
     		MediaTracker mt;
     		BufferedImage image;
-...
     			} catch (MalformedURLException e) {
     				System.out.println("Malformed URL: could not form URL from: [" + IMAGE_PATH + "]\n");
+    			}
     			try {
     				locationsPath = new URI(LOCATIONS_PATH);
     			} catch (URISyntaxException x) {
     				System.out.println("Malformed URI: could not form URI from: [" + LOCATIONS_PATH + "]\n");
+    			}
+    		}
-...
     					mt.removeImage(image);
     					// Save
     					panelWebcam.setImage(image);
     					parseLocations(locationsPath.toURL());
     					//panelWebcam.setPoints(null);  //temporary simulation code
     				} catch (InterruptedException e) {
     					return;
     				} catch (java.security.AccessControlException e) {
-...
+    			}
+    		}
     		private void parseLocations (URL url) {
     			URLConnection conn = null;
     			DataInputStream data = null;
     			String line;
     			String [] lines = new String[30];
     			StringBuffer buf = new StringBuffer();
     			int i = 0;
+    	}
     	/*
     	*	PositionsLoader class
     	*	Handles the loading of the robot positions as seen by the vision technology.
     	*/
     	class PositionsLoader extends Thread
+    	{
     		final int POSITIONSLOADER_DELAY = 600;
     		public PositionsLoader () {
     			super("PositionsLoader");
+    		}
     			try {
     				conn = url.openConnection();
     				conn.connect();
     				data = new DataInputStream(new BufferedInputStream(conn.getInputStream()));
     				while ((line = data.readLine()) != null) {
     					buf.append(line + ";");
     					lines[i] = line;
     					i++;
     		public void run () {
     			while (true) {
     				try {
     					Thread.sleep(POSITIONSLOADER_DELAY);
     					if (csi != null)
     						csi.sendPositionRequest();
     				} catch (InterruptedException e) {
+    				}
     				data.close();
     			} catch (IOException e) {
     				System.out.println("IOException:" + e.getMessage());
+    			}
     			//log.append("Got robot locations: " + buf + "\n");
     			// Get Point values from strings
     			Point [] points = new Point[i];
     			for (int j = 0; j < i; j++) {
     				String [] parts = lines[j].split(",");
     				int xval = Integer.parseInt(parts[0]);
     				int yval = Integer.parseInt(parts[1]);
     				Point p = new Point(xval, yval);
     				points[j] = p;
+    			}
     			if (points.length != 0)
     				panelWebcam.setPoints(points);
+    		}
+    	}
     	/*
-...
     	*/
     	class RobotIcon {
     		public final int RADIUS = 30;
     		public final int CLOSE = 70;
     		public final int CLOSE = 80;
     		public int x, y;
     		public int destx, desty;
-...
     	        g2d.drawString(level + "%", greenX + greenWidth/2 - 10, greenY + greenHeight/2 + 5);
     	        g2d.dispose();
     	        System.out.println("Painted icon");
+    	    }
     		/**

Also available in: Unified diff

Project

General

Profile

Colony

Revision 459