Revision 155
minor updates to gui
trunk/code/projects/colonet/ColonetGUI/Colonet.xcodeproj/project.pbxproj | ||
---|---|---|
8 | 8 |
|
9 | 9 |
/* Begin PBXBuildFile section */ |
10 | 10 |
130F8B86001BDB6411CA292A /* Colonet.java in Sources */ = {isa = PBXBuildFile; fileRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; }; |
11 |
130F8B8A001BDB6411CA292A /* index_colonet.html in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00E68291FEC88ED911DB9C8B /* index_colonet.html */; };
|
|
11 |
130F8B8A001BDB6411CA292A /* index.html in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00E68291FEC88ED911DB9C8B /* index.html */; };
|
|
12 | 12 |
A34161830C989C090007BEF2 /* colonetstyle.css in JavaArchive */ = {isa = PBXBuildFile; fileRef = A34161820C989C090007BEF2 /* colonetstyle.css */; settings = {JAVA_ARCHIVE_SUBDIR = ""; }; }; |
13 | 13 |
A34161910C989CB30007BEF2 /* ColonetServerInterface.java in Sources */ = {isa = PBXBuildFile; fileRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; }; |
14 | 14 |
/* End PBXBuildFile section */ |
... | ... | |
20 | 20 |
dstPath = ""; |
21 | 21 |
dstSubfolderSpec = 16; |
22 | 22 |
files = ( |
23 |
130F8B8A001BDB6411CA292A /* index_colonet.html in CopyFiles */,
|
|
23 |
130F8B8A001BDB6411CA292A /* index.html in CopyFiles */, |
|
24 | 24 |
); |
25 | 25 |
runOnlyForDeploymentPostprocessing = 0; |
26 | 26 |
}; |
... | ... | |
28 | 28 |
|
29 | 29 |
/* Begin PBXFileReference section */ |
30 | 30 |
00E68290FEC88D7311DB9C8B /* Colonet.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = Colonet.java; sourceTree = "<group>"; }; |
31 |
00E68291FEC88ED911DB9C8B /* index_colonet.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index_colonet.html; sourceTree = "<group>"; };
|
|
31 |
00E68291FEC88ED911DB9C8B /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = "<group>"; };
|
|
32 | 32 |
329C72810360BFA200C91783 /* Colonet.jar */ = {isa = PBXFileReference; explicitFileType = archive.jar; includeInIndex = 0; path = Colonet.jar; sourceTree = BUILT_PRODUCTS_DIR; }; |
33 | 33 |
A34161820C989C090007BEF2 /* colonetstyle.css */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = colonetstyle.css; sourceTree = "<group>"; }; |
34 | 34 |
A34161900C989CB30007BEF2 /* ColonetServerInterface.java */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.java; path = ColonetServerInterface.java; sourceTree = "<group>"; }; |
... | ... | |
50 | 50 |
children = ( |
51 | 51 |
00E68290FEC88D7311DB9C8B /* Colonet.java */, |
52 | 52 |
A34161900C989CB30007BEF2 /* ColonetServerInterface.java */, |
53 |
00E68291FEC88ED911DB9C8B /* index_colonet.html */,
|
|
53 |
00E68291FEC88ED911DB9C8B /* index.html */, |
|
54 | 54 |
A34161820C989C090007BEF2 /* colonetstyle.css */, |
55 | 55 |
0120612AFEC8923411DB9C8B /* Products */, |
56 | 56 |
); |
trunk/code/projects/colonet/ColonetGUI/Colonet.xcodeproj/gmtress.pbxuser | ||
---|---|---|
163 | 163 |
PBXFileDataSource_Warnings_ColumnID, |
164 | 164 |
); |
165 | 165 |
}; |
166 |
PBXPerProjectTemplateStateSaveDate = 213642084;
|
|
167 |
PBXWorkspaceStateSaveDate = 213642084;
|
|
166 |
PBXPerProjectTemplateStateSaveDate = 213751299;
|
|
167 |
PBXWorkspaceStateSaveDate = 213751299;
|
|
168 | 168 |
}; |
169 | 169 |
perUserProjectItems = { |
170 |
A30FBFA20CBBDC44000A16EC /* PBXTextBookmark */ = A30FBFA20CBBDC44000A16EC /* PBXTextBookmark */; |
|
171 |
A30FC0430CBBECA9000A16EC /* PBXTextBookmark */ = A30FC0430CBBECA9000A16EC /* PBXTextBookmark */; |
|
172 |
A30FC04E0CBBED0C000A16EC /* PBXTextBookmark */ = A30FC04E0CBBED0C000A16EC /* PBXTextBookmark */; |
|
173 |
A30FC0550CBBED7B000A16EC /* PBXTextBookmark */ = A30FC0550CBBED7B000A16EC /* PBXTextBookmark */; |
|
174 |
A30FC0560CBBED7B000A16EC /* PBXTextBookmark */ = A30FC0560CBBED7B000A16EC /* PBXTextBookmark */; |
|
175 |
A31266650C9B131A00D15EBF /* PBXTextBookmark */ = A31266650C9B131A00D15EBF /* PBXTextBookmark */; |
|
176 |
A31266690C9B131A00D15EBF /* PBXTextBookmark */ = A31266690C9B131A00D15EBF /* PBXTextBookmark */; |
|
177 |
A312666C0C9B131A00D15EBF /* PBXTextBookmark */ = A312666C0C9B131A00D15EBF /* PBXTextBookmark */; |
|
178 |
A330E0560CA96CB400C8A074 /* PBXTextBookmark */ = A330E0560CA96CB400C8A074 /* PBXTextBookmark */; |
|
179 |
A3A687270CB0429000478070 /* PBXTextBookmark */ = A3A687270CB0429000478070 /* PBXTextBookmark */; |
|
180 |
A3D78CD10CB709FA00A79632 /* PBXTextBookmark */ = A3D78CD10CB709FA00A79632 /* PBXTextBookmark */; |
|
181 |
A3D78E650CB72FF100A79632 /* PBXTextBookmark */ = A3D78E650CB72FF100A79632 /* PBXTextBookmark */; |
|
182 |
A3D78E860CB7316900A79632 /* PBXTextBookmark */ = A3D78E860CB7316900A79632 /* PBXTextBookmark */; |
|
183 |
A3EE6A520C9B3CA800C5C56B /* PBXTextBookmark */ = A3EE6A520C9B3CA800C5C56B /* PBXTextBookmark */; |
|
170 |
A30FC0970CBD7DFA000A16EC = A30FC0970CBD7DFA000A16EC /* PBXTextBookmark */; |
|
171 |
A30FC0A60CBD7E05000A16EC = A30FC0A60CBD7E05000A16EC /* PBXTextBookmark */; |
|
172 |
A30FC0CD0CBD7F2A000A16EC = A30FC0CD0CBD7F2A000A16EC /* PBXTextBookmark */; |
|
173 |
A30FC0DF0CBD7F46000A16EC = A30FC0DF0CBD7F46000A16EC /* PBXTextBookmark */; |
|
174 |
A30FC0E20CBD7F47000A16EC = A30FC0E20CBD7F47000A16EC /* PBXTextBookmark */; |
|
175 |
A30FC0F60CBD822A000A16EC = A30FC0F60CBD822A000A16EC /* PBXTextBookmark */; |
|
176 |
A30FC0F90CBD822A000A16EC = A30FC0F90CBD822A000A16EC /* PBXTextBookmark */; |
|
177 |
A30FC0FA0CBD822A000A16EC = A30FC0FA0CBD822A000A16EC /* PBXTextBookmark */; |
|
178 |
A30FC0FB0CBD822A000A16EC = A30FC0FB0CBD822A000A16EC /* PBXTextBookmark */; |
|
179 |
A30FC0FC0CBD822A000A16EC = A30FC0FC0CBD822A000A16EC /* PBXTextBookmark */; |
|
180 |
A30FC0FD0CBD822A000A16EC = A30FC0FD0CBD822A000A16EC /* PBXTextBookmark */; |
|
181 |
A30FC1070CBD82B8000A16EC = A30FC1070CBD82B8000A16EC /* PBXTextBookmark */; |
|
182 |
A30FC1080CBD82B8000A16EC = A30FC1080CBD82B8000A16EC /* PBXTextBookmark */; |
|
183 |
A30FC1100CBD82D5000A16EC = A30FC1100CBD82D5000A16EC /* PBXTextBookmark */; |
|
184 |
A30FC11D0CBD83AE000A16EC = A30FC11D0CBD83AE000A16EC /* PBXTextBookmark */; |
|
185 |
A30FC11E0CBD83AE000A16EC = A30FC11E0CBD83AE000A16EC /* PBXTextBookmark */; |
|
186 |
A30FC11F0CBD83AE000A16EC = A30FC11F0CBD83AE000A16EC /* PBXTextBookmark */; |
|
187 |
A30FC1200CBD83AE000A16EC = A30FC1200CBD83AE000A16EC /* PBXTextBookmark */; |
|
188 |
A30FC12A0CBD8520000A16EC = A30FC12A0CBD8520000A16EC /* PBXTextBookmark */; |
|
189 |
A30FC1320CBD8540000A16EC = A30FC1320CBD8540000A16EC /* PBXTextBookmark */; |
|
190 |
A30FC13A0CBD8587000A16EC = A30FC13A0CBD8587000A16EC /* PBXTextBookmark */; |
|
191 |
A30FC1540CBD8A7E000A16EC = A30FC1540CBD8A7E000A16EC /* PBXTextBookmark */; |
|
192 |
A30FC1660CBD954C000A16EC = A30FC1660CBD954C000A16EC /* PBXTextBookmark */; |
|
193 |
A30FC1680CBD954C000A16EC = A30FC1680CBD954C000A16EC /* PBXTextBookmark */; |
|
194 |
A30FC16D0CBD9569000A16EC = A30FC16D0CBD9569000A16EC /* PBXTextBookmark */; |
|
195 |
A30FC16E0CBD9569000A16EC = A30FC16E0CBD9569000A16EC /* PBXTextBookmark */; |
|
196 |
A30FC16F0CBD9569000A16EC = A30FC16F0CBD9569000A16EC /* PBXTextBookmark */; |
|
197 |
A30FC17D0CBD9F95000A16EC /* PBXTextBookmark */ = A30FC17D0CBD9F95000A16EC /* PBXTextBookmark */; |
|
198 |
A30FC17E0CBD9F95000A16EC /* PBXTextBookmark */ = A30FC17E0CBD9F95000A16EC /* PBXTextBookmark */; |
|
199 |
A30FC17F0CBD9F95000A16EC /* PBXTextBookmark */ = A30FC17F0CBD9F95000A16EC /* PBXTextBookmark */; |
|
200 |
A30FC1800CBD9F95000A16EC /* PBXTextBookmark */ = A30FC1800CBD9F95000A16EC /* PBXTextBookmark */; |
|
201 |
A30FC1840CBD9FAA000A16EC /* PBXTextBookmark */ = A30FC1840CBD9FAA000A16EC /* PBXTextBookmark */; |
|
202 |
A30FC1850CBD9FAA000A16EC /* PBXTextBookmark */ = A30FC1850CBD9FAA000A16EC /* PBXTextBookmark */; |
|
203 |
A30FC1860CBD9FAF000A16EC /* PBXTextBookmark */ = A30FC1860CBD9FAF000A16EC /* PBXTextBookmark */; |
|
204 |
A30FC18A0CBD9FAF000A16EC /* PBXTextBookmark */ = A30FC18A0CBD9FAF000A16EC /* PBXTextBookmark */; |
|
205 |
A30FC1920CBD9FF7000A16EC /* PBXTextBookmark */ = A30FC1920CBD9FF7000A16EC /* PBXTextBookmark */; |
|
206 |
A30FC1930CBD9FF7000A16EC /* PBXTextBookmark */ = A30FC1930CBD9FF7000A16EC /* PBXTextBookmark */; |
|
207 |
A31266650C9B131A00D15EBF = A31266650C9B131A00D15EBF /* PBXTextBookmark */; |
|
208 |
A312666C0C9B131A00D15EBF = A312666C0C9B131A00D15EBF /* PBXTextBookmark */; |
|
209 |
A3D78E650CB72FF100A79632 = A3D78E650CB72FF100A79632 /* PBXTextBookmark */; |
|
184 | 210 |
}; |
185 | 211 |
sourceControlManager = A341617E0C989B510007BEF2 /* Source Control */; |
186 | 212 |
userBuildSettings = { |
... | ... | |
188 | 214 |
}; |
189 | 215 |
00E68290FEC88D7311DB9C8B /* Colonet.java */ = { |
190 | 216 |
uiCtxt = { |
191 |
sepNavIntBoundsRect = "{{0, 0}, {1011, 15974}}";
|
|
192 |
sepNavSelRange = "{10124, 0}";
|
|
193 |
sepNavVisRect = "{{0, 0}, {1011, 644}}";
|
|
217 |
sepNavIntBoundsRect = "{{0, 0}, {991, 15974}}";
|
|
218 |
sepNavSelRange = "{19589, 0}";
|
|
219 |
sepNavVisRect = "{{0, 8690}, {991, 305}}";
|
|
194 | 220 |
sepNavWindowFrame = "{{38, 133}, {613, 699}}"; |
195 | 221 |
}; |
196 | 222 |
}; |
197 |
00E68291FEC88ED911DB9C8B /* index_colonet.html */ = {
|
|
223 |
00E68291FEC88ED911DB9C8B /* index.html */ = { |
|
198 | 224 |
uiCtxt = { |
199 |
sepNavIntBoundsRect = "{{0, 0}, {1011, 924}}";
|
|
200 |
sepNavSelRange = "{935, 0}";
|
|
201 |
sepNavVisRect = "{{0, 0}, {1011, 643}}";
|
|
225 |
sepNavIntBoundsRect = "{{0, 0}, {764, 924}}";
|
|
226 |
sepNavSelRange = "{757, 0}";
|
|
227 |
sepNavVisRect = "{{0, 0}, {0, 0}}";
|
|
202 | 228 |
sepNavWindowFrame = "{{597, 56}, {651, 776}}"; |
203 | 229 |
}; |
204 | 230 |
}; |
... | ... | |
212 | 238 |
YES, |
213 | 239 |
); |
214 | 240 |
argumentStrings = ( |
215 |
index_colonet.html,
|
|
241 |
index.html, |
|
216 | 242 |
); |
217 | 243 |
autoAttachOnCrash = 1; |
218 | 244 |
configStateDict = { |
... | ... | |
238 | 264 |
path = /usr/bin/appletviewer; |
239 | 265 |
sourceTree = "<absolute>"; |
240 | 266 |
}; |
241 |
A30FBFA20CBBDC44000A16EC /* PBXTextBookmark */ = {
|
|
267 |
A30FC0970CBD7DFA000A16EC /* PBXTextBookmark */ = {
|
|
242 | 268 |
isa = PBXTextBookmark; |
269 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
270 |
name = "Colonet.java: 300"; |
|
271 |
rLen = 0; |
|
272 |
rLoc = 10121; |
|
273 |
rType = 0; |
|
274 |
vrLen = 949; |
|
275 |
vrLoc = 0; |
|
276 |
}; |
|
277 |
A30FC0A60CBD7E05000A16EC /* PBXTextBookmark */ = { |
|
278 |
isa = PBXTextBookmark; |
|
279 |
fRef = 00E68291FEC88ED911DB9C8B /* index.html */; |
|
280 |
name = "index.html: 14"; |
|
281 |
rLen = 0; |
|
282 |
rLoc = 463; |
|
283 |
rType = 0; |
|
284 |
vrLen = 1046; |
|
285 |
vrLoc = 648; |
|
286 |
}; |
|
287 |
A30FC0CD0CBD7F2A000A16EC /* PBXTextBookmark */ = { |
|
288 |
isa = PBXTextBookmark; |
|
289 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
290 |
name = "Colonet.java: 156"; |
|
291 |
rLen = 0; |
|
292 |
rLoc = 4491; |
|
293 |
rType = 0; |
|
294 |
vrLen = 1648; |
|
295 |
vrLoc = 1744; |
|
296 |
}; |
|
297 |
A30FC0DF0CBD7F46000A16EC /* PBXTextBookmark */ = { |
|
298 |
isa = PBXTextBookmark; |
|
243 | 299 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
244 | 300 |
name = "ColonetServerInterface.java: 251"; |
245 | 301 |
rLen = 0; |
246 |
rLoc = 7130;
|
|
302 |
rLoc = 7000;
|
|
247 | 303 |
rType = 0; |
248 |
vrLen = 1072;
|
|
249 |
vrLoc = 9011;
|
|
304 |
vrLen = 566;
|
|
305 |
vrLoc = 9006;
|
|
250 | 306 |
}; |
251 |
A30FC0430CBBECA9000A16EC /* PBXTextBookmark */ = {
|
|
307 |
A30FC0E20CBD7F47000A16EC /* PBXTextBookmark */ = {
|
|
252 | 308 |
isa = PBXTextBookmark; |
309 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
310 |
name = "ColonetServerInterface.java: 251"; |
|
311 |
rLen = 0; |
|
312 |
rLoc = 7000; |
|
313 |
rType = 0; |
|
314 |
vrLen = 0; |
|
315 |
vrLoc = 0; |
|
316 |
}; |
|
317 |
A30FC0F60CBD822A000A16EC /* PBXTextBookmark */ = { |
|
318 |
isa = PBXTextBookmark; |
|
319 |
fRef = 00E68291FEC88ED911DB9C8B /* index.html */; |
|
320 |
name = "index.html: 25"; |
|
321 |
rLen = 0; |
|
322 |
rLoc = 774; |
|
323 |
rType = 0; |
|
324 |
vrLen = 726; |
|
325 |
vrLoc = 332; |
|
326 |
}; |
|
327 |
A30FC0F90CBD822A000A16EC /* PBXTextBookmark */ = { |
|
328 |
isa = PBXTextBookmark; |
|
329 |
fRef = 00E68291FEC88ED911DB9C8B /* index.html */; |
|
330 |
name = "index.html: 25"; |
|
331 |
rLen = 0; |
|
332 |
rLoc = 774; |
|
333 |
rType = 0; |
|
334 |
vrLen = 727; |
|
335 |
vrLoc = 332; |
|
336 |
}; |
|
337 |
A30FC0FA0CBD822A000A16EC /* PBXTextBookmark */ = { |
|
338 |
isa = PBXTextBookmark; |
|
339 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
340 |
name = "ColonetServerInterface.java: 251"; |
|
341 |
rLen = 0; |
|
342 |
rLoc = 7000; |
|
343 |
rType = 0; |
|
344 |
vrLen = 566; |
|
345 |
vrLoc = 9006; |
|
346 |
}; |
|
347 |
A30FC0FB0CBD822A000A16EC /* PBXTextBookmark */ = { |
|
348 |
isa = PBXTextBookmark; |
|
349 |
fRef = 00E68291FEC88ED911DB9C8B /* index.html */; |
|
350 |
name = "index.html: 25"; |
|
351 |
rLen = 0; |
|
352 |
rLoc = 774; |
|
353 |
rType = 0; |
|
354 |
vrLen = 726; |
|
355 |
vrLoc = 332; |
|
356 |
}; |
|
357 |
A30FC0FC0CBD822A000A16EC /* PBXTextBookmark */ = { |
|
358 |
isa = PBXTextBookmark; |
|
359 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
360 |
name = "ColonetServerInterface.java: 251"; |
|
361 |
rLen = 0; |
|
362 |
rLoc = 7000; |
|
363 |
rType = 0; |
|
364 |
vrLen = 1065; |
|
365 |
vrLoc = 8180; |
|
366 |
}; |
|
367 |
A30FC0FD0CBD822A000A16EC /* PBXTextBookmark */ = { |
|
368 |
isa = PBXTextBookmark; |
|
253 | 369 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
254 |
name = "Colonet.java: 98";
|
|
370 |
name = "Colonet.java: 877";
|
|
255 | 371 |
rLen = 0; |
256 |
rLoc = 2449;
|
|
372 |
rLoc = 24873;
|
|
257 | 373 |
rType = 0; |
258 |
vrLen = 1690;
|
|
259 |
vrLoc = 2383;
|
|
374 |
vrLen = 801;
|
|
375 |
vrLoc = 25210;
|
|
260 | 376 |
}; |
261 |
A30FC04E0CBBED0C000A16EC /* PBXTextBookmark */ = {
|
|
377 |
A30FC1070CBD82B8000A16EC /* PBXTextBookmark */ = {
|
|
262 | 378 |
isa = PBXTextBookmark; |
379 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
380 |
name = "ColonetServerInterface.java: 46"; |
|
381 |
rLen = 0; |
|
382 |
rLoc = 1117; |
|
383 |
rType = 0; |
|
384 |
vrLen = 1435; |
|
385 |
vrLoc = 556; |
|
386 |
}; |
|
387 |
A30FC1080CBD82B8000A16EC /* PBXTextBookmark */ = { |
|
388 |
isa = PBXTextBookmark; |
|
263 | 389 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
264 |
name = "Colonet.java: 301";
|
|
390 |
name = "Colonet.java: 570";
|
|
265 | 391 |
rLen = 0; |
266 |
rLoc = 10124;
|
|
392 |
rLoc = 17841;
|
|
267 | 393 |
rType = 0; |
268 |
vrLen = 1499;
|
|
269 |
vrLoc = 9227;
|
|
394 |
vrLen = 862;
|
|
395 |
vrLoc = 18149;
|
|
270 | 396 |
}; |
271 |
A30FC0550CBBED7B000A16EC /* PBXTextBookmark */ = {
|
|
397 |
A30FC1100CBD82D5000A16EC /* PBXTextBookmark */ = {
|
|
272 | 398 |
isa = PBXTextBookmark; |
399 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
400 |
name = "ColonetServerInterface.java: 358"; |
|
401 |
rLen = 0; |
|
402 |
rLoc = 9662; |
|
403 |
rType = 0; |
|
404 |
vrLen = 1082; |
|
405 |
vrLoc = 8084; |
|
406 |
}; |
|
407 |
A30FC11D0CBD83AE000A16EC /* PBXTextBookmark */ = { |
|
408 |
isa = PBXTextBookmark; |
|
273 | 409 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
274 |
name = "Colonet.java: 300";
|
|
410 |
name = "Colonet.java: 570";
|
|
275 | 411 |
rLen = 0; |
276 |
rLoc = 10124;
|
|
412 |
rLoc = 17841;
|
|
277 | 413 |
rType = 0; |
278 |
vrLen = 949;
|
|
279 |
vrLoc = 0;
|
|
414 |
vrLen = 1089;
|
|
415 |
vrLoc = 19572;
|
|
280 | 416 |
}; |
281 |
A30FC0560CBBED7B000A16EC /* PBXTextBookmark */ = {
|
|
417 |
A30FC11E0CBD83AE000A16EC /* PBXTextBookmark */ = {
|
|
282 | 418 |
isa = PBXTextBookmark; |
419 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
420 |
name = "ColonetServerInterface.java: 316"; |
|
421 |
rLen = 0; |
|
422 |
rLoc = 8651; |
|
423 |
rType = 0; |
|
424 |
vrLen = 1082; |
|
425 |
vrLoc = 8084; |
|
426 |
}; |
|
427 |
A30FC11F0CBD83AE000A16EC /* PBXTextBookmark */ = { |
|
428 |
isa = PBXTextBookmark; |
|
283 | 429 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
284 |
name = "Colonet.java: 300";
|
|
430 |
name = "Colonet.java: 823";
|
|
285 | 431 |
rLen = 0; |
286 |
rLoc = 10124;
|
|
432 |
rLoc = 23846;
|
|
287 | 433 |
rType = 0; |
434 |
vrLen = 756; |
|
435 |
vrLoc = 23908; |
|
436 |
}; |
|
437 |
A30FC1200CBD83AE000A16EC /* PBXTextBookmark */ = { |
|
438 |
isa = PBXTextBookmark; |
|
439 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
440 |
name = "ColonetServerInterface.java: 356"; |
|
441 |
rLen = 0; |
|
442 |
rLoc = 9487; |
|
443 |
rType = 0; |
|
444 |
vrLen = 1030; |
|
445 |
vrLoc = 6947; |
|
446 |
}; |
|
447 |
A30FC12A0CBD8520000A16EC /* PBXTextBookmark */ = { |
|
448 |
isa = PBXTextBookmark; |
|
449 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
450 |
name = "Colonet.java: 340"; |
|
451 |
rLen = 0; |
|
452 |
rLoc = 11218; |
|
453 |
rType = 0; |
|
454 |
vrLen = 1109; |
|
455 |
vrLoc = 10660; |
|
456 |
}; |
|
457 |
A30FC1320CBD8540000A16EC /* PBXTextBookmark */ = { |
|
458 |
isa = PBXTextBookmark; |
|
459 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
460 |
name = "ColonetServerInterface.java: 197"; |
|
461 |
rLen = 0; |
|
462 |
rLoc = 5519; |
|
463 |
rType = 0; |
|
464 |
vrLen = 917; |
|
465 |
vrLoc = 2939; |
|
466 |
}; |
|
467 |
A30FC13A0CBD8587000A16EC /* PBXTextBookmark */ = { |
|
468 |
isa = PBXTextBookmark; |
|
469 |
fRef = 00E68291FEC88ED911DB9C8B /* index.html */; |
|
470 |
name = "index.html: 24"; |
|
471 |
rLen = 0; |
|
472 |
rLoc = 757; |
|
473 |
rType = 0; |
|
288 | 474 |
vrLen = 0; |
289 | 475 |
vrLoc = 0; |
290 | 476 |
}; |
477 |
A30FC1540CBD8A7E000A16EC /* PBXTextBookmark */ = { |
|
478 |
isa = PBXTextBookmark; |
|
479 |
comments = "cannot find symbol"; |
|
480 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
481 |
rLen = 0; |
|
482 |
rLoc = 624; |
|
483 |
rType = 1; |
|
484 |
}; |
|
485 |
A30FC1660CBD954C000A16EC /* PBXTextBookmark */ = { |
|
486 |
isa = PBXTextBookmark; |
|
487 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
488 |
name = "Colonet.java: 976"; |
|
489 |
rLen = 0; |
|
490 |
rLoc = 26973; |
|
491 |
rType = 0; |
|
492 |
vrLen = 1038; |
|
493 |
vrLoc = 26833; |
|
494 |
}; |
|
495 |
A30FC1680CBD954C000A16EC /* PBXTextBookmark */ = { |
|
496 |
isa = PBXTextBookmark; |
|
497 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
498 |
name = "Colonet.java: 976"; |
|
499 |
rLen = 0; |
|
500 |
rLoc = 26973; |
|
501 |
rType = 0; |
|
502 |
vrLen = 1038; |
|
503 |
vrLoc = 26833; |
|
504 |
}; |
|
505 |
A30FC16D0CBD9569000A16EC /* PBXTextBookmark */ = { |
|
506 |
isa = PBXTextBookmark; |
|
507 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
508 |
name = "ColonetServerInterface.java: 235"; |
|
509 |
rLen = 0; |
|
510 |
rLoc = 6566; |
|
511 |
rType = 0; |
|
512 |
vrLen = 1163; |
|
513 |
vrLoc = 6046; |
|
514 |
}; |
|
515 |
A30FC16E0CBD9569000A16EC /* PBXTextBookmark */ = { |
|
516 |
isa = PBXTextBookmark; |
|
517 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
518 |
name = "ColonetServerInterface.java: 235"; |
|
519 |
rLen = 0; |
|
520 |
rLoc = 6566; |
|
521 |
rType = 0; |
|
522 |
vrLen = 1163; |
|
523 |
vrLoc = 6046; |
|
524 |
}; |
|
525 |
A30FC16F0CBD9569000A16EC /* PBXTextBookmark */ = { |
|
526 |
isa = PBXTextBookmark; |
|
527 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
528 |
name = "Colonet.java: 631"; |
|
529 |
rLen = 0; |
|
530 |
rLoc = 19421; |
|
531 |
rType = 0; |
|
532 |
vrLen = 562; |
|
533 |
vrLoc = 19318; |
|
534 |
}; |
|
535 |
A30FC17D0CBD9F95000A16EC /* PBXTextBookmark */ = { |
|
536 |
isa = PBXTextBookmark; |
|
537 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
538 |
name = "ColonetServerInterface.java: 234"; |
|
539 |
rLen = 0; |
|
540 |
rLoc = 6508; |
|
541 |
rType = 0; |
|
542 |
vrLen = 1122; |
|
543 |
vrLoc = 5882; |
|
544 |
}; |
|
545 |
A30FC17E0CBD9F95000A16EC /* PBXTextBookmark */ = { |
|
546 |
isa = PBXTextBookmark; |
|
547 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
548 |
name = "Colonet.java: 976"; |
|
549 |
rLen = 0; |
|
550 |
rLoc = 26973; |
|
551 |
rType = 0; |
|
552 |
vrLen = 1038; |
|
553 |
vrLoc = 26833; |
|
554 |
}; |
|
555 |
A30FC17F0CBD9F95000A16EC /* PBXTextBookmark */ = { |
|
556 |
isa = PBXTextBookmark; |
|
557 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
558 |
name = "ColonetServerInterface.java: 234"; |
|
559 |
rLen = 0; |
|
560 |
rLoc = 6508; |
|
561 |
rType = 0; |
|
562 |
vrLen = 1122; |
|
563 |
vrLoc = 5882; |
|
564 |
}; |
|
565 |
A30FC1800CBD9F95000A16EC /* PBXTextBookmark */ = { |
|
566 |
isa = PBXTextBookmark; |
|
567 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
568 |
name = "Colonet.java: 632"; |
|
569 |
rLen = 0; |
|
570 |
rLoc = 19421; |
|
571 |
rType = 0; |
|
572 |
vrLen = 1027; |
|
573 |
vrLoc = 19139; |
|
574 |
}; |
|
575 |
A30FC1840CBD9FAA000A16EC /* PBXTextBookmark */ = { |
|
576 |
isa = PBXTextBookmark; |
|
577 |
comments = "cannot find symbol"; |
|
578 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
579 |
rLen = 0; |
|
580 |
rLoc = 624; |
|
581 |
rType = 1; |
|
582 |
}; |
|
583 |
A30FC1850CBD9FAA000A16EC /* PBXTextBookmark */ = { |
|
584 |
isa = PBXTextBookmark; |
|
585 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
586 |
name = "Colonet.java: 631"; |
|
587 |
rLen = 0; |
|
588 |
rLoc = 19421; |
|
589 |
rType = 0; |
|
590 |
vrLen = 552; |
|
591 |
vrLoc = 19360; |
|
592 |
}; |
|
593 |
A30FC1860CBD9FAF000A16EC /* PBXTextBookmark */ = { |
|
594 |
isa = PBXTextBookmark; |
|
595 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
596 |
name = "Colonet.java: 631"; |
|
597 |
rLen = 0; |
|
598 |
rLoc = 19421; |
|
599 |
rType = 0; |
|
600 |
vrLen = 1090; |
|
601 |
vrLoc = 19186; |
|
602 |
}; |
|
603 |
A30FC18A0CBD9FAF000A16EC /* PBXTextBookmark */ = { |
|
604 |
isa = PBXTextBookmark; |
|
605 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
606 |
name = "Colonet.java: 631"; |
|
607 |
rLen = 0; |
|
608 |
rLoc = 19421; |
|
609 |
rType = 0; |
|
610 |
vrLen = 524; |
|
611 |
vrLoc = 19318; |
|
612 |
}; |
|
613 |
A30FC1920CBD9FF7000A16EC /* PBXTextBookmark */ = { |
|
614 |
isa = PBXTextBookmark; |
|
615 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
616 |
name = "Colonet.java: 631"; |
|
617 |
rLen = 0; |
|
618 |
rLoc = 19421; |
|
619 |
rType = 0; |
|
620 |
vrLen = 1097; |
|
621 |
vrLoc = 19186; |
|
622 |
}; |
|
623 |
A30FC1930CBD9FF7000A16EC /* PBXTextBookmark */ = { |
|
624 |
isa = PBXTextBookmark; |
|
625 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
626 |
name = "Colonet.java: 632"; |
|
627 |
rLen = 0; |
|
628 |
rLoc = 19421; |
|
629 |
rType = 0; |
|
630 |
vrLen = 566; |
|
631 |
vrLoc = 19318; |
|
632 |
}; |
|
291 | 633 |
A31266650C9B131A00D15EBF /* PBXTextBookmark */ = { |
292 | 634 |
isa = PBXTextBookmark; |
293 | 635 |
fRef = A34161820C989C090007BEF2 /* colonetstyle.css */; |
... | ... | |
298 | 640 |
vrLen = 397; |
299 | 641 |
vrLoc = 52; |
300 | 642 |
}; |
301 |
A31266690C9B131A00D15EBF /* PBXTextBookmark */ = { |
|
302 |
isa = PBXTextBookmark; |
|
303 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
304 |
name = "ColonetServerInterface.java: 45"; |
|
305 |
rLen = 0; |
|
306 |
rLoc = 1178; |
|
307 |
rType = 0; |
|
308 |
vrLen = 1381; |
|
309 |
vrLoc = 1300; |
|
310 |
}; |
|
311 | 643 |
A312666C0C9B131A00D15EBF /* PBXTextBookmark */ = { |
312 | 644 |
isa = PBXTextBookmark; |
313 | 645 |
fRef = A34161820C989C090007BEF2 /* colonetstyle.css */; |
... | ... | |
318 | 650 |
vrLen = 396; |
319 | 651 |
vrLoc = 53; |
320 | 652 |
}; |
321 |
A330E0560CA96CB400C8A074 /* PBXTextBookmark */ = { |
|
322 |
isa = PBXTextBookmark; |
|
323 |
fRef = 00E68290FEC88D7311DB9C8B /* Colonet.java */; |
|
324 |
name = "Colonet.java: 340"; |
|
325 |
rLen = 0; |
|
326 |
rLoc = 12806; |
|
327 |
rType = 0; |
|
328 |
vrLen = 790; |
|
329 |
vrLoc = 755; |
|
330 |
}; |
|
331 | 653 |
A341617E0C989B510007BEF2 /* Source Control */ = { |
332 | 654 |
isa = PBXSourceControlManager; |
333 | 655 |
fallbackIsa = XCSourceControlManager; |
... | ... | |
351 | 673 |
}; |
352 | 674 |
A34161900C989CB30007BEF2 /* ColonetServerInterface.java */ = { |
353 | 675 |
uiCtxt = { |
354 |
sepNavIntBoundsRect = "{{0, 0}, {1011, 5166}}";
|
|
355 |
sepNavSelRange = "{7130, 0}";
|
|
356 |
sepNavVisRect = "{{0, 4522}, {1011, 644}}";
|
|
676 |
sepNavIntBoundsRect = "{{0, 0}, {1011, 5138}}";
|
|
677 |
sepNavSelRange = "{6508, 0}";
|
|
678 |
sepNavVisRect = "{{0, 2939}, {1011, 548}}";
|
|
357 | 679 |
sepNavWindowFrame = "{{15, 56}, {651, 776}}"; |
358 | 680 |
}; |
359 | 681 |
}; |
360 |
A3A687270CB0429000478070 /* PBXTextBookmark */ = { |
|
361 |
isa = PBXTextBookmark; |
|
362 |
fRef = 00E68291FEC88ED911DB9C8B /* index_colonet.html */; |
|
363 |
name = "index_colonet.html: 12"; |
|
364 |
rLen = 0; |
|
365 |
rLoc = 415; |
|
366 |
rType = 0; |
|
367 |
vrLen = 1681; |
|
368 |
vrLoc = 0; |
|
369 |
}; |
|
370 | 682 |
A3D78BA80CB6E4FF00A79632 /* XCBreakpointsBucket */ = { |
371 | 683 |
isa = XCBreakpointsBucket; |
372 | 684 |
name = "Project Breakpoints"; |
373 | 685 |
objects = ( |
374 | 686 |
); |
375 | 687 |
}; |
376 |
A3D78CD10CB709FA00A79632 /* PBXTextBookmark */ = { |
|
377 |
isa = PBXTextBookmark; |
|
378 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
|
379 |
name = "ColonetServerInterface.java: 103"; |
|
380 |
rLen = 0; |
|
381 |
rLoc = 3199; |
|
382 |
rType = 0; |
|
383 |
vrLen = 533; |
|
384 |
vrLoc = 3514; |
|
385 |
}; |
|
386 | 688 |
A3D78E650CB72FF100A79632 /* PBXTextBookmark */ = { |
387 | 689 |
isa = PBXTextBookmark; |
388 | 690 |
fRef = A34161900C989CB30007BEF2 /* ColonetServerInterface.java */; |
389 | 691 |
name = "ColonetServerInterface.java: 251"; |
390 | 692 |
rLen = 0; |
391 |
rLoc = 7130;
|
|
693 |
rLoc = 7000;
|
|
392 | 694 |
rType = 0; |
393 |
vrLen = 1077;
|
|
695 |
vrLen = 959;
|
|
394 | 696 |
vrLoc = 9006; |
395 | 697 |
}; |
396 |
A3D78E860CB7316900A79632 /* PBXTextBookmark */ = { |
|
397 |
isa = PBXTextBookmark; |
|
398 |
fRef = 00E68291FEC88ED911DB9C8B /* index_colonet.html */; |
|
399 |
name = "index_colonet.html: 12"; |
|
400 |
rLen = 0; |
|
401 |
rLoc = 415; |
|
402 |
rType = 0; |
|
403 |
vrLen = 1270; |
|
404 |
vrLoc = 0; |
|
405 |
}; |
|
406 |
A3EE6A520C9B3CA800C5C56B /* PBXTextBookmark */ = { |
|
407 |
isa = PBXTextBookmark; |
|
408 |
fRef = 00E68291FEC88ED911DB9C8B /* index_colonet.html */; |
|
409 |
name = "index_colonet.html: 54"; |
|
410 |
rLen = 0; |
|
411 |
rLoc = 1515; |
|
412 |
rType = 0; |
|
413 |
vrLen = 1033; |
|
414 |
vrLoc = 0; |
|
415 |
}; |
|
416 | 698 |
} |
trunk/code/projects/colonet/ColonetGUI/Colonet.xcodeproj/gmtress.perspective | ||
---|---|---|
323 | 323 |
<key>_historyCapacity</key> |
324 | 324 |
<integer>0</integer> |
325 | 325 |
<key>bookmark</key> |
326 |
<string>A30FC0550CBBED7B000A16EC</string>
|
|
326 |
<string>A30FC1920CBD9FF7000A16EC</string>
|
|
327 | 327 |
<key>history</key> |
328 | 328 |
<array> |
329 | 329 |
<string>A31266650C9B131A00D15EBF</string> |
330 |
<string>A3D78E860CB7316900A79632</string>
|
|
331 |
<string>A30FBFA20CBBDC44000A16EC</string>
|
|
332 |
<string>A30FC0430CBBECA9000A16EC</string>
|
|
330 |
<string>A30FC0F60CBD822A000A16EC</string>
|
|
331 |
<string>A30FC17D0CBD9F95000A16EC</string>
|
|
332 |
<string>A30FC1850CBD9FAA000A16EC</string>
|
|
333 | 333 |
</array> |
334 | 334 |
<key>prevStack</key> |
335 | 335 |
<array> |
336 | 336 |
<string>A312666C0C9B131A00D15EBF</string> |
337 |
<string>A3EE6A520C9B3CA800C5C56B</string> |
|
338 | 337 |
<string>A3D78E650CB72FF100A79632</string> |
338 |
<string>A30FC0970CBD7DFA000A16EC</string> |
|
339 |
<string>A30FC0A60CBD7E05000A16EC</string> |
|
340 |
<string>A30FC17F0CBD9F95000A16EC</string> |
|
339 | 341 |
</array> |
340 | 342 |
</dict> |
341 | 343 |
<key>SplitCount</key> |
... | ... | |
349 | 351 |
<key>GeometryConfiguration</key> |
350 | 352 |
<dict> |
351 | 353 |
<key>Frame</key> |
352 |
<string>{{0, 0}, {1058, 676}}</string>
|
|
354 |
<string>{{0, 0}, {1058, 580}}</string>
|
|
353 | 355 |
<key>RubberWindowFrame</key> |
354 | 356 |
<string>0 111 1280 721 0 0 1280 832 </string> |
355 | 357 |
</dict> |
356 | 358 |
<key>Module</key> |
357 | 359 |
<string>PBXNavigatorGroup</string> |
358 | 360 |
<key>Proportion</key> |
359 |
<string>676pt</string>
|
|
361 |
<string>580pt</string>
|
|
360 | 362 |
</dict> |
361 | 363 |
<dict> |
362 | 364 |
<key>Proportion</key> |
363 |
<string>0pt</string>
|
|
365 |
<string>96pt</string>
|
|
364 | 366 |
<key>Tabs</key> |
365 | 367 |
<array> |
366 | 368 |
<dict> |
... | ... | |
374 | 376 |
<key>GeometryConfiguration</key> |
375 | 377 |
<dict> |
376 | 378 |
<key>Frame</key> |
377 |
<string>{{10, 27}, {1058, -27}}</string>
|
|
379 |
<string>{{10, 27}, {1058, 69}}</string>
|
|
378 | 380 |
<key>RubberWindowFrame</key> |
379 | 381 |
<string>0 111 1280 721 0 0 1280 832 </string> |
380 | 382 |
</dict> |
... | ... | |
435 | 437 |
</array> |
436 | 438 |
<key>TableOfContents</key> |
437 | 439 |
<array> |
438 |
<string>A30FC0390CBBEB6D000A16EC</string>
|
|
440 |
<string>A30FC1870CBD9FAF000A16EC</string>
|
|
439 | 441 |
<string>1CA23ED40692098700951B8B</string> |
440 |
<string>A30FC03A0CBBEB6D000A16EC</string>
|
|
442 |
<string>A30FC1880CBD9FAF000A16EC</string>
|
|
441 | 443 |
<string>A34161A50C989E610007BEF2</string> |
442 |
<string>A30FC03B0CBBEB6D000A16EC</string>
|
|
444 |
<string>A30FC1890CBD9FAF000A16EC</string>
|
|
443 | 445 |
<string>1CA23EDF0692099D00951B8B</string> |
444 | 446 |
<string>1CA23EE00692099D00951B8B</string> |
445 | 447 |
<string>1CA23EE10692099D00951B8B</string> |
... | ... | |
487 | 489 |
<dict> |
488 | 490 |
<key>PBXSmartGroupTreeModuleColumnWidthsKey</key> |
489 | 491 |
<array> |
490 |
<real>250</real>
|
|
492 |
<real>220</real>
|
|
491 | 493 |
</array> |
492 | 494 |
<key>PBXSmartGroupTreeModuleColumnsKey_v4</key> |
493 | 495 |
<array> |
... | ... | |
509 | 511 |
</array> |
510 | 512 |
</array> |
511 | 513 |
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> |
512 |
<string>{{0, 0}, {250, 662}}</string>
|
|
514 |
<string>{{0, 0}, {220, 662}}</string>
|
|
513 | 515 |
</dict> |
514 | 516 |
<key>PBXTopSmartGroupGIDs</key> |
515 | 517 |
<array/> |
... | ... | |
519 | 521 |
<key>GeometryConfiguration</key> |
520 | 522 |
<dict> |
521 | 523 |
<key>Frame</key> |
522 |
<string>{{0, 0}, {267, 680}}</string>
|
|
524 |
<string>{{0, 0}, {237, 680}}</string>
|
|
523 | 525 |
<key>GroupTreeTableConfiguration</key> |
524 | 526 |
<array> |
525 | 527 |
<string>MainColumn</string> |
526 |
<real>250</real>
|
|
528 |
<real>220</real>
|
|
527 | 529 |
</array> |
528 | 530 |
</dict> |
529 | 531 |
<key>Module</key> |
530 | 532 |
<string>PBXSmartGroupTreeModule</string> |
531 | 533 |
<key>Proportion</key> |
532 |
<string>267pt</string>
|
|
534 |
<string>237pt</string>
|
|
533 | 535 |
</dict> |
534 | 536 |
<dict> |
535 | 537 |
<key>Dock</key> |
... | ... | |
552 | 554 |
<key>_historyCapacity</key> |
553 | 555 |
<integer>0</integer> |
554 | 556 |
<key>bookmark</key> |
555 |
<string>A30FC0560CBBED7B000A16EC</string>
|
|
557 |
<string>A30FC1930CBD9FF7000A16EC</string>
|
|
556 | 558 |
<key>history</key> |
557 | 559 |
<array> |
558 | 560 |
<string>A31266650C9B131A00D15EBF</string> |
559 |
<string>A3A687270CB0429000478070</string>
|
|
560 |
<string>A3D78CD10CB709FA00A79632</string>
|
|
561 |
<string>A30FC04E0CBBED0C000A16EC</string>
|
|
561 |
<string>A30FC0E20CBD7F47000A16EC</string>
|
|
562 |
<string>A30FC13A0CBD8587000A16EC</string>
|
|
563 |
<string>A30FC1840CBD9FAA000A16EC</string>
|
|
562 | 564 |
</array> |
563 | 565 |
<key>prevStack</key> |
564 | 566 |
<array> |
565 |
<string>A31266690C9B131A00D15EBF</string> |
|
566 | 567 |
<string>A312666C0C9B131A00D15EBF</string> |
567 |
<string>A3EE6A520C9B3CA800C5C56B</string> |
|
568 |
<string>A330E0560CA96CB400C8A074</string> |
|
568 |
<string>A3D78E650CB72FF100A79632</string> |
|
569 |
<string>A30FC0970CBD7DFA000A16EC</string> |
|
570 |
<string>A30FC0A60CBD7E05000A16EC</string> |
|
569 | 571 |
</array> |
570 | 572 |
</dict> |
571 | 573 |
<key>SplitCount</key> |
... | ... | |
579 | 581 |
<key>GeometryConfiguration</key> |
580 | 582 |
<dict> |
581 | 583 |
<key>Frame</key> |
582 |
<string>{{0, 0}, {1008, 0}}</string>
|
|
584 |
<string>{{0, 0}, {1038, 337}}</string>
|
|
583 | 585 |
</dict> |
584 | 586 |
<key>Module</key> |
585 | 587 |
<string>PBXNavigatorGroup</string> |
586 | 588 |
<key>Proportion</key> |
587 |
<string>0pt</string>
|
|
589 |
<string>337pt</string>
|
|
588 | 590 |
</dict> |
589 | 591 |
<dict> |
590 | 592 |
<key>Proportion</key> |
591 |
<string>676pt</string>
|
|
593 |
<string>338pt</string>
|
|
592 | 594 |
<key>Tabs</key> |
593 | 595 |
<array> |
594 | 596 |
<dict> |
... | ... | |
606 | 608 |
<key>GeometryConfiguration</key> |
607 | 609 |
<dict> |
608 | 610 |
<key>Frame</key> |
609 |
<string>{{10, 27}, {0, -27}}</string>
|
|
611 |
<string>{{10, 27}, {1038, 311}}</string>
|
|
610 | 612 |
</dict> |
611 | 613 |
<key>Module</key> |
612 | 614 |
<string>PBXBuildResultsModule</string> |
... | ... | |
659 | 661 |
<key>GeometryConfiguration</key> |
660 | 662 |
<dict> |
661 | 663 |
<key>Frame</key> |
662 |
<string>{{10, 27}, {1008, 649}}</string>
|
|
664 |
<string>{{10, 27}, {0, -27}}</string>
|
|
663 | 665 |
</dict> |
664 | 666 |
<key>Module</key> |
665 | 667 |
<string>PBXRunSessionModule</string> |
... | ... | |
668 | 670 |
</dict> |
669 | 671 |
</array> |
670 | 672 |
<key>Proportion</key> |
671 |
<string>1008pt</string>
|
|
673 |
<string>1038pt</string>
|
|
672 | 674 |
</dict> |
673 | 675 |
</array> |
674 | 676 |
<key>Name</key> |
... | ... | |
686 | 688 |
</array> |
687 | 689 |
<key>TableOfContents</key> |
688 | 690 |
<array> |
689 |
<string>A30FC0470CBBECAC000A16EC</string>
|
|
691 |
<string>A30FC18B0CBD9FAF000A16EC</string>
|
|
690 | 692 |
<string>1CA23EE50692099D00951B8B</string> |
691 |
<string>A30FC0480CBBECAC000A16EC</string>
|
|
693 |
<string>A30FC18C0CBD9FAF000A16EC</string>
|
|
692 | 694 |
<string>A34161AC0C989F140007BEF2</string> |
693 |
<string>A30FC0490CBBECAC000A16EC</string>
|
|
695 |
<string>A30FC18D0CBD9FAF000A16EC</string>
|
|
694 | 696 |
<string>XCMainBuildResultsModuleGUID</string> |
695 | 697 |
<string>1CA23EE80692099D00951B8B</string> |
696 |
<string>A30FC04A0CBBECAC000A16EC</string>
|
|
698 |
<string>A30FC18E0CBD9FAF000A16EC</string>
|
|
697 | 699 |
</array> |
698 | 700 |
<key>ToolbarConfiguration</key> |
699 | 701 |
<string>xcode.toolbar.config.buildAndRun</string> |
... | ... | |
824 | 826 |
</array> |
825 | 827 |
<key>TableOfContents</key> |
826 | 828 |
<array> |
827 |
<string>A3D78B860CB6E3B100A79632</string>
|
|
829 |
<string>A30FC0D20CBD7F2B000A16EC</string>
|
|
828 | 830 |
<string>1CCC7628064C1048000F2A68</string> |
829 | 831 |
<string>1CCC7629064C1048000F2A68</string> |
830 |
<string>A3D78B870CB6E3B100A79632</string>
|
|
831 |
<string>A3D78B880CB6E3B100A79632</string>
|
|
832 |
<string>A3D78B890CB6E3B100A79632</string>
|
|
833 |
<string>A3D78B8A0CB6E3B100A79632</string>
|
|
834 |
<string>A34161AC0C989F140007BEF2</string>
|
|
835 |
<string>A3D78B8B0CB6E3B100A79632</string>
|
|
832 |
<string>A30FC0D30CBD7F2B000A16EC</string>
|
|
833 |
<string>A30FC0D40CBD7F2B000A16EC</string>
|
|
834 |
<string>A30FC0D50CBD7F2B000A16EC</string>
|
|
835 |
<string>A30FC0D60CBD7F2B000A16EC</string>
|
|
836 |
<string>A30FC0C60CBD7E7F000A16EC</string>
|
|
837 |
<string>A30FC0D70CBD7F2B000A16EC</string>
|
|
836 | 838 |
</array> |
837 | 839 |
<key>ToolbarConfiguration</key> |
838 | 840 |
<string>xcode.toolbar.config.debug</string> |
... | ... | |
861 | 863 |
<key>WindowJustification</key> |
862 | 864 |
<integer>5</integer> |
863 | 865 |
<key>WindowOrderList</key> |
864 |
<array> |
|
865 |
<string>/Users/gmtress/Documents/Colony/roboclub_repository/colony/trunk/code/projects/colonet/ColonetGUI/Colonet.xcodeproj</string> |
|
866 |
</array> |
|
866 |
<array/> |
|
867 | 867 |
<key>WindowString</key> |
868 | 868 |
<string>0 111 1280 721 0 0 1280 832 </string> |
869 | 869 |
<key>WindowTools</key> |
trunk/code/projects/colonet/ColonetGUI/Colonet.java | ||
---|---|---|
14 | 14 |
|
15 | 15 |
public class Colonet extends JApplet implements ActionListener, MouseInputListener, Runnable { |
16 | 16 |
|
17 |
final int CANVAS_SIZE = 500; //don't make this too large, or the applet will be slow.
|
|
17 |
final int CANVAS_SIZE = 500; //the applet may be slow if the canvas gets too large
|
|
18 | 18 |
final int BUFFER = 50; |
19 | 19 |
final int RADIUS = 30; |
20 | 20 |
|
... | ... | |
95 | 95 |
public void init () { |
96 | 96 |
// set the default look and feel - choose one |
97 | 97 |
//String laf = UIManager.getSystemLookAndFeelClassName(); |
98 |
//String laf = UIManager.getCrossPlatformLookAndFeelClassName();
|
|
99 |
String laf = "com.sun.java.swing.plaf.motif.MotifLookAndFeel"; |
|
98 |
String laf = UIManager.getCrossPlatformLookAndFeelClassName(); |
|
99 |
//String laf = "com.sun.java.swing.plaf.motif.MotifLookAndFeel";
|
|
100 | 100 |
try { |
101 | 101 |
UIManager.setLookAndFeel(laf); |
102 | 102 |
} catch (UnsupportedLookAndFeelException exc) { |
... | ... | |
153 | 153 |
txtInfo.setBorder(BorderFactory.createTitledBorder("Info")); |
154 | 154 |
txtInfo.setEditable(false); |
155 | 155 |
btnGraph = new JButton("Run"); |
156 |
txtHost = new JTextField("roboclub1.frc.ri.cmu.edu");
|
|
156 |
txtHost = new JTextField("roboclub9.frc.ri.cmu.edu");
|
|
157 | 157 |
txtHost.setBorder(BorderFactory.createTitledBorder("Host")); |
158 | 158 |
txtPort = new JTextField("10123"); |
159 | 159 |
txtPort.setBorder(BorderFactory.createTitledBorder("Port")); |
... | ... | |
327 | 327 |
Object source = e.getSource(); |
328 | 328 |
if (source == btnGraph) { |
329 | 329 |
btnGraph.setEnabled(false); |
330 |
lblConnectionStatus.setText("Simulating"); |
|
331 |
//create sample matrix and xbee map |
|
332 |
parseMatrix(ColonetServerInterface.RESPONSE_TO_CLIENT_REQUEST + " " + |
|
333 |
ColonetServerInterface.REQUEST_BOM_MATRIX + |
|
334 |
" 5 -1 9 3 -1 1 -1 -1 -1 5 -1 4 -1 -1 -1 2 -1 -1 -1 -1 -1 1 -1 -1 3 -1"); |
|
335 |
parseXBeeIDs(ColonetServerInterface.RESPONSE_TO_CLIENT_REQUEST + " " + |
|
336 |
ColonetServerInterface.REQUEST_XBEE_IDS + |
|
337 |
" 5 12345 76543 98786 87690 2"); |
|
338 | 330 |
//Start dependent threads |
339 | 331 |
drawThread = new Thread(this, "drawThread"); |
340 | 332 |
drawThread.start(); |
... | ... | |
342 | 334 |
packetMonitor.start(); |
343 | 335 |
simulator.start(); |
344 | 336 |
} else if (source == btnConnect) { |
345 |
doSocket();
|
|
337 |
csi.connect(txtHost.getText(), txtPort.getText());
|
|
346 | 338 |
dataUpdater = new DataUpdater(); |
347 | 339 |
dataUpdater.start(); |
348 | 340 |
} |
349 |
|
|
350 | 341 |
// Robot Movement Controls |
351 | 342 |
else if (source == btnF) { |
352 | 343 |
vectorController.setMaxForward(); |
... | ... | |
403 | 394 |
txtMatrix.setText(s.toString()); |
404 | 395 |
} |
405 | 396 |
|
406 |
private void doSocket () { |
|
407 |
csi.connect(txtHost.getText(), txtPort.getText()); |
|
408 |
} |
|
409 |
|
|
410 | 397 |
public void drawRobot (int id, int x, int y) { |
411 | 398 |
//save the bot in memory, so we can tell if we click on it later |
412 | 399 |
botRect[id] = new Rectangle(x-RADIUS, y-RADIUS, 2*RADIUS, 2*RADIUS); |
... | ... | |
592 | 579 |
} |
593 | 580 |
|
594 | 581 |
public void parseXBeeIDs (String line) { |
595 |
log.append("Got XBee ID map: " + line + "\n"); |
|
596 | 582 |
String [] str = line.split(" "); |
597 | 583 |
int num = Integer.parseInt(str[2]); |
598 | 584 |
xbeeID = new int[num]; |
... | ... | |
609 | 595 |
// |
610 | 596 |
// MouseEvent methods |
611 | 597 |
// |
612 |
public void mouseExited(MouseEvent e) {} |
|
613 |
public void mouseEntered(MouseEvent e) {} |
|
598 |
public void mouseExited(MouseEvent e) { |
|
599 |
} |
|
600 |
public void mouseEntered(MouseEvent e) { |
|
601 |
} |
|
614 | 602 |
public void mouseReleased(MouseEvent e) { |
615 | 603 |
vectorController.sendToServer(); |
616 | 604 |
} |
... | ... | |
632 | 620 |
vectorController.setPoint(e.getX(), e.getY()); |
633 | 621 |
vectorController.repaint(); |
634 | 622 |
} |
635 |
public void mouseMoved(MouseEvent e) {} |
|
623 |
public void mouseMoved(MouseEvent e) { |
|
624 |
} |
|
636 | 625 |
|
637 | 626 |
|
638 | 627 |
/* |
... | ... | |
647 | 636 |
private class SelectionIndicator extends Thread { |
648 | 637 |
|
649 | 638 |
final int INDICATOR_DELAY = 100; |
650 |
final double DTHETA = 0.3; //larger values make the marker rotate faster
|
|
639 |
final double DTHETA = 0.4; //larger values make the marker rotate faster
|
|
651 | 640 |
Graphics2D g; //canvas to draw on |
652 | 641 |
boolean running; |
653 | 642 |
|
... | ... | |
820 | 809 |
} |
821 | 810 |
|
822 | 811 |
private void step () { |
823 |
// simulate passing the token |
|
824 |
moveToken(); |
|
812 |
// don't do anything! the colonet should work on its own! |
|
825 | 813 |
} |
826 | 814 |
|
827 | 815 |
} |
... | ... | |
874 | 862 |
* |
875 | 863 |
*/ |
876 | 864 |
class DataUpdater extends Thread { |
877 |
final int DATAUPDATER_DELAY = 1100;
|
|
865 |
final int DATAUPDATER_DELAY = 5000;
|
|
878 | 866 |
|
879 | 867 |
public DataUpdater () { |
880 | 868 |
super("Colonet DataUpdater"); |
... | ... | |
966 | 954 |
return v; |
967 | 955 |
} |
968 | 956 |
|
969 |
public double getAngle () {
|
|
957 |
public int getAngle () {
|
|
970 | 958 |
int dx = x - cx; |
971 | 959 |
int dy = cy - y; |
972 | 960 |
double theta = Math.atan2(Math.abs(dx), Math.abs(dy)); |
... | ... | |
974 | 962 |
if (dy < 0) |
975 | 963 |
theta = 180 - theta; |
976 | 964 |
theta *= Math.signum(dx); |
977 |
return theta; |
|
965 |
return (int) theta;
|
|
978 | 966 |
} |
979 | 967 |
|
980 | 968 |
public void paint (Graphics g) { |
trunk/code/projects/colonet/ColonetGUI/ColonetServerInterface.java | ||
---|---|---|
43 | 43 |
public static final String REQUEST_FROM_SERVER = "1"; |
44 | 44 |
public static final String RESPONSE_TO_CLIENT_REQUEST = "2"; |
45 | 45 |
public static final String REQUEST_BOM_MATRIX = "144"; |
46 |
public static final String REQUEST_XBEE_IDS = "144";
|
|
46 |
public static final String REQUEST_XBEE_IDS = "145";
|
|
47 | 47 |
|
48 | 48 |
public static final String COLONET_COMMAND = "13"; //0x0D |
49 | 49 |
public static final String COLONET_REQUEST = "14"; //0x0E |
... | ... | |
176 | 176 |
} |
177 | 177 |
|
178 | 178 |
try { |
179 |
log.append("Attempting to connect to " + strHost + "\n"); |
|
180 | 179 |
socket = new Socket(strHost, port); |
181 | 180 |
} catch (UnknownHostException e) { |
182 | 181 |
log.append("Unknown host exception.\n"); |
... | ... | |
196 | 195 |
log.append("Connection is not ready. Try connecting again."); |
197 | 196 |
return; |
198 | 197 |
} |
199 |
log.append("Connected to " + strHost + " on port " + port + "\n"); |
|
200 | 198 |
try { |
201 | 199 |
out = new OutputStreamWriter(socket.getOutputStream()); |
202 | 200 |
reader = new BufferedReader(new InputStreamReader(socket.getInputStream())); |
... | ... | |
353 | 351 |
} |
354 | 352 |
|
355 | 353 |
public void parseData (String line) { |
356 |
log.append("Incoming data: [" + line + "]\n"); |
|
354 |
//log.append("Incoming data: [" + line + "]\n");
|
|
357 | 355 |
if (line.startsWith(ColonetServerInterface.RESPONSE_TO_CLIENT_REQUEST + " " + |
358 | 356 |
ColonetServerInterface.REQUEST_BOM_MATRIX)) |
359 | 357 |
colonet.parseMatrix(line); |
360 |
if (line.startsWith(ColonetServerInterface.COLONET_QUEUE)) |
|
358 |
else if (line.startsWith(ColonetServerInterface.COLONET_QUEUE))
|
|
361 | 359 |
colonet.parseQueue(line); |
362 |
if (line.startsWith(ColonetServerInterface.RESPONSE_TO_CLIENT_REQUEST + " " + |
|
360 |
else if (line.startsWith(ColonetServerInterface.RESPONSE_TO_CLIENT_REQUEST + " " +
|
|
363 | 361 |
ColonetServerInterface.REQUEST_XBEE_IDS)) |
364 | 362 |
colonet.parseXBeeIDs(line); |
365 | 363 |
} |
Also available in: Unified diff