Changeset 810


Ignore:
Timestamp:
02/03/14 12:20:27 (10 years ago)
Author:
csl14
Message:

Updated Exploratory Search overlays to work with new anchoring.

Location:
trunk/src/org/expeditee
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/expeditee/actions/ExploratorySearchActions.java

    r798 r810  
    111111                // Clear new frame and add active overlay and @old
    112112                frame.removeAllItems(frame.getItems());
    113                 Text t = (Text) frame.addText(1100, 50, "@ao: 2", null, "overlayset2");
     113                Text t = (Text) frame.addText(1100, 50, "@ao: 2", null, "overlayset3");
    114114                t.setAnchorLeft(1087.0f);
    115115                t = (Text) frame.addText(1100, 20, "@old", null);
     
    119119        }
    120120       
    121         /**
    122          * Halves the width of any JfxBrowser widget.
    123          */
    124 //      public static void halfBrowser() {
    125 //              for(Item i : DisplayIO.getCurrentFrame().getAllItems()) {
    126 //                      if(i instanceof InteractiveWidget)
    127 //              }
    128 //      }
    129        
    130121}
  • trunk/src/org/expeditee/assets/resources/framesets/exploratorysearch/1.exp

    r791 r810  
    1 V 118
     1V 128
    22U csl14A
    33D 12Dec2013[10:07]
    44M csl14A
    5 d 30Jan2014[14:48]
     5d 03Feb2014[12:04]
    66Z
    77
     
    1212P 50 490
    1313T @old
    14 F exploratorysearch-old1
     14F exploratorysearch-old17
    1515Q 0
    1616o csl14A
     
    2727d 50 50 50 100
    2828R 37.0
    29 P 50 700
     29P 50 615
    3030T @ao: 2
    3131F overlayset1
     
    4545Z
    4646
    47 ActiveTime:00:39:08
     47ActiveTime:00:40:37
    4848DarkTime:00:46:25
     4904:02:324 350 64 Rd
     5004:02:387 350 64 Ru
     5104:02:675 715 385 Md
     5204:02:747 715 385 Mu
     5304:02:948 618 297 Rd
     5404:02:953 618 297 Md
     5504:05:345 524 501 kF9
     5604:05:857 524 501 kF9
     5704:08:827 78 610 Ld
     5804:08:891 78 610 Lu
  • trunk/src/org/expeditee/assets/resources/framesets/overlayset/1.exp

    r798 r810  
    1 V 123
     1V 140
    22U csl14A
    33D 12Dec2013[10:13]
    44M csl14A
    5 d 31Jan2014[15:49]
     5d 03Feb2014[12:15]
    66Z
    77
     
    3737d 0 0 0 100
    3838R -2.0
     39N -41.0
    3940P 0 30
    4041T Exploratory
    41 T Search:
     42T Search
    4243Q 0
    4344o csl14A
     
    5556d 100 0 0 100
    5657R 140.0
     58N 70.0
    5759P 140 70
    5860Q 0
     
    6769d 100 0 0 100
    6870R 0.0
     71N 70.0
    6972P 0 70
    7073Q 0
     
    7881s 12Dec2013[10:14.00]
    7982R 7.0
     83N 72.0
    8084P 20 100
    8185T Go Browsing
     
    9397s 12Dec2013[10:14.00]
    9498R 7.0
     99N 102.0
    95100P 20 130
    96101T New Mindmap
     
    109114d 100 0 0 100
    110115R 0.0
     116N 500.0
    111117P 0 500
    112118Q 0
     
    121127d 100 0 0 100
    122128R 140.0
     129N 500.0
    123130P 140 500
    124131Q 0
     
    133140d 50 50 50 100
    134141R 50.0
    135 P 52 514
     142N 486.0
     143P 52 518
    136144T @i: home.png 36
    137145X GoToHome
     
    151159d 50 50 50 100
    152160R 11.0
    153 P 13 518
     161N 490.0
     162P 13 522
    154163T @i: leftArrow.png 32
    155164X Back
     
    168177d 50 50 50 100
    169178R 94.0
    170 P 96 518
     179N 490.0
     180P 96 522
    171181T @i: rightArrow.png 32
    172182X Forward
     
    183193S T 460
    184194s 13Dec2013[14:33.39]
    185 R 38.0
    186 P 40 575
     195R 41.0
     196N 537.0
     197P 43 575
    187198T HELP
    188199F Documentation1
     
    202213d 100 0 0 100
    203214R 0.0
     215N 590.0
    204216P 0 590
    205217Q 0
     
    213225d 100 0 0 100
    214226R 140.0
     227N 590.0
    215228P 140 590
    216229Q 0
     
    225238d 50 50 50 100
    226239R 38.0
    227 P 40 611
     240N 582.0
     241P 40 646
    228242T @i: es.png 64
    229243x F
     
    240254s 12Dec2013[10:14.00]
    241255d 100 0 0 100
     256R 140.0
    242257I -11.0
    243258P 140 882
     
    253268s 12Dec2013[10:14.00]
    254269d 100 0 0 100
     270R 0.0
    255271I -11.0
    256272P 0 882
     
    374390Z
    375391
    376 ActiveTime:00:46:25
    377 DarkTime:00:19:19
    378 46:53:961 417 728 kShift
    379 46:54:304 417 728 kA
    380 46:54:504 430 728 kN
    381 46:55:392 439 728 kC
    382 46:55:520 447 728 kH
    383 46:55:768 456 728 kO
    384 46:55:888 465 728 kR
    385 46:56:456 471 728 kShift
    386 46:56:872 471 728 kSemicolon
    387 46:59:768 476 728 kBackspace
    388 47:00:040 471 728 kShift
    389 47:00:539 471 728 kShift
    390 47:00:572 471 728 kShift
    391 47:00:605 471 728 kShift
    392 47:00:638 471 728 kShift
    393 47:00:671 471 728 kShift
    394 47:00:704 471 728 kShift
    395 47:00:737 471 728 kShift
    396 47:00:770 471 728 kShift
    397 47:00:803 471 728 kShift
    398 47:00:836 471 728 kShift
    399 47:00:869 471 728 kShift
    400 47:00:902 471 728 kShift
    401 47:00:935 471 728 kShift
    402 47:00:968 471 728 kShift
    403 47:01:001 471 728 kShift
    404 47:01:034 471 728 kShift
    405 47:01:067 471 728 kShift
    406 47:01:100 471 728 kShift
    407 47:01:133 471 728 kShift
    408 47:01:166 471 728 kShift
    409 47:01:199 471 728 kShift
    410 47:01:953 471 728 kShift
    411 47:02:345 471 728 kL
    412 47:02:568 482 728 kE
    413 47:02:704 490 728 kF
    414 47:02:777 496 728 kT
    415 47:03:057 501 728 kShift
    416 47:03:424 501 728 kSemicolon
    417 47:05:371 4 605 Rd
    418 47:05:378 4 605 Ld
    419 47:06:371 203 606 Md
    420 47:06:378 203 606 Rd
    421 47:07:283 139 603 Ld
    422 47:07:290 139 603 Rd
    423 47:08:507 201 592 Rd
    424 47:08:530 201 592 Md
    425 47:09:842 450 721 Rd
    426 47:09:914 450 721 Ru
    427 47:11:434 1 603 Md
    428 47:11:483 1 603 Mu
    429 47:12:747 482 724 Rd
    430 47:12:827 482 724 Ru
    431 47:14:139 142 603 Md
    432 47:14:227 142 603 Mu
    433 47:14:777 425 653 kShift
    434 47:15:097 425 653 kA
    435 47:15:345 438 653 kN
    436 47:15:529 447 653 kC
    437 47:15:809 455 653 kH
    438 47:15:993 464 653 kO
    439 47:16:136 473 653 kR
    440 47:16:721 479 653 kShift
    441 47:17:145 479 653 kB
    442 47:17:457 491 653 kO
    443 47:17:649 500 653 kT
    444 47:17:808 505 653 kT
    445 47:17:896 510 653 kO
    446 47:18:032 519 653 kM
    447 47:18:504 533 653 kShift
    448 47:18:752 533 653 kSemicolon
    449 47:18:864 538 653 kSpace
    450 47:19:640 542 653 kMinus
    451 47:19:984 548 653 k1
    452 47:20:112 557 653 k1
    453 47:21:243 490 645 Rd
    454 47:21:322 490 644 Ru
    455 47:22:868 0 602 Md
    456 47:22:955 0 602 Mu
    457 47:27:297 483 679 kShift
    458 47:27:609 482 680 kA
    459 47:27:937 495 680 kN
    460 47:28:153 504 680 kC
    461 47:28:257 512 680 kH
    462 47:28:473 521 680 kO
    463 47:28:601 530 680 kR
    464 47:29:025 536 680 kShift
    465 47:29:249 536 680 kB
    466 47:29:641 548 680 kO
    467 47:29:769 557 680 kT
    468 47:29:921 562 680 kT
    469 47:30:033 567 680 kO
    470 47:30:209 576 680 kM
    471 47:30:425 590 680 kShift
    472 47:30:745 590 680 kSemicolon
    473 47:32:332 562 679 Rd
    474 47:32:388 562 679 Ru
    475 47:33:933 1 880 Md
    476 47:34:053 1 880 Mu
    477 47:37:828 3 281 Rd
    478 47:37:843 3 281 Ld
    479 47:41:019 340 283 Rd
    480 47:41:067 340 283 Md
    481 47:41:474 496 386 kShift
    482 47:41:938 496 386 kP
    483 47:42:114 506 386 kO
    484 47:42:226 515 386 kS
    485 47:42:706 522 386 kI
    486 47:42:842 527 386 kT
    487 47:42:938 532 386 kI
    488 47:42:994 537 386 kO
    489 47:43:186 546 386 kN
    490 47:43:394 555 386 kShift
    491 47:43:874 555 386 kSemicolon
    492 47:44:074 560 386 kSpace
    493 47:44:194 565 386 k0
    494 47:44:330 574 386 k0
    495 47:45:274 583 386 kBackspace
    496 47:45:353 574 386 kSpace
    497 47:45:546 578 386 k0
    498 47:46:700 534 382 Rd
    499 47:46:756 534 382 Ru
    500 47:47:813 4 282 Md
    501 47:47:893 4 282 Mu
    502 47:51:299 469 652 Rd
    503 47:51:363 469 652 Ru
    504 47:53:022 0 877 Md
    505 47:53:126 0 877 Mu
    506 47:54:140 468 649 Rd
    507 47:54:228 468 649 Ru
    508 47:56:132 140 879 Md
    509 47:56:252 140 879 Mu
    510 47:57:538 846 625 kF9
    511 47:58:410 790 617 kF9
    512 47:58:890 790 617 kF9
    513 47:59:466 790 617 kF9
    514 48:01:450 790 617 kF9
    515 48:01:907 790 617 kF9
    516 48:03:547 652 513 kShift
    517 48:03:835 652 513 kA
    518 48:04:098 665 513 kN
    519 48:04:306 674 513 kC
    520 48:04:466 682 513 kH
    521 48:04:906 691 513 kO
    522 48:05:026 700 513 kR
    523 48:05:354 706 513 kShift
    524 48:05:618 706 513 kT
    525 48:05:770 717 513 kO
    526 48:05:874 726 513 kP
    527 48:06:298 735 513 kShift
    528 48:06:554 735 513 kSemicolon
    529 48:06:658 740 513 kSpace
    530 48:07:282 744 513 k0
    531 48:08:501 712 508 Rd
    532 48:08:548 712 508 Ru
    533 48:09:750 2 2 Md
    534 48:09:854 2 2 Mu
    535 48:10:874 689 229 kF9
    536 48:11:643 691 243 kF9
    537 48:12:685 704 504 Rd
    538 48:12:752 701 504 Ru
    539 48:14:459 775 256 kF9
    540 48:15:107 812 261 kF9
    541 48:16:742 139 0 Md
    542 48:16:854 139 0 Mu
    543 48:17:467 812 249 kF9
    544 48:18:123 866 252 kF9
    545 48:21:458 486 61 kF9
    546 48:22:611 424 167 kF9
    547 48:24:643 955 253 kF9
    548 48:25:523 939 290 kF9
    549 48:26:541 352 313 Rd
    550 48:27:629 290 300 Rd
    551 48:27:669 290 300 Ru
    552 48:28:125 870 813 Md
    553 48:28:216 864 810 Mu
    554 48:28:622 782 710 Rd
    555 48:28:638 782 710 Md
    556 48:29:251 797 694 kF9
    557 48:29:899 840 677 kF9
    558 49:10:295 821 557 Ld
    559 49:11:783 657 625 Ld
    560 49:11:871 657 625 Lu
     392ActiveTime:01:07:21
     393DarkTime:00:20:24
     39415:26:102 884 700 kF9
     39515:26:613 884 700 kF9
     39615:27:088 884 700 Ld
     39715:27:159 884 700 Lu
  • trunk/src/org/expeditee/assets/resources/framesets/overlayset/2.exp

    r798 r810  
    1 V 126
     1V 139
    22U csl14A
    33D 12Dec2013[10:14]
    44M csl14A
    5 d 31Jan2014[15:49]
     5d 03Feb2014[12:15]
    66Z
    77
     
    1010d 100 0 0 100
    1111R 0.0
     12N 0.0
    1213P 0 0
    1314Q 0
     
    2223d 100 0 0 100
    2324H -11.0
    24 P 1204 0
     25N 0.0
     26P 1679 0
    2527Q 0
    2628o csl14A
     
    3436d 100 0 0 100
    3537R 140.0
     38N 0.0
    3639P 140 0
    3740Q 0
     
    4649d 100 0 0 100
    4750R 484.0
     51N 0.0
    4852P 484 0
    4953Q 0
     
    5862d 100 0 0 100
    5963R 765.0
     64N 0.0
    6065P 765 0
    6166Q 0
     
    6974s 12Dec2013[10:14.45]
    7075R 498.0
     76N -8.0
    7177P 500 20
    7278T Actions:
     
    8389s 12Dec2013[10:14.45]
    8490R 148.0
     91N -8.0
    8592P 150 20
    8693T Commands:
     
    98105d 0 0 0 100
    99106R 358.0
     107N -1.0
    100108P 360 21
    101109T [drop onto browser]
     
    108116m 0.0
    109117h -1.0
     118
     119S P 1346
     120s 12Dec2013[10:14.45]
     121d 100 0 0 100
     122R 236.0
     123N 25.0
     124P 236 25
     125e 100 59 100 100
     126Q 0
     127o csl14A
     128v S
     129h 2.0
     130l 1350
     131
     132S P 1347
     133s 12Dec2013[10:14.45]
     134d 100 0 0 100
     135R 150.0
     136N 25.0
     137P 150 25
     138e 100 59 100 100
     139Q 0
     140o csl14A
     141v S
     142h 2.0
     143l 1350
     144
     145S P 1348
     146s 12Dec2013[10:14.45]
     147d 100 0 0 100
     148R 500.0
     149N 25.0
     150P 500 25
     151e 100 59 100 100
     152Q 0
     153o csl14A
     154v S
     155h 2.0
     156l 1351
     157
     158S P 1349
     159s 12Dec2013[10:14.45]
     160d 100 0 0 100
     161R 560.0
     162N 25.0
     163P 560 25
     164e 100 59 100 100
     165Q 0
     166o csl14A
     167v S
     168h 2.0
     169l 1351
    110170
    111171S T 1420
     
    113173d 50 50 50 100
    114174H 45.0
    115 P 1035 22
     175N -6.0
     176P 1510 26
    116177T @i: home.png 36
    117178X GoToHome
     
    126187w 974
    127188h -1.0
    128 
    129 S P 1346
    130 s 12Dec2013[10:14.45]
    131 d 100 0 0 100
    132 R 236.0
    133 P 236 25
    134 e 100 59 100 100
    135 Q 0
    136 o csl14A
    137 v S
    138 h 2.0
    139 l 1350
    140 
    141 S P 1347
    142 s 12Dec2013[10:14.45]
    143 d 100 0 0 100
    144 R 150.0
    145 P 150 25
    146 e 100 59 100 100
    147 Q 0
    148 o csl14A
    149 v S
    150 h 2.0
    151 l 1350
    152 
    153 S P 1348
    154 s 12Dec2013[10:14.45]
    155 d 100 0 0 100
    156 R 500.0
    157 P 500 25
    158 e 100 59 100 100
    159 Q 0
    160 o csl14A
    161 v S
    162 h 2.0
    163 l 1351
    164 
    165 S P 1349
    166 s 12Dec2013[10:14.45]
    167 d 100 0 0 100
    168 R 560.0
    169 P 560 25
    170 e 100 59 100 100
    171 Q 0
    172 o csl14A
    173 v S
    174 h 2.0
    175 l 1351
    176189
    177190S T 1478
     
    179192d 50 50 50 100
    180193H -37.0
    181 P 1082 25
     194N -3.0
     195P 1557 29
    182196T @i: rightArrow.png 32
    183197X Forward
     
    196210d 50 50 50 100
    197211H 60.0
    198 P 994 25
     212N -3.0
     213P 1469 29
    199214T @i: leftArrow.png 32
    200215X Back
     
    213228d 0 0 0 100
    214229R -2.0
     230N -41.0
    215231P 0 30
    216232T Web
     
    230246s 12Dec2013[10:14.45]
    231247R 489.0
     248N -9.0
    232249P 502 41
    233250T Give me a
     
    246263s 12Dec2013[10:14.45]
    247264R 597.0
     265N -9.0
    248266P 610 41
    249267T Drop url here to get
     
    262280s 12Dec2013[10:14.45]
    263281R 238.0
     282N 17.0
    264283P 240 43
    265284T www.example.com
     
    276295s 18Dec2013[15:23.32]
    277296H 10.0
    278 P 1134 50
     297N 17.0
     298P 1609 55
    279299T HELP
    280300F Documentation1
     
    289309h -1.0
    290310
    291 S T 1359
    292 s 12Dec2013[10:14.45]
    293 R 164.0
    294 P 166 63
    295 T back
    296 Q 0
    297 o csl14A
    298 v S
    299 f Roboto Condensed_r16
    300 t -1.0
    301 b 0.0
    302 m 0.0
    303 h -1.0
    304 
    305311S T 1360
    306312s 12Dec2013[10:14.45]
    307313R 230.0
     314N 37.0
    308315P 232 63
    309316T forward
     
    320327s 12Dec2013[10:14.45]
    321328R 310.0
     329N 37.0
    322330P 312 63
    323331T refresh
     
    334342s 13Dec2013[15:28.40]
    335343R 386.0
     344N 37.0
    336345P 388 63
    337346T convert
     
    345354h -1.0
    346355
     356S T 1359
     357s 12Dec2013[10:14.45]
     358R 164.0
     359N 37.0
     360P 166 63
     361T back
     362Q 0
     363o csl14A
     364v S
     365f Roboto Condensed_r16
     366t -1.0
     367b 0.0
     368m 0.0
     369h -1.0
     370
    347371S P 1363
    348372s 12Dec2013[10:14.45]
    349373d 100 0 0 100
    350374R 0.0
     375N 70.0
    351376P 0 70
    352377Q 0
     
    361386d 100 0 0 100
    362387H -11.0
    363 P 1204 70
     388N 70.0
     389P 1679 70
    364390Q 0
    365391o csl14A
     
    374400d 100 0 0 100
    375401R 140.0
     402N 70.0
    376403P 140 70
    377404Q 0
     
    386413d 100 0 0 100
    387414R 484.0
     415N 70.0
    388416P 484 70
    389417Q 0
     
    398426d 100 0 0 100
    399427R 765.0
     428N 70.0
    400429P 765 70
    401430Q 0
     
    10271056Z
    10281057
    1029 ActiveTime:01:04:58
     1058ActiveTime:01:24:45
    10301059DarkTime:00:10:14
    1031 49:37:280 826 25 Ld
    1032 49:37:336 826 25 Lu
     106015:29:560 900 588 Ld
     106115:29:607 900 588 Lu
  • trunk/src/org/expeditee/assets/resources/framesets/overlayset/3.exp

    r798 r810  
    1 V 95
     1V 107
    22U csl14A
    33D 12Dec2013[10:15]
    44M csl14A
    5 d 31Jan2014[15:43]
     5d 03Feb2014[12:15]
    66Z
    77
     
    1010d 100 0 0 100
    1111H -11.0
     12N 0.0
    1213P 1679 0
    1314Q 0
     
    2223d 100 0 0 100
    2324R 0.0
     25N 0.0
    2426P 0 0
    2527Q 0
     
    3436d 100 0 0 100
    3537R 765.0
     38N 0.0
    3639P 765 0
    3740Q 0
     
    4649d 100 0 0 100
    4750R 140.0
     51N 0.0
    4852P 140 0
    4953Q 0
     
    5761d 50 50 50 100
    5862H 45.0
    59 P 1510 22
     63N -6.0
     64P 1510 26
    6065T @i: home.png 36
    6166X GoToHome
     
    7580d 50 50 50 100
    7681H 60.0
    77 P 1469 25
     82N -3.0
     83P 1469 29
    7884T @i: leftArrow.png 32
    7985X Back
     
    9298d 50 50 50 100
    9399H -37.0
    94 P 1557 25
     100N -3.0
     101P 1557 29
    95102T @i: rightArrow.png 32
    96103X Forward
     
    105112h -1.0
    106113
     114S T 88
     115s 12Dec2013[10:15.14]
     116R -2.0
     117N 7.0
     118P 0 45
     119T Mindmap
     120Q 0
     121o csl14A
     122v S
     123f Roboto Condensed_r25
     124t -1.0
     125b 0.0
     126m 0.0
     127w 140
     128k C
     129h -1.0
     130
    107131S T 438
    108132s 18Dec2013[12:21.59]
    109133R 587.0
     134N 17.0
    110135P 600 45
    111136T Get Hexagon
     
    121146h -1.0
    122147
    123 S T 88
    124 s 12Dec2013[10:15.14]
    125 R -2.0
    126 P 0 45
    127 T Mindmap
    128 Q 0
    129 o csl14A
    130 v S
    131 f Roboto Condensed_r25
    132 t -1.0
    133 b 0.0
    134 m 0.0
    135 w 140
    136 k C
    137 h -1.0
    138 
    139148S T 83
    140149s 12Dec2013[10:15.14]
    141150R 322.0
     151N 17.0
    142152P 335 45
    143153T Get Arrow
     
    156166s 12Dec2013[10:15.14]
    157167R 177.0
     168N 17.0
    158169P 190 45
    159170T Get Square
     
    172183s 12Dec2013[10:15.14]
    173184R 462.0
     185N 17.0
    174186P 475 45
    175187T Get Circle
     
    188200s 15Jan2014[16:54.30]
    189201H 10.0
    190 P 1609 50
     202N 17.0
     203P 1609 55
    191204T HELP
    192205F Documentation1
     
    205218d 100 0 0 100
    206219R 0.0
     220N 70.0
    207221P 0 70
    208222Q 0
     
    217231d 100 0 0 100
    218232H -11.0
     233N 70.0
    219234P 1679 70
    220235Q 0
     
    230245d 100 0 0 100
    231246R 765.0
     247N 70.0
    232248P 765 70
    233249Q 0
     
    242258d 100 0 0 100
    243259R 140.0
     260N 70.0
    244261P 140 70
    245262Q 0
     
    297314Z
    298315
    299 ActiveTime:00:36:39
    300 DarkTime:00:00:00
    301 43:51:698 1045 218 kLeft
     316ActiveTime:00:43:27
     317DarkTime:00:09:04
     31815:31:936 1625 42 Ld
     31915:31:983 1625 42 Lu
  • trunk/src/org/expeditee/items/widgets/JfxBrowser.java

    r809 r810  
    643643                return r;
    644644        }
     645       
     646        /**
     647         * Override so anchoring JfxBrowser makes browser resize with screen
     648         */
     649        @Override
     650        public void setAnchorLeft(Float anchor) {
     651               
     652        }
     653       
     654        /**
     655         * Override so anchoring JfxBrowser makes browser resize with screen
     656         */
     657        @Override
     658        public void setAnchorTop(Float anchor) {
     659               
     660        }
     661       
     662        /**
     663         * Override so anchoring JfxBrowser makes browser resize with screen
     664         */
     665        @Override
     666        public void setAnchorRight(Float anchor) {
     667               
     668        }
     669       
     670        /**
     671         * Override so anchoring JfxBrowser makes browser resize with screen
     672         */
     673        @Override
     674        public void setAnchorBottom(Float anchor) {
     675               
     676        }
    645677}
Note: See TracChangeset for help on using the changeset viewer.