Revision 107
minor fixes
| trunk/code/projects/colonet/ColonetGUI/Colonet.xcodeproj/gmtress.pbxuser | ||
|---|---|---|
| 126 | 126 |
PBXFileDataSource_Warnings_ColumnID, |
| 127 | 127 |
); |
| 128 | 128 |
}; |
| 129 |
PBXPerProjectTemplateStateSaveDate = 212441932;
|
|
| 130 |
PBXWorkspaceStateSaveDate = 212441932;
|
|
| 129 |
PBXPerProjectTemplateStateSaveDate = 213302458;
|
|
| 130 |
PBXWorkspaceStateSaveDate = 213302458;
|
|
| 131 | 131 |
}; |
| 132 | 132 |
perUserProjectItems = {
|
| 133 |
A31266650C9B131A00D15EBF /* PBXTextBookmark */ = A31266650C9B131A00D15EBF /* PBXTextBookmark */; |
|
| 134 |
A31266680C9B131A00D15EBF /* PBXTextBookmark */ = A31266680C9B131A00D15EBF /* PBXTextBookmark */; |
|
| 135 |
A31266690C9B131A00D15EBF /* PBXTextBookmark */ = A31266690C9B131A00D15EBF /* PBXTextBookmark */; |
|
| 136 |
A312666C0C9B131A00D15EBF /* PBXTextBookmark */ = A312666C0C9B131A00D15EBF /* PBXTextBookmark */; |
|
| 137 |
A330E0390CA96AA800C8A074 /* PBXTextBookmark */ = A330E0390CA96AA800C8A074 /* PBXTextBookmark */; |
|
| 138 |
A330E03C0CA96AA800C8A074 /* PBXTextBookmark */ = A330E03C0CA96AA800C8A074 /* PBXTextBookmark */; |
|
| 139 |
A330E0560CA96CB400C8A074 /* PBXTextBookmark */ = A330E0560CA96CB400C8A074 /* PBXTextBookmark */; |
|
| 140 |
A330E0680CA99A5300C8A074 /* PBXTextBookmark */ = A330E0680CA99A5300C8A074 /* PBXTextBookmark */; |
|
| 141 |
A330E0760CA99A6000C8A074 /* PBXTextBookmark */ = A330E0760CA99A6000C8A074 /* PBXTextBookmark */; |
|
| 142 |
A330E08C0CA99BB900C8A074 /* PBXTextBookmark */ = A330E08C0CA99BB900C8A074 /* PBXTextBookmark */; |
|
| 143 |
A330E0920CA9A02C00C8A074 /* PBXTextBookmark */ = A330E0920CA9A02C00C8A074 /* PBXTextBookmark */; |
|
| 144 |
A330E0930CA9A02C00C8A074 /* PBXTextBookmark */ = A330E0930CA9A02C00C8A074 /* PBXTextBookmark */; |
|
| 145 |
A3EE6A500C9B3CA800C5C56B /* PBXTextBookmark */ = A3EE6A500C9B3CA800C5C56B /* PBXTextBookmark */; |
|
| 146 |
A3EE6A520C9B3CA800C5C56B /* PBXTextBookmark */ = A3EE6A520C9B3CA800C5C56B /* PBXTextBookmark */; |
|
| 133 |
A31266650C9B131A00D15EBF = A31266650C9B131A00D15EBF /* PBXTextBookmark */; |
|
| 134 |
A31266690C9B131A00D15EBF = A31266690C9B131A00D15EBF /* PBXTextBookmark */; |
|
| 135 |
A312666C0C9B131A00D15EBF = A312666C0C9B131A00D15EBF /* PBXTextBookmark */; |
|
| 136 |
A330E0560CA96CB400C8A074 = A330E0560CA96CB400C8A074 /* PBXTextBookmark */; |
|
| 137 |
A35611300CB5380B008C739C = A35611300CB5380B008C739C /* PBXTextBookmark */; |
|
| 138 |
A35611310CB5380B008C739C = A35611310CB5380B008C739C /* PBXTextBookmark */; |
|
| 139 |
A35611320CB5380B008C739C = A35611320CB5380B008C739C /* PBXTextBookmark */; |
|
| 140 |
A356113A0CB539FC008C739C = A356113A0CB539FC008C739C /* PBXTextBookmark */; |
|
| 141 |
A3A687270CB0429000478070 = A3A687270CB0429000478070 /* PBXTextBookmark */; |
|
| 142 |
A3D78AF00CB6BCBE00A79632 /* PBXTextBookmark */ = A3D78AF00CB6BCBE00A79632 /* PBXTextBookmark */; |
|
| 143 |
A3EE6A520C9B3CA800C5C56B = A3EE6A520C9B3CA800C5C56B /* PBXTextBookmark */; |
|
| 147 | 144 |
}; |
| 148 | 145 |
sourceControlManager = A341617E0C989B510007BEF2 /* Source Control */; |
| 149 | 146 |
userBuildSettings = {
|
| ... | ... | |
| 151 | 148 |
}; |
| 152 | 149 |
00E68290FEC88D7311DB9C8B /* Colonet.java */ = {
|
| 153 | 150 |
uiCtxt = {
|
| 154 |
sepNavIntBoundsRect = "{{0, 0}, {1011, 11452}}";
|
|
| 155 |
sepNavSelRange = "{8957, 0}";
|
|
| 156 |
sepNavVisRect = "{{0, 6314}, {1011, 503}}";
|
|
| 151 |
sepNavIntBoundsRect = "{{0, 0}, {1011, 11522}}";
|
|
| 152 |
sepNavSelRange = "{12530, 0}";
|
|
| 153 |
sepNavVisRect = "{{0, 4907}, {1011, 643}}";
|
|
| 157 | 154 |
sepNavWindowFrame = "{{499, 56}, {651, 776}}";
|
| 158 | 155 |
}; |
| 159 | 156 |
}; |
| 160 | 157 |
00E68291FEC88ED911DB9C8B /* index_colonet.html */ = {
|
| 161 | 158 |
uiCtxt = {
|
| 162 |
sepNavIntBoundsRect = "{{0, 0}, {764, 924}}";
|
|
| 163 |
sepNavSelRange = "{0, 0}";
|
|
| 164 |
sepNavVisRect = "{{0, 197}, {606, 647}}";
|
|
| 165 |
sepNavWindowFrame = "{{597, 192}, {651, 776}}";
|
|
| 159 |
sepNavIntBoundsRect = "{{0, 0}, {1011, 924}}";
|
|
| 160 |
sepNavSelRange = "{935, 0}";
|
|
| 161 |
sepNavVisRect = "{{0, 0}, {1011, 643}}";
|
|
| 162 |
sepNavWindowFrame = "{{597, 56}, {651, 776}}";
|
|
| 166 | 163 |
}; |
| 167 | 164 |
}; |
| 168 | 165 |
130F8B84001BDB6411CA292A /* Colonet */ = {
|
| ... | ... | |
| 211 | 208 |
vrLen = 397; |
| 212 | 209 |
vrLoc = 52; |
| 213 | 210 |
}; |
| 214 |
A31266680C9B131A00D15EBF /* PBXTextBookmark */ = {
|
|
| 215 |
isa = PBXTextBookmark; |
|
| 216 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
| 217 |
name = "Colonet.java: 171"; |
|
| 218 |
rLen = 0; |
|
| 219 |
rLoc = 4998; |
|
| 220 |
rType = 0; |
|
| 221 |
vrLen = 1332; |
|
| 222 |
vrLoc = 4551; |
|
| 223 |
}; |
|
| 224 | 211 |
A31266690C9B131A00D15EBF /* PBXTextBookmark */ = {
|
| 225 | 212 |
isa = PBXTextBookmark; |
| 226 | 213 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
| 227 | 214 |
name = "ColonetServerInterface.java: 45"; |
| 228 | 215 |
rLen = 0; |
| 229 |
rLoc = 1102;
|
|
| 216 |
rLoc = 1124;
|
|
| 230 | 217 |
rType = 0; |
| 231 | 218 |
vrLen = 1381; |
| 232 | 219 |
vrLoc = 1300; |
| ... | ... | |
| 241 | 228 |
vrLen = 396; |
| 242 | 229 |
vrLoc = 53; |
| 243 | 230 |
}; |
| 244 |
A330E0390CA96AA800C8A074 /* PBXTextBookmark */ = {
|
|
| 245 |
isa = PBXTextBookmark; |
|
| 246 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
| 247 |
name = "ColonetServerInterface.java: 42"; |
|
| 248 |
rLen = 0; |
|
| 249 |
rLoc = 914; |
|
| 250 |
rType = 0; |
|
| 251 |
vrLen = 1150; |
|
| 252 |
vrLoc = 5583; |
|
| 253 |
}; |
|
| 254 |
A330E03C0CA96AA800C8A074 /* PBXTextBookmark */ = {
|
|
| 255 |
isa = PBXTextBookmark; |
|
| 256 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
| 257 |
name = "ColonetServerInterface.java: 42"; |
|
| 258 |
rLen = 0; |
|
| 259 |
rLoc = 914; |
|
| 260 |
rType = 0; |
|
| 261 |
vrLen = 1150; |
|
| 262 |
vrLoc = 5583; |
|
| 263 |
}; |
|
| 264 | 231 |
A330E0560CA96CB400C8A074 /* PBXTextBookmark */ = {
|
| 265 | 232 |
isa = PBXTextBookmark; |
| 266 | 233 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
| 267 | 234 |
name = "Colonet.java: 340"; |
| 268 | 235 |
rLen = 0; |
| 269 |
rLoc = 11970;
|
|
| 236 |
rLoc = 12540;
|
|
| 270 | 237 |
rType = 0; |
| 271 | 238 |
vrLen = 790; |
| 272 | 239 |
vrLoc = 755; |
| 273 | 240 |
}; |
| 274 |
A330E0680CA99A5300C8A074 /* PBXTextBookmark */ = {
|
|
| 275 |
isa = PBXTextBookmark; |
|
| 276 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
| 277 |
name = "ColonetServerInterface.java: 217"; |
|
| 278 |
rLen = 0; |
|
| 279 |
rLoc = 6132; |
|
| 280 |
rType = 0; |
|
| 281 |
vrLen = 1141; |
|
| 282 |
vrLoc = 5854; |
|
| 283 |
}; |
|
| 284 |
A330E0760CA99A6000C8A074 /* PBXTextBookmark */ = {
|
|
| 285 |
isa = PBXTextBookmark; |
|
| 286 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
| 287 |
name = "Colonet.java: 271"; |
|
| 288 |
rLen = 0; |
|
| 289 |
rLoc = 8957; |
|
| 290 |
rType = 0; |
|
| 291 |
vrLen = 1311; |
|
| 292 |
vrLoc = 14881; |
|
| 293 |
}; |
|
| 294 |
A330E08C0CA99BB900C8A074 /* PBXTextBookmark */ = {
|
|
| 295 |
isa = PBXTextBookmark; |
|
| 296 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
| 297 |
name = "Colonet.java: 271"; |
|
| 298 |
rLen = 0; |
|
| 299 |
rLoc = 8957; |
|
| 300 |
rType = 0; |
|
| 301 |
vrLen = 1232; |
|
| 302 |
vrLoc = 14881; |
|
| 303 |
}; |
|
| 304 |
A330E0920CA9A02C00C8A074 /* PBXTextBookmark */ = {
|
|
| 305 |
isa = PBXTextBookmark; |
|
| 306 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
| 307 |
name = "Colonet.java: 271"; |
|
| 308 |
rLen = 0; |
|
| 309 |
rLoc = 8957; |
|
| 310 |
rType = 0; |
|
| 311 |
vrLen = 1232; |
|
| 312 |
vrLoc = 14881; |
|
| 313 |
}; |
|
| 314 |
A330E0930CA9A02C00C8A074 /* PBXTextBookmark */ = {
|
|
| 315 |
isa = PBXTextBookmark; |
|
| 316 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
| 317 |
name = "Colonet.java: 271"; |
|
| 318 |
rLen = 0; |
|
| 319 |
rLoc = 8957; |
|
| 320 |
rType = 0; |
|
| 321 |
vrLen = 0; |
|
| 322 |
vrLoc = 0; |
|
| 323 |
}; |
|
| 324 | 241 |
A341617E0C989B510007BEF2 /* Source Control */ = {
|
| 325 | 242 |
isa = PBXSourceControlManager; |
| 326 | 243 |
fallbackIsa = XCSourceControlManager; |
| ... | ... | |
| 344 | 261 |
}; |
| 345 | 262 |
A34161900C989CB30007BEF2 /* ColonetServerInterface.java */ = {
|
| 346 | 263 |
uiCtxt = {
|
| 347 |
sepNavIntBoundsRect = "{{0, 0}, {1011, 4158}}";
|
|
| 348 |
sepNavSelRange = "{6132, 0}";
|
|
| 349 |
sepNavVisRect = "{{0, 2866}, {1011, 503}}";
|
|
| 264 |
sepNavIntBoundsRect = "{{0, 0}, {1011, 5320}}";
|
|
| 265 |
sepNavSelRange = "{7502, 0}";
|
|
| 266 |
sepNavVisRect = "{{0, 3444}, {1011, 643}}";
|
|
| 350 | 267 |
sepNavWindowFrame = "{{15, 56}, {651, 776}}";
|
| 351 | 268 |
}; |
| 352 | 269 |
}; |
| 353 |
A3EE6A500C9B3CA800C5C56B /* PBXTextBookmark */ = {
|
|
| 270 |
A35611300CB5380B008C739C /* PBXTextBookmark */ = {
|
|
| 354 | 271 |
isa = PBXTextBookmark; |
| 272 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
| 273 |
name = "Colonet.java: 364"; |
|
| 274 |
rLen = 0; |
|
| 275 |
rLoc = 12530; |
|
| 276 |
rType = 0; |
|
| 277 |
vrLen = 1365; |
|
| 278 |
vrLoc = 11888; |
|
| 279 |
}; |
|
| 280 |
A35611310CB5380B008C739C /* PBXTextBookmark */ = {
|
|
| 281 |
isa = PBXTextBookmark; |
|
| 282 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
| 283 |
name = "ColonetServerInterface.java: 268"; |
|
| 284 |
rLen = 0; |
|
| 285 |
rLoc = 7478; |
|
| 286 |
rType = 0; |
|
| 287 |
vrLen = 1173; |
|
| 288 |
vrLoc = 6836; |
|
| 289 |
}; |
|
| 290 |
A35611320CB5380B008C739C /* PBXTextBookmark */ = {
|
|
| 291 |
isa = PBXTextBookmark; |
|
| 292 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
| 293 |
name = "Colonet.java: 364"; |
|
| 294 |
rLen = 0; |
|
| 295 |
rLoc = 12530; |
|
| 296 |
rType = 0; |
|
| 297 |
vrLen = 1365; |
|
| 298 |
vrLoc = 11888; |
|
| 299 |
}; |
|
| 300 |
A356113A0CB539FC008C739C /* PBXTextBookmark */ = {
|
|
| 301 |
isa = PBXTextBookmark; |
|
| 302 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
| 303 |
name = "ColonetServerInterface.java: 269"; |
|
| 304 |
rLen = 0; |
|
| 305 |
rLoc = 7502; |
|
| 306 |
rType = 0; |
|
| 307 |
vrLen = 1052; |
|
| 308 |
vrLoc = 6965; |
|
| 309 |
}; |
|
| 310 |
A3A687270CB0429000478070 /* PBXTextBookmark */ = {
|
|
| 311 |
isa = PBXTextBookmark; |
|
| 355 | 312 |
fRef = 00E68291FEC88ED911DB9C8B /* index_colonet.html */; |
| 356 |
name = "index_colonet.html: 54";
|
|
| 313 |
name = "index_colonet.html: 12";
|
|
| 357 | 314 |
rLen = 0; |
| 358 |
rLoc = 1513;
|
|
| 315 |
rLoc = 415;
|
|
| 359 | 316 |
rType = 0; |
| 360 |
vrLen = 1033;
|
|
| 317 |
vrLen = 1681;
|
|
| 361 | 318 |
vrLoc = 0; |
| 362 | 319 |
}; |
| 320 |
A3D78AF00CB6BCBE00A79632 /* PBXTextBookmark */ = {
|
|
| 321 |
isa = PBXTextBookmark; |
|
| 322 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
| 323 |
name = "ColonetServerInterface.java: 269"; |
|
| 324 |
rLen = 0; |
|
| 325 |
rLoc = 7502; |
|
| 326 |
rType = 0; |
|
| 327 |
vrLen = 1050; |
|
| 328 |
vrLoc = 6965; |
|
| 329 |
}; |
|
| 363 | 330 |
A3EE6A520C9B3CA800C5C56B /* PBXTextBookmark */ = {
|
| 364 | 331 |
isa = PBXTextBookmark; |
| 365 | 332 |
fRef = 00E68291FEC88ED911DB9C8B /* index_colonet.html */; |
| 366 | 333 |
name = "index_colonet.html: 54"; |
| 367 | 334 |
rLen = 0; |
| 368 |
rLoc = 1513;
|
|
| 335 |
rLoc = 1515;
|
|
| 369 | 336 |
rType = 0; |
| 370 | 337 |
vrLen = 1033; |
| 371 | 338 |
vrLoc = 0; |
| trunk/code/projects/colonet/ColonetGUI/Colonet.xcodeproj/gmtress.perspective | ||
|---|---|---|
| 203 | 203 |
<string>action</string> |
| 204 | 204 |
<string>NSToolbarFlexibleSpaceItem</string> |
| 205 | 205 |
<string>buildOrClean</string> |
| 206 |
<string>build-and-runOrDebug</string> |
|
| 207 |
<string>com.apple.ide.PBXToolbarStopButton</string> |
|
| 206 |
<string>clean-target</string> |
|
| 207 |
<string>run</string> |
|
| 208 |
<string>NSToolbarSeparatorItem</string> |
|
| 209 |
<string>servicesModuleclasses</string> |
|
| 210 |
<string>Quick Model</string> |
|
| 208 | 211 |
<string>get-info</string> |
| 209 |
<string>toggle-editor</string> |
|
| 212 |
<string>show-inspector</string> |
|
| 213 |
<string>Add Entity</string> |
|
| 210 | 214 |
<string>NSToolbarFlexibleSpaceItem</string> |
| 215 |
<string>NSToolbarCustomizeToolbarItem</string> |
|
| 211 | 216 |
<string>com.apple.pbx.toolbar.searchfield</string> |
| 212 | 217 |
</array> |
| 213 | 218 |
<key>ControllerClassBaseName</key> |
| ... | ... | |
| 261 | 266 |
<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key> |
| 262 | 267 |
<array> |
| 263 | 268 |
<string>00E6828FFEC88D1A11DB9C8B</string> |
| 269 |
<string>0120612AFEC8923411DB9C8B</string> |
|
| 264 | 270 |
</array> |
| 265 | 271 |
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> |
| 266 | 272 |
<array> |
| 267 | 273 |
<array> |
| 274 |
<integer>2</integer> |
|
| 268 | 275 |
<integer>0</integer> |
| 269 | 276 |
</array> |
| 270 | 277 |
</array> |
| ... | ... | |
| 288 | 295 |
<real>178</real> |
| 289 | 296 |
</array> |
| 290 | 297 |
<key>RubberWindowFrame</key> |
| 291 |
<string>0 109 1280 721 0 0 1280 832 </string>
|
|
| 298 |
<string>0 111 1280 721 0 0 1280 832 </string>
|
|
| 292 | 299 |
</dict> |
| 293 | 300 |
<key>Module</key> |
| 294 | 301 |
<string>PBXSmartGroupTreeModule</string> |
| ... | ... | |
| 304 | 311 |
<key>PBXProjectModuleGUID</key> |
| 305 | 312 |
<string>A34161A50C989E610007BEF2</string> |
| 306 | 313 |
<key>PBXProjectModuleLabel</key> |
| 307 |
<string>Colonet.java</string> |
|
| 314 |
<string>ColonetServerInterface.java</string>
|
|
| 308 | 315 |
<key>PBXSplitModuleInNavigatorKey</key> |
| 309 | 316 |
<dict> |
| 310 | 317 |
<key>Split0</key> |
| ... | ... | |
| 312 | 319 |
<key>PBXProjectModuleGUID</key> |
| 313 | 320 |
<string>A34161A60C989E610007BEF2</string> |
| 314 | 321 |
<key>PBXProjectModuleLabel</key> |
| 315 |
<string>Colonet.java</string> |
|
| 322 |
<string>ColonetServerInterface.java</string>
|
|
| 316 | 323 |
<key>_historyCapacity</key> |
| 317 | 324 |
<integer>0</integer> |
| 318 | 325 |
<key>bookmark</key> |
| 319 |
<string>A330E0920CA9A02C00C8A074</string>
|
|
| 326 |
<string>A3D78AF00CB6BCBE00A79632</string>
|
|
| 320 | 327 |
<key>history</key> |
| 321 | 328 |
<array> |
| 322 | 329 |
<string>A31266650C9B131A00D15EBF</string> |
| 323 |
<string>A3EE6A500C9B3CA800C5C56B</string>
|
|
| 324 |
<string>A330E0680CA99A5300C8A074</string>
|
|
| 325 |
<string>A330E0760CA99A6000C8A074</string>
|
|
| 330 |
<string>A3A687270CB0429000478070</string>
|
|
| 331 |
<string>A35611300CB5380B008C739C</string>
|
|
| 332 |
<string>A356113A0CB539FC008C739C</string>
|
|
| 326 | 333 |
</array> |
| 327 | 334 |
<key>prevStack</key> |
| 328 | 335 |
<array> |
| ... | ... | |
| 343 | 350 |
<key>GeometryConfiguration</key> |
| 344 | 351 |
<dict> |
| 345 | 352 |
<key>Frame</key> |
| 346 |
<string>{{0, 0}, {1058, 535}}</string>
|
|
| 353 |
<string>{{0, 0}, {1058, 675}}</string>
|
|
| 347 | 354 |
<key>RubberWindowFrame</key> |
| 348 |
<string>0 109 1280 721 0 0 1280 832 </string>
|
|
| 355 |
<string>0 111 1280 721 0 0 1280 832 </string>
|
|
| 349 | 356 |
</dict> |
| 350 | 357 |
<key>Module</key> |
| 351 | 358 |
<string>PBXNavigatorGroup</string> |
| 352 | 359 |
<key>Proportion</key> |
| 353 |
<string>535pt</string>
|
|
| 360 |
<string>675pt</string>
|
|
| 354 | 361 |
</dict> |
| 355 | 362 |
<dict> |
| 356 | 363 |
<key>Proportion</key> |
| 357 |
<string>140pt</string>
|
|
| 364 |
<string>0pt</string> |
|
| 358 | 365 |
<key>Tabs</key> |
| 359 | 366 |
<array> |
| 360 | 367 |
<dict> |
| ... | ... | |
| 368 | 375 |
<key>GeometryConfiguration</key> |
| 369 | 376 |
<dict> |
| 370 | 377 |
<key>Frame</key> |
| 371 |
<string>{{10, 27}, {1058, 113}}</string>
|
|
| 378 |
<string>{{10, 27}, {1058, -27}}</string>
|
|
| 372 | 379 |
<key>RubberWindowFrame</key> |
| 373 |
<string>0 109 1280 721 0 0 1280 832 </string>
|
|
| 380 |
<string>0 111 1280 721 0 0 1280 832 </string>
|
|
| 374 | 381 |
</dict> |
| 375 | 382 |
<key>Module</key> |
| 376 | 383 |
<string>XCDetailModule</string> |
| ... | ... | |
| 429 | 436 |
</array> |
| 430 | 437 |
<key>TableOfContents</key> |
| 431 | 438 |
<array> |
| 432 |
<string>A330E0820CA99B6A00C8A074</string>
|
|
| 439 |
<string>A3D78AF10CB6BCBE00A79632</string>
|
|
| 433 | 440 |
<string>1CA23ED40692098700951B8B</string> |
| 434 |
<string>A330E0830CA99B6A00C8A074</string>
|
|
| 441 |
<string>A3D78AF20CB6BCBE00A79632</string>
|
|
| 435 | 442 |
<string>A34161A50C989E610007BEF2</string> |
| 436 |
<string>A330E0840CA99B6A00C8A074</string>
|
|
| 443 |
<string>A3D78AF30CB6BCBE00A79632</string>
|
|
| 437 | 444 |
<string>1CA23EDF0692099D00951B8B</string> |
| 438 | 445 |
<string>1CA23EE00692099D00951B8B</string> |
| 439 | 446 |
<string>1CA23EE10692099D00951B8B</string> |
| ... | ... | |
| 481 | 488 |
<dict> |
| 482 | 489 |
<key>PBXSmartGroupTreeModuleColumnWidthsKey</key> |
| 483 | 490 |
<array> |
| 484 |
<real>1000</real>
|
|
| 491 |
<real>250</real>
|
|
| 485 | 492 |
</array> |
| 486 | 493 |
<key>PBXSmartGroupTreeModuleColumnsKey_v4</key> |
| 487 | 494 |
<array> |
| ... | ... | |
| 503 | 510 |
</array> |
| 504 | 511 |
</array> |
| 505 | 512 |
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> |
| 506 |
<string>{{0, 0}, {1258, 662}}</string>
|
|
| 513 |
<string>{{0, 0}, {250, 662}}</string>
|
|
| 507 | 514 |
</dict> |
| 508 | 515 |
<key>PBXTopSmartGroupGIDs</key> |
| 509 | 516 |
<array/> |
| ... | ... | |
| 513 | 520 |
<key>GeometryConfiguration</key> |
| 514 | 521 |
<dict> |
| 515 | 522 |
<key>Frame</key> |
| 516 |
<string>{{0, 0}, {1275, 680}}</string>
|
|
| 523 |
<string>{{0, 0}, {267, 680}}</string>
|
|
| 517 | 524 |
<key>GroupTreeTableConfiguration</key> |
| 518 | 525 |
<array> |
| 519 | 526 |
<string>MainColumn</string> |
| 520 |
<real>1000</real>
|
|
| 527 |
<real>250</real>
|
|
| 521 | 528 |
</array> |
| 522 | 529 |
</dict> |
| 523 | 530 |
<key>Module</key> |
| 524 | 531 |
<string>PBXSmartGroupTreeModule</string> |
| 525 | 532 |
<key>Proportion</key> |
| 526 |
<string>1275pt</string>
|
|
| 533 |
<string>267pt</string>
|
|
| 527 | 534 |
</dict> |
| 528 | 535 |
<dict> |
| 529 | 536 |
<key>Dock</key> |
| ... | ... | |
| 546 | 553 |
<key>_historyCapacity</key> |
| 547 | 554 |
<integer>0</integer> |
| 548 | 555 |
<key>bookmark</key> |
| 549 |
<string>A330E0930CA9A02C00C8A074</string>
|
|
| 556 |
<string>A35611250CB3E0A6008C739C</string>
|
|
| 550 | 557 |
<key>history</key> |
| 551 | 558 |
<array> |
| 552 | 559 |
<string>A31266650C9B131A00D15EBF</string> |
| 553 |
<string>A3EE6A500C9B3CA800C5C56B</string>
|
|
| 554 |
<string>A330E0390CA96AA800C8A074</string>
|
|
| 555 |
<string>A330E08C0CA99BB900C8A074</string>
|
|
| 560 |
<string>A3A687270CB0429000478070</string>
|
|
| 561 |
<string>A356111A0CB3E092008C739C</string>
|
|
| 562 |
<string>A3E52AE60CB3DD9C00A1BC2C</string>
|
|
| 556 | 563 |
</array> |
| 557 |
<key>nextStack</key> |
|
| 558 |
<array> |
|
| 559 |
<string>A330E03C0CA96AA800C8A074</string> |
|
| 560 |
</array> |
|
| 561 | 564 |
<key>prevStack</key> |
| 562 | 565 |
<array> |
| 563 |
<string>A31266680C9B131A00D15EBF</string> |
|
| 564 | 566 |
<string>A31266690C9B131A00D15EBF</string> |
| 565 | 567 |
<string>A312666C0C9B131A00D15EBF</string> |
| 566 | 568 |
<string>A3EE6A520C9B3CA800C5C56B</string> |
| 569 |
<string>A330E0560CA96CB400C8A074</string> |
|
| 570 |
<string>A356111B0CB3E092008C739C</string> |
|
| 567 | 571 |
</array> |
| 568 | 572 |
</dict> |
| 569 | 573 |
<key>SplitCount</key> |
| ... | ... | |
| 577 | 581 |
<key>GeometryConfiguration</key> |
| 578 | 582 |
<dict> |
| 579 | 583 |
<key>Frame</key> |
| 580 |
<string>{{0, 0}, {0, 0}}</string>
|
|
| 584 |
<string>{{0, 0}, {1008, 522}}</string>
|
|
| 581 | 585 |
</dict> |
| 582 | 586 |
<key>Module</key> |
| 583 | 587 |
<string>PBXNavigatorGroup</string> |
| 584 | 588 |
<key>Proportion</key> |
| 585 |
<string>0pt</string>
|
|
| 589 |
<string>522pt</string>
|
|
| 586 | 590 |
</dict> |
| 587 | 591 |
<dict> |
| 588 | 592 |
<key>Proportion</key> |
| 589 |
<string>0pt</string>
|
|
| 593 |
<string>153pt</string>
|
|
| 590 | 594 |
<key>Tabs</key> |
| 591 | 595 |
<array> |
| 592 | 596 |
<dict> |
| ... | ... | |
| 604 | 608 |
<key>GeometryConfiguration</key> |
| 605 | 609 |
<dict> |
| 606 | 610 |
<key>Frame</key> |
| 607 |
<string>{{10, 27}, {0, -27}}</string>
|
|
| 611 |
<string>{{10, 27}, {1008, 126}}</string>
|
|
| 608 | 612 |
</dict> |
| 609 | 613 |
<key>Module</key> |
| 610 | 614 |
<string>PBXBuildResultsModule</string> |
| ... | ... | |
| 657 | 661 |
<key>GeometryConfiguration</key> |
| 658 | 662 |
<dict> |
| 659 | 663 |
<key>Frame</key> |
| 660 |
<string>{{10, 27}, {0, -27}}</string>
|
|
| 664 |
<string>{{10, 27}, {1008, 126}}</string>
|
|
| 661 | 665 |
</dict> |
| 662 | 666 |
<key>Module</key> |
| 663 | 667 |
<string>PBXRunSessionModule</string> |
| ... | ... | |
| 666 | 670 |
</dict> |
| 667 | 671 |
</array> |
| 668 | 672 |
<key>Proportion</key> |
| 669 |
<string>0pt</string>
|
|
| 673 |
<string>1008pt</string>
|
|
| 670 | 674 |
</dict> |
| 671 | 675 |
</array> |
| 672 | 676 |
<key>Name</key> |
| ... | ... | |
| 684 | 688 |
</array> |
| 685 | 689 |
<key>TableOfContents</key> |
| 686 | 690 |
<array> |
| 687 |
<string>A330E0860CA99B6A00C8A074</string>
|
|
| 691 |
<string>A35611260CB3E0A6008C739C</string>
|
|
| 688 | 692 |
<string>1CA23EE50692099D00951B8B</string> |
| 689 |
<string>A330E0870CA99B6A00C8A074</string>
|
|
| 693 |
<string>A35611270CB3E0A6008C739C</string>
|
|
| 690 | 694 |
<string>A34161AC0C989F140007BEF2</string> |
| 691 |
<string>A330E0880CA99B6A00C8A074</string>
|
|
| 695 |
<string>A35611280CB3E0A6008C739C</string>
|
|
| 692 | 696 |
<string>XCMainBuildResultsModuleGUID</string> |
| 693 | 697 |
<string>1CA23EE80692099D00951B8B</string> |
| 694 |
<string>A330E0890CA99B6A00C8A074</string>
|
|
| 698 |
<string>A35611290CB3E0A6008C739C</string>
|
|
| 695 | 699 |
</array> |
| 696 | 700 |
<key>ToolbarConfiguration</key> |
| 697 | 701 |
<string>xcode.toolbar.config.buildAndRun</string> |
| ... | ... | |
| 822 | 826 |
</array> |
| 823 | 827 |
<key>TableOfContents</key> |
| 824 | 828 |
<array> |
| 825 |
<string>A3EE6A140C9B23BB00C5C56B</string>
|
|
| 829 |
<string>A37E8A5E0CAB0F3300CE6680</string>
|
|
| 826 | 830 |
<string>1CCC7628064C1048000F2A68</string> |
| 827 | 831 |
<string>1CCC7629064C1048000F2A68</string> |
| 828 |
<string>A3EE6A150C9B23BB00C5C56B</string>
|
|
| 829 |
<string>A3EE6A160C9B23BB00C5C56B</string>
|
|
| 830 |
<string>A3EE6A170C9B23BB00C5C56B</string>
|
|
| 831 |
<string>A3EE6A180C9B23BB00C5C56B</string>
|
|
| 832 |
<string>A3EE6A040C9B23A300C5C56B</string>
|
|
| 833 |
<string>A3EE6A190C9B23BB00C5C56B</string>
|
|
| 832 |
<string>A37E8A5F0CAB0F3300CE6680</string>
|
|
| 833 |
<string>A37E8A600CAB0F3300CE6680</string>
|
|
| 834 |
<string>A37E8A610CAB0F3300CE6680</string>
|
|
| 835 |
<string>A37E8A620CAB0F3300CE6680</string>
|
|
| 836 |
<string>A37E8A400CAB0E2800CE6680</string>
|
|
| 837 |
<string>A37E8A630CAB0F3300CE6680</string>
|
|
| 834 | 838 |
</array> |
| 835 | 839 |
<key>ToolbarConfiguration</key> |
| 836 | 840 |
<string>xcode.toolbar.config.debug</string> |
| ... | ... | |
| 863 | 867 |
<string>/Users/gmtress/Documents/Colony/roboclub_repository/colony/trunk/code/projects/colonet/ColonetGUI/Colonet.xcodeproj</string> |
| 864 | 868 |
</array> |
| 865 | 869 |
<key>WindowString</key> |
| 866 |
<string>0 109 1280 721 0 0 1280 832 </string>
|
|
| 870 |
<string>0 111 1280 721 0 0 1280 832 </string>
|
|
| 867 | 871 |
<key>WindowTools</key> |
| 868 | 872 |
<array> |
| 869 | 873 |
<dict> |
| ... | ... | |
| 1345 | 1349 |
<string>538 42 401 187 0 0 1280 1002 </string> |
| 1346 | 1350 |
</dict> |
| 1347 | 1351 |
<dict> |
| 1352 |
<key>FirstTimeWindowDisplayed</key> |
|
| 1353 |
<false/> |
|
| 1348 | 1354 |
<key>Identifier</key> |
| 1349 | 1355 |
<string>windowTool.classBrowser</string> |
| 1356 |
<key>IsVertical</key> |
|
| 1357 |
<true/> |
|
| 1350 | 1358 |
<key>Layout</key> |
| 1351 | 1359 |
<array> |
| 1352 | 1360 |
<dict> |
| 1353 | 1361 |
<key>Dock</key> |
| 1354 | 1362 |
<array> |
| 1355 | 1363 |
<dict> |
| 1356 |
<key>BecomeActive</key> |
|
| 1357 |
<integer>1</integer> |
|
| 1358 | 1364 |
<key>ContentConfiguration</key> |
| 1359 | 1365 |
<dict> |
| 1360 | 1366 |
<key>OptionsSetName</key> |
| ... | ... | |
| 1362 | 1368 |
<key>PBXProjectModuleGUID</key> |
| 1363 | 1369 |
<string>1CA6456E063B45B4001379D8</string> |
| 1364 | 1370 |
<key>PBXProjectModuleLabel</key> |
| 1365 |
<string>Class Browser - NSObject</string>
|
|
| 1371 |
<string>Class Browser - javax.swing.AbstractAction</string>
|
|
| 1366 | 1372 |
</dict> |
| 1367 | 1373 |
<key>GeometryConfiguration</key> |
| 1368 | 1374 |
<dict> |
| 1369 | 1375 |
<key>ClassesFrame</key> |
| 1370 |
<string>{{0, 0}, {369, 96}}</string>
|
|
| 1376 |
<string>{{0, 0}, {364, 96}}</string>
|
|
| 1371 | 1377 |
<key>ClassesTreeTableConfiguration</key> |
| 1372 | 1378 |
<array> |
| 1373 | 1379 |
<string>PBXClassNameColumnIdentifier</string> |
| ... | ... | |
| 1376 | 1382 |
<real>22</real> |
| 1377 | 1383 |
</array> |
| 1378 | 1384 |
<key>Frame</key> |
| 1379 |
<string>{{0, 0}, {616, 353}}</string>
|
|
| 1385 |
<string>{{0, 0}, {616, 354}}</string>
|
|
| 1380 | 1386 |
<key>MembersFrame</key> |
| 1381 |
<string>{{0, 105}, {369, 395}}</string>
|
|
| 1387 |
<string>{{0, 101}, {364, 253}}</string>
|
|
| 1382 | 1388 |
<key>MembersTreeTableConfiguration</key> |
| 1383 | 1389 |
<array> |
| 1384 | 1390 |
<string>PBXMemberTypeIconColumnIdentifier</string> |
| ... | ... | |
| 1386 | 1392 |
<string>PBXMemberNameColumnIdentifier</string> |
| 1387 | 1393 |
<real>216</real> |
| 1388 | 1394 |
<string>PBXMemberTypeColumnIdentifier</string> |
| 1389 |
<real>94</real>
|
|
| 1395 |
<real>87</real>
|
|
| 1390 | 1396 |
<string>PBXMemberBookColumnIdentifier</string> |
| 1391 | 1397 |
<real>22</real> |
| 1392 | 1398 |
</array> |
| 1393 |
<key>PBXModuleWindowStatusBarHidden2</key> |
|
| 1394 |
<integer>1</integer> |
|
| 1395 | 1399 |
<key>RubberWindowFrame</key> |
| 1396 |
<string>597 125 616 374 0 0 1280 1002 </string>
|
|
| 1400 |
<string>34 620 616 374 0 0 1680 1028 </string>
|
|
| 1397 | 1401 |
</dict> |
| 1398 | 1402 |
<key>Module</key> |
| 1399 | 1403 |
<string>PBXClassBrowserModule</string> |
| ... | ... | |
| 1412 | 1416 |
<string>PBXClassBrowserModule</string> |
| 1413 | 1417 |
</array> |
| 1414 | 1418 |
<key>StatusbarIsVisible</key> |
| 1415 |
<integer>0</integer>
|
|
| 1419 |
<false/>
|
|
| 1416 | 1420 |
<key>TableOfContents</key> |
| 1417 | 1421 |
<array> |
| 1418 |
<string>1C78EABA065D492600B07095</string>
|
|
| 1419 |
<string>1C78EABB065D492600B07095</string>
|
|
| 1422 |
<string>A30387EF0CAB061700E9D9D2</string>
|
|
| 1423 |
<string>A3A687140CB0373B00478070</string>
|
|
| 1420 | 1424 |
<string>1CA6456E063B45B4001379D8</string> |
| 1421 | 1425 |
</array> |
| 1422 | 1426 |
<key>ToolbarConfiguration</key> |
| 1423 | 1427 |
<string>xcode.toolbar.config.classbrowser</string> |
| 1424 | 1428 |
<key>WindowString</key> |
| 1425 |
<string>597 125 616 374 0 0 1280 1002 </string> |
|
| 1429 |
<string>34 620 616 374 0 0 1680 1028 </string> |
|
| 1430 |
<key>WindowToolGUID</key> |
|
| 1431 |
<string>A30387EF0CAB061700E9D9D2</string> |
|
| 1432 |
<key>WindowToolIsVisible</key> |
|
| 1433 |
<false/> |
|
| 1426 | 1434 |
</dict> |
| 1427 | 1435 |
</array> |
| 1428 | 1436 |
</dict> |
| trunk/code/projects/colonet/ColonetGUI/Colonet.java | ||
|---|---|---|
| 350 | 350 |
} else if (source == btnActivate) {
|
| 351 | 351 |
csi.sendData(ColonetServerInterface.MOTOR1_SET + " 0 0", ColonetServerInterface.GLOBAL_DEST); |
| 352 | 352 |
csi.sendData(ColonetServerInterface.MOTOR2_SET + " 0 0", ColonetServerInterface.GLOBAL_DEST); |
| 353 |
|
|
| 354 |
|
|
| 355 |
// Queue Management |
|
| 356 |
} else if (source == btnAddTask) {
|
|
| 357 |
String description = JOptionPane.showInputDialog("Description of new task");
|
|
| 358 |
String data = JOptionPane.showInputDialog("Command and data for new task");
|
|
| 359 |
csi.sendQueueAdd(0, data, description); |
|
| 360 |
} else if (source == btnRemoveTask) {
|
|
| 361 |
csi.sendQueueRemove(0); |
|
| 362 |
} else if (source == btnMoveTaskUp) {
|
|
| 363 |
csi.sendQueueReorder(0, 1); |
|
| 364 |
} else if (source == btnMoveTaskDown) {
|
|
| 365 |
|
|
| 366 |
|
|
| 353 | 367 |
} |
| 354 | 368 |
} |
| 355 | 369 |
|
| ... | ... | |
| 636 | 650 |
//recalculate radius, if it will look cool, lolz |
| 637 | 651 |
int newr = r; |
| 638 | 652 |
if (steps < 100) |
| 639 |
newr = (int)( r + 200/(steps+1) );
|
|
| 653 |
newr = (int)( r + 200/(steps+1) );
|
|
| 640 | 654 |
|
| 641 | 655 |
//precompute values for dx and dy |
| 642 | 656 |
int dx_inner = (int)(newr * Math.cos(theta)); |
| ... | ... | |
| 795 | 809 |
try {
|
| 796 | 810 |
//request more data |
| 797 | 811 |
if (csi.isReady()) |
| 798 |
csi.sendRequest(ColonetServerInterface.REQUEST_BOM_MATRIX, "");
|
|
| 812 |
csi.sendSensorDataRequest();
|
|
| 799 | 813 |
Thread.sleep(DATAUPDATER_DELAY); |
| 800 | 814 |
} catch (InterruptedException e) {
|
| 801 | 815 |
return; |
| trunk/code/projects/colonet/ColonetGUI/ColonetServerInterface.java | ||
|---|---|---|
| 20 | 20 |
|
| 21 | 21 |
Old packet structure: |
| 22 | 22 |
|
| 23 |
COMMAND PACKET STRUCTURE |
|
| 23 |
COMMAND PACKET STRUCTURE
|
|
| 24 | 24 |
1: SEND_TO_ROBOT |
| 25 | 25 |
2: # of robot, or GLOBAL_DEST |
| 26 | 26 |
3: COLONET_COMMMAND |
| ... | ... | |
| 49 | 49 |
public static final String CORONET_RESPONSE = "15"; //0x0F |
| 50 | 50 |
public static final String GLOBAL_DEST = "200"; |
| 51 | 51 |
|
| 52 |
//Queue instructions |
|
| 53 |
public static final String COLONET_QUEUE = "100"; |
|
| 54 |
public static final String QUEUE_UPDATE = "101"; |
|
| 55 |
public static final String QUEUE_ADD = "102"; |
|
| 56 |
public static final String QUEUE_REMOVE = "103"; |
|
| 57 |
public static final String QUEUE_REORDER = "104"; |
|
| 58 |
|
|
| 52 | 59 |
//Use BATTERY to request battery level |
| 53 | 60 |
public static final String BATTERY = "56"; //0x38 |
| 54 | 61 |
|
| ... | ... | |
| 196 | 203 |
|
| 197 | 204 |
} |
| 198 | 205 |
|
| 199 |
/** |
|
| 200 |
* Sends a command code to the colonet server so that it can be redirected to one or more robots. |
|
| 201 |
* Assembles the given string into a packet and sends a full command string to the colonet server. |
|
| 202 |
* The string sent from here should be the correct form for sending directly to the robot. |
|
| 203 |
*/ |
|
| 204 |
public void sendData (String s, String robotNumber) {
|
|
| 206 |
/* |
|
| 207 |
* sendString - only this method should actually write data to the output stream |
|
| 208 |
*/ |
|
| 209 |
public void sendString (String s) {
|
|
| 205 | 210 |
//make sure we can send |
| 206 | 211 |
if (!this.isReady()) {
|
| 207 |
warn("There was a problem with the connection. Data could not be sent.\n"
|
|
| 208 |
+"Make sure you are connected and try sending the command again."); |
|
| 212 |
log.append("Could not send data.\n");
|
|
| 209 | 213 |
return; |
| 210 | 214 |
} |
| 211 |
|
|
| 212 |
//create packet |
|
| 213 |
String packet; |
|
| 214 |
packet = ColonetServerInterface.SEND_TO_ROBOT; |
|
| 215 |
packet += " " + robotNumber; |
|
| 216 |
packet += " " + ColonetServerInterface.COLONET_COMMAND; |
|
| 217 |
packet += " " + s; //add the command code here |
|
| 218 |
packet += "\n"; |
|
| 219 |
|
|
| 220 | 215 |
//send packet |
| 221 | 216 |
try {
|
| 222 |
log.append("Sending: " + packet);
|
|
| 223 |
out.write(packet);
|
|
| 217 |
Thread.sleep(10); //pause to be safe
|
|
| 218 |
out.write(s);
|
|
| 224 | 219 |
out.flush(); |
| 220 |
log.append("Sent: " + s);
|
|
| 225 | 221 |
} catch (IOException e) {
|
| 226 | 222 |
log.append("Could not send data.\n");
|
| 223 |
} catch (InterruptedException e) {
|
|
| 224 |
log.append("Thread InterruptedException in sendData\n");
|
|
| 227 | 225 |
} |
| 228 | 226 |
} |
| 229 | 227 |
|
| 230 |
/** |
|
| 231 |
* Sends a request to the colonet server so that it can be redirected to one or more robots. |
|
| 232 |
* Assembles the given string into a packet and sends a full command string to the colonet server. |
|
| 233 |
* The string sent from here should be the correct form for sending directly to the robot. |
|
| 234 |
* @param s The request code to be sent |
|
| 235 |
* @see #sendData(String) |
|
| 236 |
*/ |
|
| 228 |
public void sendData (String s, String robotNumber) {
|
|
| 229 |
//create packet |
|
| 230 |
String packet = ""; |
|
| 231 |
packet += ColonetServerInterface.SEND_TO_ROBOT; |
|
| 232 |
packet += " " + robotNumber; |
|
| 233 |
packet += " " + ColonetServerInterface.COLONET_COMMAND; |
|
| 234 |
packet += " " + s; //add the command code here |
|
| 235 |
packet += "\n"; |
|
| 236 |
sendString(packet); |
|
| 237 |
} |
|
| 238 |
|
|
| 237 | 239 |
public void sendRequest (String s, String robotNumber) {
|
| 238 |
//make sure we can send |
|
| 239 |
if (!this.isReady()) {
|
|
| 240 |
log.append("Could not send data.\n");
|
|
| 241 |
return; |
|
| 242 |
} |
|
| 243 |
|
|
| 244 |
//get robot code to send to. |
|
| 245 |
/* |
|
| 246 |
if (cmbRobotNumber.getSelectedIndex() == 0) |
|
| 247 |
robotNumber = ColonetServerInterface.GLOBAL_DEST; |
|
| 248 |
else |
|
| 249 |
robotNumber = ( cmbRobotNumber.getSelectedIndex() - 1 ) + ""; |
|
| 250 |
*/ |
|
| 251 |
|
|
| 252 | 240 |
//create packet |
| 253 |
String packet; |
|
| 254 |
packet = ColonetServerInterface.REQUEST_FROM_SERVER; |
|
| 241 |
String packet = "";
|
|
| 242 |
packet += ColonetServerInterface.REQUEST_FROM_SERVER;
|
|
| 255 | 243 |
//packet += " " + robotNumber; |
| 256 | 244 |
//packet += " " + ColonetServerInterface.COLONET_REQUEST; |
| 257 | 245 |
packet += " " + s; //add the command code here |
| 258 | 246 |
packet += "\n"; |
| 259 |
|
|
| 260 |
//send packet |
|
| 261 |
try {
|
|
| 262 |
Thread.sleep(100); //pause to be safe |
|
| 263 |
out.write(packet); |
|
| 264 |
out.flush(); |
|
| 265 |
log.append("Sent: " + packet);
|
|
| 266 |
} catch (IOException e) {
|
|
| 267 |
log.append("Could not send data.\n");
|
|
| 268 |
} catch (InterruptedException e) {
|
|
| 269 |
log.append("Thread InterruptedException in sendData\n");
|
|
| 270 |
} |
|
| 271 |
|
|
| 247 |
sendString(packet); |
|
| 272 | 248 |
} |
| 249 |
|
|
| 250 |
public void sendSensorDataRequest () {
|
|
| 251 |
sendRequest(ColonetServerInterface.REQUEST_BOM_MATRIX, ""); |
|
| 252 |
} |
|
| 253 |
|
|
| 254 |
/* |
|
| 255 |
* Queue management |
|
| 256 |
*/ |
|
| 257 |
public void sendQueueInstruction (String inst) {
|
|
| 258 |
String packet = ""; |
|
| 259 |
packet += ColonetServerInterface.COLONET_QUEUE; |
|
| 260 |
packet += " " + inst; |
|
| 261 |
packet += "\n"; |
|
| 262 |
sendString(packet); |
|
| 263 |
} |
|
| 264 |
|
|
| 265 |
public void sendQueueAdd (int pos, String data, String description) {
|
|
| 266 |
String packet = ""; |
|
| 267 |
packet += ColonetServerInterface.QUEUE_ADD; |
|
| 268 |
packet += " " + pos; |
|
| 269 |
packet += " " + data; |
|
| 270 |
packet += " [" + description + "]"; |
|
| 271 |
packet += "\n"; |
|
| 272 |
sendQueueInstruction(packet); |
|
| 273 |
} |
|
| 274 |
|
|
| 275 |
public void sendQueueRemove (int pos) {
|
|
| 276 |
String packet = ""; |
|
| 277 |
packet += ColonetServerInterface.QUEUE_REMOVE; |
|
| 278 |
packet += " " + pos; |
|
| 279 |
packet += "\n"; |
|
| 280 |
sendQueueInstruction(packet); |
|
| 281 |
} |
|
| 273 | 282 |
|
| 283 |
public void sendQueueReorder (int pos1, int pos2) {
|
|
| 284 |
String packet = ""; |
|
| 285 |
packet += ColonetServerInterface.QUEUE_REORDER; |
|
| 286 |
packet += " " + pos1; |
|
| 287 |
packet += " " + pos2; |
|
| 288 |
packet += "\n"; |
|
| 289 |
sendQueueInstruction(packet); |
|
| 290 |
} |
|
| 274 | 291 |
|
| 275 | 292 |
|
| 276 | 293 |
|
| ... | ... | |
| 317 | 334 |
line = getLine(); |
| 318 | 335 |
if (line != null) {
|
| 319 | 336 |
parseData(line); |
| 320 |
//TODO: parse incoming data here |
|
| 321 |
|
|
| 322 |
//request more data |
|
| 323 |
//csi.sendRequest("Get all data", "server");
|
|
| 324 |
|
|
| 325 |
/* |
|
| 326 |
// update robot list |
|
| 327 |
int numRobots = 5; |
|
| 328 |
String [] robotList = new String[numRobots+1]; |
|
| 329 |
robotList[0] = "All"; |
|
| 330 |
for (int i = 1; i <= numRobots; i++) |
|
| 331 |
robotList[i] = "Robot " + i; |
|
| 332 |
cmbRobotNum = new JComboBox(robotList); |
|
| 333 |
*/ |
|
| 334 | 337 |
} |
| 335 | 338 |
Thread.sleep(DATALISTENER_DELAY); |
| 336 | 339 |
} catch (InterruptedException e) {
|
| ... | ... | |
| 341 | 344 |
|
| 342 | 345 |
public void parseData (String line) {
|
| 343 | 346 |
log.append("Incoming data: [" + line + "]\n");
|
| 344 |
if (line.startsWith(ColonetServerInterface.RESPONSE_TO_CLIENT_REQUEST + " " + ColonetServerInterface.REQUEST_BOM_MATRIX)) |
|
| 347 |
if (line.startsWith(ColonetServerInterface.RESPONSE_TO_CLIENT_REQUEST + " " |
|
| 348 |
+ ColonetServerInterface.REQUEST_BOM_MATRIX)) |
|
| 345 | 349 |
parseMatrix(line); |
| 350 |
if (line.startsWith(ColonetServerInterface.COLONET_QUEUE)) |
|
| 351 |
parseQueue(line); |
|
| 346 | 352 |
} |
| 347 | 353 |
|
| 348 | 354 |
public void parseMatrix (String line) {
|
| 349 |
log.append("Parsing matrix\n");
|
|
| 350 | 355 |
txtMatrix.setText("");
|
| 351 | 356 |
String [] str = line.split(" ");
|
| 352 | 357 |
int num = Integer.parseInt(str[2]); |
| ... | ... | |
| 364 | 369 |
txtMatrix.append("\n");
|
| 365 | 370 |
} |
| 366 | 371 |
} |
| 372 |
|
|
| 373 |
public void parseQueue (String line) {
|
|
| 374 |
log.append("Got queue data\n");
|
|
| 375 |
|
|
| 376 |
} |
|
| 367 | 377 |
|
| 368 | 378 |
} |
| 369 | 379 |
|
| trunk/code/projects/colonet/ColonetGUI/index_colonet.html | ||
|---|---|---|
| 22 | 22 |
archive = "Colonet.jar" |
| 23 | 23 |
type = "application/x-java-applet" |
| 24 | 24 |
width = "800" |
| 25 |
height = "700"
|
|
| 25 |
height = "675"
|
|
| 26 | 26 |
align = "bottom" |
| 27 | 27 |
codebase = "http://roboclub1.frc.ri.cmu.edu/gui/" |
| 28 | 28 |
name = "Colonet" |
Also available in: Unified diff