Project

General

Profile

Revision 72

Added by Greg Tress over 16 years ago

Minor changes to colonet gui

View differences:

trunk/code/projects/colonet/ColonetGUI/copy.sh
1
#! /bin/bash
2

  
3
sudo cp * /var/www/gui/
trunk/code/projects/colonet/ColonetGUI/Colonet.xcodeproj/gmtress.pbxuser
126 126
					PBXFileDataSource_Warnings_ColumnID,
127 127
				);
128 128
			};
129
			PBXPerProjectTemplateStateSaveDate = 212371804;
130
			PBXWorkspaceStateSaveDate = 212371804;
129
			PBXPerProjectTemplateStateSaveDate = 212429313;
130
			PBXWorkspaceStateSaveDate = 212429313;
131 131
		};
132 132
		perUserProjectItems = {
133 133
			A31266650C9B131A00D15EBF /* PBXTextBookmark */ = A31266650C9B131A00D15EBF /* PBXTextBookmark */;
134 134
			A31266680C9B131A00D15EBF /* PBXTextBookmark */ = A31266680C9B131A00D15EBF /* PBXTextBookmark */;
135 135
			A31266690C9B131A00D15EBF /* PBXTextBookmark */ = A31266690C9B131A00D15EBF /* PBXTextBookmark */;
136 136
			A312666C0C9B131A00D15EBF /* PBXTextBookmark */ = A312666C0C9B131A00D15EBF /* PBXTextBookmark */;
137
			A330E0240CA8911300C8A074 /* PBXTextBookmark */ = A330E0240CA8911300C8A074 /* PBXTextBookmark */;
138
			A330E0250CA8911300C8A074 /* PBXTextBookmark */ = A330E0250CA8911300C8A074 /* PBXTextBookmark */;
139
			A330E0260CA8911300C8A074 /* PBXTextBookmark */ = A330E0260CA8911300C8A074 /* PBXTextBookmark */;
140
			A330E0270CA8911300C8A074 /* PBXTextBookmark */ = A330E0270CA8911300C8A074 /* PBXTextBookmark */;
141
			A330E0280CA8911300C8A074 /* PBXTextBookmark */ = A330E0280CA8911300C8A074 /* PBXTextBookmark */;
142
			A330E0290CA8911300C8A074 /* PBXTextBookmark */ = A330E0290CA8911300C8A074 /* PBXTextBookmark */;
143
			A330E02A0CA8911300C8A074 /* PBXTextBookmark */ = A330E02A0CA8911300C8A074 /* PBXTextBookmark */;
137
			A330E0390CA96AA800C8A074 /* PBXTextBookmark */ = A330E0390CA96AA800C8A074 /* PBXTextBookmark */;
138
			A330E03C0CA96AA800C8A074 /* PBXTextBookmark */ = A330E03C0CA96AA800C8A074 /* PBXTextBookmark */;
139
			A330E0540CA96CB400C8A074 /* PBXTextBookmark */ = A330E0540CA96CB400C8A074 /* PBXTextBookmark */;
140
			A330E0550CA96CB400C8A074 /* PBXTextBookmark */ = A330E0550CA96CB400C8A074 /* PBXTextBookmark */;
141
			A330E0560CA96CB400C8A074 /* PBXTextBookmark */ = A330E0560CA96CB400C8A074 /* PBXTextBookmark */;
142
			A330E0570CA96CB400C8A074 /* PBXTextBookmark */ = A330E0570CA96CB400C8A074 /* PBXTextBookmark */;
143
			A330E0580CA96CB400C8A074 /* PBXTextBookmark */ = A330E0580CA96CB400C8A074 /* PBXTextBookmark */;
144
			A330E05B0CA96D9E00C8A074 /* PBXTextBookmark */ = A330E05B0CA96D9E00C8A074 /* PBXTextBookmark */;
145
			A330E05C0CA96D9E00C8A074 /* PBXTextBookmark */ = A330E05C0CA96D9E00C8A074 /* PBXTextBookmark */;
144 146
			A3EE6A500C9B3CA800C5C56B /* PBXTextBookmark */ = A3EE6A500C9B3CA800C5C56B /* PBXTextBookmark */;
145 147
			A3EE6A520C9B3CA800C5C56B /* PBXTextBookmark */ = A3EE6A520C9B3CA800C5C56B /* PBXTextBookmark */;
146 148
		};
......
150 152
	};
151 153
	00E68290FEC88D7311DB9C8B /* Colonet.java */ = {
152 154
		uiCtxt = {
153
			sepNavIntBoundsRect = "{{0, 0}, {1011, 11088}}";
154
			sepNavSelRange = "{21865, 0}";
155
			sepNavVisRect = "{{0, 10486}, {1011, 503}}";
155
			sepNavIntBoundsRect = "{{0, 0}, {1011, 11452}}";
156
			sepNavSelRange = "{8957, 0}";
157
			sepNavVisRect = "{{0, 4637}, {1011, 503}}";
156 158
			sepNavWindowFrame = "{{499, 56}, {651, 776}}";
157 159
		};
158 160
	};
......
240 242
		vrLen = 396;
241 243
		vrLoc = 53;
242 244
	};
243
	A330E0240CA8911300C8A074 /* PBXTextBookmark */ = {
245
	A330E0390CA96AA800C8A074 /* PBXTextBookmark */ = {
244 246
		isa = PBXTextBookmark;
245 247
		fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */;
246 248
		name = "ColonetServerInterface.java: 42";
247 249
		rLen = 0;
248 250
		rLoc = 914;
249 251
		rType = 0;
250
		vrLen = 1477;
251
		vrLoc = 1103;
252
		vrLen = 1150;
253
		vrLoc = 5583;
252 254
	};
253
	A330E0250CA8911300C8A074 /* PBXTextBookmark */ = {
255
	A330E03C0CA96AA800C8A074 /* PBXTextBookmark */ = {
254 256
		isa = PBXTextBookmark;
255
		fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */;
256
		name = "Colonet.java: 755";
257
		fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */;
258
		name = "ColonetServerInterface.java: 42";
257 259
		rLen = 0;
258
		rLoc = 21630;
260
		rLoc = 914;
259 261
		rType = 0;
260
		vrLen = 616;
261
		vrLoc = 21233;
262
		vrLen = 1150;
263
		vrLoc = 5583;
262 264
	};
263
	A330E0260CA8911300C8A074 /* PBXTextBookmark */ = {
265
	A330E0540CA96CB400C8A074 /* PBXTextBookmark */ = {
264 266
		isa = PBXTextBookmark;
265
		fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */;
266
		name = "Colonet.java: 773";
267
		fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */;
268
		name = "ColonetServerInterface.java: 42";
267 269
		rLen = 0;
268
		rLoc = 21980;
270
		rLoc = 914;
269 271
		rType = 0;
270
		vrLen = 799;
271
		vrLoc = 21631;
272
		vrLen = 1175;
273
		vrLoc = 5583;
272 274
	};
273
	A330E0270CA8911300C8A074 /* PBXTextBookmark */ = {
275
	A330E0550CA96CB400C8A074 /* PBXTextBookmark */ = {
274 276
		isa = PBXTextBookmark;
275
		fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */;
276
		name = "ColonetServerInterface.java: 203";
277
		fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */;
278
		name = "Colonet.java: 340";
277 279
		rLen = 0;
278
		rLoc = 5775;
280
		rLoc = 11970;
279 281
		rType = 0;
280
		vrLen = 1284;
281
		vrLoc = 4883;
282
		vrLen = 790;
283
		vrLoc = 755;
282 284
	};
283
	A330E0280CA8911300C8A074 /* PBXTextBookmark */ = {
285
	A330E0560CA96CB400C8A074 /* PBXTextBookmark */ = {
284 286
		isa = PBXTextBookmark;
285 287
		fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */;
286
		name = "Colonet.java: 755";
288
		name = "Colonet.java: 340";
287 289
		rLen = 0;
288
		rLoc = 21630;
290
		rLoc = 11970;
289 291
		rType = 0;
290
		vrLen = 656;
291
		vrLoc = 21193;
292
		vrLen = 790;
293
		vrLoc = 755;
292 294
	};
293
	A330E0290CA8911300C8A074 /* PBXTextBookmark */ = {
295
	A330E0570CA96CB400C8A074 /* PBXTextBookmark */ = {
294 296
		isa = PBXTextBookmark;
295 297
		fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */;
296 298
		name = "ColonetServerInterface.java: 42";
297 299
		rLen = 0;
298 300
		rLoc = 914;
299 301
		rType = 0;
300
		vrLen = 1477;
301
		vrLoc = 1103;
302
		vrLen = 1175;
303
		vrLoc = 5583;
302 304
	};
303
	A330E02A0CA8911300C8A074 /* PBXTextBookmark */ = {
305
	A330E0580CA96CB400C8A074 /* PBXTextBookmark */ = {
304 306
		isa = PBXTextBookmark;
305 307
		fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */;
306
		name = "Colonet.java: 768";
308
		name = "Colonet.java: 271";
307 309
		rLen = 0;
308
		rLoc = 21865;
310
		rLoc = 8957;
309 311
		rType = 0;
310
		vrLen = 868;
311
		vrLoc = 21524;
312
		vrLen = 1309;
313
		vrLoc = 7892;
312 314
	};
315
	A330E05B0CA96D9E00C8A074 /* PBXTextBookmark */ = {
316
		isa = PBXTextBookmark;
317
		fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */;
318
		name = "Colonet.java: 271";
319
		rLen = 0;
320
		rLoc = 8957;
321
		rType = 0;
322
		vrLen = 1574;
323
		vrLoc = 10795;
324
	};
325
	A330E05C0CA96D9E00C8A074 /* PBXTextBookmark */ = {
326
		isa = PBXTextBookmark;
327
		fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */;
328
		name = "Colonet.java: 271";
329
		rLen = 0;
330
		rLoc = 8957;
331
		rType = 0;
332
		vrLen = 0;
333
		vrLoc = 0;
334
	};
313 335
	A341617E0C989B510007BEF2 /* Source Control */ = {
314 336
		isa = PBXSourceControlManager;
315 337
		fallbackIsa = XCSourceControlManager;
......
335 357
		uiCtxt = {
336 358
			sepNavIntBoundsRect = "{{0, 0}, {1011, 4158}}";
337 359
			sepNavSelRange = "{914, 0}";
338
			sepNavVisRect = "{{0, 661}, {1011, 503}}";
360
			sepNavVisRect = "{{0, 2760}, {1011, 503}}";
339 361
			sepNavWindowFrame = "{{15, 56}, {651, 776}}";
340 362
		};
341 363
	};
trunk/code/projects/colonet/ColonetGUI/Colonet.xcodeproj/gmtress.perspective
317 317
										<key>_historyCapacity</key>
318 318
										<integer>0</integer>
319 319
										<key>bookmark</key>
320
										<string>A330E02A0CA8911300C8A074</string>
320
										<string>A330E05B0CA96D9E00C8A074</string>
321 321
										<key>history</key>
322 322
										<array>
323 323
											<string>A31266650C9B131A00D15EBF</string>
324 324
											<string>A3EE6A500C9B3CA800C5C56B</string>
325
											<string>A330E0240CA8911300C8A074</string>
326
											<string>A330E0250CA8911300C8A074</string>
325
											<string>A330E0540CA96CB400C8A074</string>
326
											<string>A330E0550CA96CB400C8A074</string>
327 327
										</array>
328 328
										<key>prevStack</key>
329 329
										<array>
330
											<string>A31266680C9B131A00D15EBF</string>
331 330
											<string>A31266690C9B131A00D15EBF</string>
332 331
											<string>A312666C0C9B131A00D15EBF</string>
333 332
											<string>A3EE6A520C9B3CA800C5C56B</string>
334
											<string>A330E0260CA8911300C8A074</string>
335
											<string>A330E0270CA8911300C8A074</string>
336
											<string>A330E0280CA8911300C8A074</string>
337
											<string>A330E0290CA8911300C8A074</string>
333
											<string>A330E0560CA96CB400C8A074</string>
334
											<string>A330E0570CA96CB400C8A074</string>
338 335
										</array>
339 336
									</dict>
340 337
									<key>SplitCount</key>
......
434 431
			</array>
435 432
			<key>TableOfContents</key>
436 433
			<array>
437
				<string>A330E02B0CA8911300C8A074</string>
434
				<string>A330E0480CA96C0400C8A074</string>
438 435
				<string>1CA23ED40692098700951B8B</string>
439
				<string>A330E02C0CA8911300C8A074</string>
436
				<string>A330E0490CA96C0400C8A074</string>
440 437
				<string>A34161A50C989E610007BEF2</string>
441
				<string>A330E02D0CA8911300C8A074</string>
438
				<string>A330E04A0CA96C0400C8A074</string>
442 439
				<string>1CA23EDF0692099D00951B8B</string>
443 440
				<string>1CA23EE00692099D00951B8B</string>
444 441
				<string>1CA23EE10692099D00951B8B</string>
......
486 483
						<dict>
487 484
							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
488 485
							<array>
489
								<real>184</real>
486
								<real>1000</real>
490 487
							</array>
491 488
							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
492 489
							<array>
......
508 505
								</array>
509 506
							</array>
510 507
							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
511
							<string>{{0, 0}, {0, 0}}</string>
508
							<string>{{0, 0}, {1258, 662}}</string>
512 509
						</dict>
513 510
						<key>PBXTopSmartGroupGIDs</key>
514 511
						<array/>
......
518 515
					<key>GeometryConfiguration</key>
519 516
					<dict>
520 517
						<key>Frame</key>
521
						<string>{{0, 0}, {201, 680}}</string>
518
						<string>{{0, 0}, {1275, 680}}</string>
522 519
						<key>GroupTreeTableConfiguration</key>
523 520
						<array>
524 521
							<string>MainColumn</string>
525
							<real>184</real>
522
							<real>1000</real>
526 523
						</array>
527 524
					</dict>
528 525
					<key>Module</key>
529 526
					<string>PBXSmartGroupTreeModule</string>
530 527
					<key>Proportion</key>
531
					<string>201pt</string>
528
					<string>1275pt</string>
532 529
				</dict>
533 530
				<dict>
534 531
					<key>Dock</key>
......
539 536
								<key>PBXProjectModuleGUID</key>
540 537
								<string>A34161AC0C989F140007BEF2</string>
541 538
								<key>PBXProjectModuleLabel</key>
542
								<string>ColonetServerInterface.java</string>
539
								<string>Colonet.java</string>
543 540
								<key>PBXSplitModuleInNavigatorKey</key>
544 541
								<dict>
545 542
									<key>Split0</key>
......
547 544
										<key>PBXProjectModuleGUID</key>
548 545
										<string>A34161AD0C989F140007BEF2</string>
549 546
										<key>PBXProjectModuleLabel</key>
550
										<string>ColonetServerInterface.java</string>
547
										<string>Colonet.java</string>
548
										<key>_historyCapacity</key>
549
										<integer>0</integer>
550
										<key>bookmark</key>
551
										<string>A330E05C0CA96D9E00C8A074</string>
551 552
										<key>history</key>
552 553
										<array>
553 554
											<string>A31266650C9B131A00D15EBF</string>
555
											<string>A3EE6A500C9B3CA800C5C56B</string>
556
											<string>A330E0390CA96AA800C8A074</string>
557
											<string>A330E0580CA96CB400C8A074</string>
554 558
										</array>
559
										<key>nextStack</key>
560
										<array>
561
											<string>A330E03C0CA96AA800C8A074</string>
562
										</array>
555 563
										<key>prevStack</key>
556 564
										<array>
557 565
											<string>A31266680C9B131A00D15EBF</string>
558 566
											<string>A31266690C9B131A00D15EBF</string>
559 567
											<string>A312666C0C9B131A00D15EBF</string>
568
											<string>A3EE6A520C9B3CA800C5C56B</string>
560 569
										</array>
561 570
									</dict>
562 571
									<key>SplitCount</key>
......
570 579
							<key>GeometryConfiguration</key>
571 580
							<dict>
572 581
								<key>Frame</key>
573
								<string>{{0, 0}, {1074, 0}}</string>
582
								<string>{{0, 0}, {0, 0}}</string>
574 583
							</dict>
575 584
							<key>Module</key>
576 585
							<string>PBXNavigatorGroup</string>
......
650 659
									<key>GeometryConfiguration</key>
651 660
									<dict>
652 661
										<key>Frame</key>
653
										<string>{{10, 27}, {1074, 648}}</string>
662
										<string>{{10, 27}, {0, -27}}</string>
654 663
									</dict>
655 664
									<key>Module</key>
656 665
									<string>PBXRunSessionModule</string>
......
677 686
			</array>
678 687
			<key>TableOfContents</key>
679 688
			<array>
680
				<string>A330E02E0CA8911300C8A074</string>
689
				<string>A330E04C0CA96C0400C8A074</string>
681 690
				<string>1CA23EE50692099D00951B8B</string>
682
				<string>A330E02F0CA8911300C8A074</string>
691
				<string>A330E04D0CA96C0400C8A074</string>
683 692
				<string>A34161AC0C989F140007BEF2</string>
684
				<string>A330E0300CA8911300C8A074</string>
693
				<string>A330E04E0CA96C0400C8A074</string>
685 694
				<string>XCMainBuildResultsModuleGUID</string>
686 695
				<string>1CA23EE80692099D00951B8B</string>
687
				<string>A330E0310CA8911300C8A074</string>
696
				<string>A330E04F0CA96C0400C8A074</string>
688 697
			</array>
689 698
			<key>ToolbarConfiguration</key>
690 699
			<string>xcode.toolbar.config.buildAndRun</string>
trunk/code/projects/colonet/ColonetGUI/Colonet.java
159 159
		panelStats.add(new JLabel("Token Passes / sec     "));
160 160
		panelStats.add(lblTokenPasses);
161 161
		
162
		//TODO: add panelStats somewhere!
162
		//TODO: add panelStats somewhere?
163 163

  
164 164
		// Robot direction panel
165 165
		panelRobotDirection = new JPanel();
......
251 251
		this.getContentPane().add(panelControl, BorderLayout.EAST);
252 252
		this.setVisible(true);
253 253
		
254
		/* Add all listeners here */
255
		// Task Management
254 256
		btnAddTask.addActionListener(this);
255 257
		btnRemoveTask.addActionListener(this);
256 258
		btnMoveTaskUp.addActionListener(this);
257 259
		btnMoveTaskDown.addActionListener(this);
260
		// Robot Control
261
		btnF.addActionListener(this);
262
		btnB.addActionListener(this);
263
		btnL.addActionListener(this);
264
		btnR.addActionListener(this);
265
		btnActivate.addActionListener(this);
266
		// Other
258 267
		btnGraph.addActionListener(this);
259 268
		btnConnect.addActionListener(this);
260 269
		panel.addMouseListener(this);
......
320 329
				taskListModel.remove(taskList.getSelectedIndex());
321 330
			} catch (ArrayIndexOutOfBoundsException ex) {
322 331
			}
332
			
333
		// Robot controls
334
		} else if (source == btnF) {
335
			csi.sendData(ColonetServerInterface.MOTOR1_SET + " 0 200", ColonetServerInterface.GLOBAL_DEST);
336
			csi.sendData(ColonetServerInterface.MOTOR2_SET + " 0 200", ColonetServerInterface.GLOBAL_DEST);
337
		} else if (source == btnB) {
338
			csi.sendData(ColonetServerInterface.MOTOR1_SET + " 1 200", ColonetServerInterface.GLOBAL_DEST);
339
			csi.sendData(ColonetServerInterface.MOTOR2_SET + " 1 200", ColonetServerInterface.GLOBAL_DEST);
340
		} else if (source == btnL) {
341
			csi.sendData(ColonetServerInterface.MOTOR1_SET + " 1 200", ColonetServerInterface.GLOBAL_DEST);
342
			csi.sendData(ColonetServerInterface.MOTOR2_SET + " 0 200", ColonetServerInterface.GLOBAL_DEST);
343
		} else if (source == btnR) {
344
			csi.sendData(ColonetServerInterface.MOTOR1_SET + " 0 200", ColonetServerInterface.GLOBAL_DEST);
345
			csi.sendData(ColonetServerInterface.MOTOR2_SET + " 1 200", ColonetServerInterface.GLOBAL_DEST);
346
		} else if (source == btnActivate) {
347
			csi.sendData(ColonetServerInterface.MOTOR1_SET + " 0 0", ColonetServerInterface.GLOBAL_DEST);
348
			csi.sendData(ColonetServerInterface.MOTOR2_SET + " 0 0", ColonetServerInterface.GLOBAL_DEST);
323 349
		}
324 350
	}
325 351
	

Also available in: Unified diff