Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Layout editor add decorations to track segments and positional points #4530

Closed
wants to merge 97 commits into from
Closed

Layout editor add decorations to track segments and positional points #4530

wants to merge 97 commits into from

Commits on Nov 28, 2017

  1. work towards removing ActiveFlag from OakTree

    @pabender
    pabender committed Nov 28, 2017
    Copy the full SHA
    bcf3c10 View commit details
    Browse the repository at this point in the history

  2. remove oaktree ActiveFlag and reference to activeflag in ActiveSystem… 

    …sMenu
    @pabender
    pabender committed Nov 28, 2017
    Copy the full SHA
    c42403c View commit details
    Browse the repository at this point in the history

  3. remove ActiveFlag for jmri.jmrix.direct package

    @pabender
    pabender committed Nov 28, 2017
    Copy the full SHA
    5f5b20e View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2017

  1. remove deprecated (and unused) jmri.jmrix.ActiveSystemFlag class, alo… 

    …ng with the associated tests.
    @pabender
    pabender committed Nov 29, 2017
    Copy the full SHA
    7094e4f View commit details
    Browse the repository at this point in the history

  2. work on removing rps ActiveFlag.

    @pabender
    pabender committed Nov 29, 2017
    Copy the full SHA
    af758b8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/JMRI/JMRI into RemoveActi… 

    …veFlag
    @pabender
    pabender committed Nov 29, 2017
    Copy the full SHA
    a78c5d7 View commit details
    Browse the repository at this point in the history

  4. work towards removing ActiveFlag from maple

    @pabender
    pabender committed Nov 29, 2017
    Copy the full SHA
    9cc69fd View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of http://github.com/JMRI/JMRI into RemoveActiv… 

    …eFlag
    @pabender
    pabender committed Nov 29, 2017
    Copy the full SHA
    2945579 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2017

  1. minor corrections

    @pabender
    pabender committed Nov 30, 2017
    Copy the full SHA
    7ca8356 View commit details
    Browse the repository at this point in the history

  2. work towards removing ActiveFlag from secsi

    @pabender
    pabender committed Nov 30, 2017
    Copy the full SHA
    28671ec View commit details
    Browse the repository at this point in the history

  3. Merge branch 'RemoveActiveFlag' of https://github.com/pabender/JMRI i… 

    …nto RemoveActiveFlag
    @pabender
    pabender committed Nov 30, 2017
    Copy the full SHA
    5bdd1fb View commit details
    Browse the repository at this point in the history

  4. remove secsi ActiveFlag

    @pabender
    pabender committed Nov 30, 2017
    Copy the full SHA
    254b1b1 View commit details
    Browse the repository at this point in the history

  5. more work on ActiveFlag and multi-system

    @pabender
    pabender committed Nov 30, 2017
    Copy the full SHA
    9db4809 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/JMRI/JMRI into RemoveActi… 

    …veFlag
    @pabender
    pabender committed Nov 30, 2017
    Copy the full SHA
    dcdb050 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of http://github.com/JMRI/JMRI into RemoveActiv… 

    …eFlag
    @pabender
    pabender committed Nov 30, 2017
    Copy the full SHA
    ffdedcd View commit details
    Browse the repository at this point in the history

  8. Merge branch 'RemoveActiveFlag' of https://github.com/pabender/JMRI i… 

    …nto RemoveActiveFlag
    @pabender
    pabender committed Nov 30, 2017
    Copy the full SHA
    9629d30 View commit details
    Browse the repository at this point in the history

  9. fix failing tests

    @pabender
    pabender committed Nov 30, 2017
    Copy the full SHA
    57eb6ff View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2017

  1. Merge branch 'master' of https://github.com/JMRI/JMRI into RemoveActi… 

    …veFlag
    @pabender
    pabender committed Dec 1, 2017
    Copy the full SHA
    01cc4b2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'RemoveActiveFlag' of https://github.com/pabender/JMRI i… 

    …nto RemoveActiveFlag
    @pabender
    pabender committed Dec 1, 2017
    Copy the full SHA
    69d3493 View commit details
    Browse the repository at this point in the history

  3. remove ActiveFlag from Grapevine subsystem

    @pabender
    pabender committed Dec 1, 2017
    Copy the full SHA
    a8ab12e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'RemoveActiveFlag' of https://github.com/pabender/JMRI i… 

    …nto RemoveActiveFlag
    @pabender
    pabender committed Dec 1, 2017
    Copy the full SHA
    2b08fd3 View commit details
    Browse the repository at this point in the history

  5. update reference to grapevine signal heads in jmri.jmrit.beantable.Si… 

    …gnalHeadTableAction
    @pabender
    pabender committed Dec 1, 2017
    Copy the full SHA
    89c8748 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2017

  1. Merge branch 'master' of https://github.com/JMRI/JMRI into RemoveActi… 

    …veFlag
    @pabender
    pabender committed Dec 3, 2017
    Copy the full SHA
    032da6c View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2017

  1. Improve operations help

    @DanielBoudreau
    DanielBoudreau committed Dec 5, 2017
    Copy the full SHA
    0b07eb2 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2017

  1. protect against no signal defined

    @bobjacobsen
    bobjacobsen committed Dec 6, 2017
    Copy the full SHA
    801c892 View commit details
    Browse the repository at this point in the history

  2. Merge pull request JMRI#4515 from DanielBoudreau/master 

    Improve operations help
    @DanielBoudreau
    DanielBoudreau committed Dec 6, 2017
    Copy the full SHA
    6fdb52e View commit details
    Browse the repository at this point in the history

  3. protect against no signal defined

    @bobjacobsen
    bobjacobsen committed Dec 6, 2017
    Copy the full SHA
    0222f95 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of http://github.com/JMRI/JMRI into RemoveActiv… 

    …eFlag
    @pabender
    pabender committed Dec 6, 2017
    Copy the full SHA
    7f3661a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'RemoveActiveFlag' of https://github.com/pabender/JMRI i… 

    …nto RemoveActiveFlag
    @pabender
    pabender committed Dec 6, 2017
    Copy the full SHA
    e083503 View commit details
    Browse the repository at this point in the history

  6. add timeout to test that appears to time out travis builds

    @pabender
    pabender committed Dec 6, 2017
    Copy the full SHA
    4cd5132 View commit details
    Browse the repository at this point in the history

  7. Merge pull request JMRI#4517 from pabender/testcreation 

    add timeout to test that appears to time out travis builds
    @pabender
    pabender committed Dec 6, 2017
    Copy the full SHA
    9705753 View commit details
    Browse the repository at this point in the history

  8. LayoutEditor: Add decorations 

    Decorations include: tunnel entrances/exits, bridge entrances/exits, etc. for track segments; end bumpers, rail gap markers, single/double in/out arrows for positional points, etc.)
Note: In the XML file the "decorations" are an optional array of "decoration" elements; each one with a required name (xs:string) and optional value (xs:string). The value is a semicolon delimited string; for example: "width=6;color=#101010;arc=14", etc. Note: unknown decoration names are ignored.
    @geowar1
    geowar1 committed Dec 6, 2017
    Copy the full SHA
    32edca8 View commit details
    Browse the repository at this point in the history

  9. update from Dick Bronson

    @bobjacobsen
    bobjacobsen committed Dec 6, 2017
    Copy the full SHA
    c721523 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'bobj-RR-cirkits-file' into release-4.9.7

    @bobjacobsen
    bobjacobsen committed Dec 6, 2017
    Copy the full SHA
    b6fe477 View commit details
    Browse the repository at this point in the history

  11. Merge pull request JMRI#4516 from bobjacobsen/bobj-blockboss-protect-… 

    …for-delete

Fix failure to delete Turnout
    @bobjacobsen
    bobjacobsen committed Dec 6, 2017
    Copy the full SHA
    73482f7 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/JMRI/JMRI into LayoutEdit… 

    …or-Add-decorations-to-TrackSegments-and-PositionalPoints
    @geowar1
    geowar1 committed Dec 6, 2017
    Copy the full SHA
    96e1bb9 View commit details
    Browse the repository at this point in the history

  13. Regress PositionablePoint drawing of End Bumpers and Edge-Connectors 

    Removed End Bumpers and Edge Connector drawing code.
    @geowar1
    geowar1 committed Dec 6, 2017
    Copy the full SHA
    eb78498 View commit details
    Browse the repository at this point in the history

  14. Working on bridges

    @geowar1
    geowar1 committed Dec 6, 2017
    Copy the full SHA
    59a8ecc View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2017

  1. Improve operation help

    @DanielBoudreau
    DanielBoudreau committed Dec 7, 2017
    Copy the full SHA
    c1fd1d0 View commit details
    Browse the repository at this point in the history

  2. Saving bridge work...

    @geowar1
    geowar1 committed Dec 7, 2017
    Copy the full SHA
    e90250d View commit details
    Browse the repository at this point in the history

  3. Merge pull request JMRI#4521 from DanielBoudreau/master 

    Improve operation help
    @DanielBoudreau
    DanielBoudreau committed Dec 7, 2017
    Copy the full SHA
    2a60f10 View commit details
    Browse the repository at this point in the history

  4. set hasBackground to false if the background color alpha value=0

    @pabender
    pabender committed Dec 7, 2017
    Copy the full SHA
    50dc25c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/JMRI/JMRI

    @pabender
    pabender committed Dec 7, 2017
    Copy the full SHA
    f888e13 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/JMRI/JMRI into RemoveActi… 

    …veFlag
    @pabender
    pabender committed Dec 7, 2017
    Copy the full SHA
    be25e61 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'RemoveActiveFlag' of https://github.com/pabender/JMRI i… 

    …nto RemoveActiveFlag
    @pabender
    pabender committed Dec 7, 2017
    Copy the full SHA
    3f11668 View commit details
    Browse the repository at this point in the history

  8. move SendPacketTool properties to the right bundle.

    @pabender
    pabender committed Dec 7, 2017
    Copy the full SHA
    81d8640 View commit details
    Browse the repository at this point in the history

  9. add a test to make sure we have all the properties moved 

    move a few additional required properties
    @pabender
    pabender committed Dec 7, 2017
    Copy the full SHA
    926bbcd View commit details
    Browse the repository at this point in the history

  10. Merge pull request JMRI#4518 from bobjacobsen/bobj-RR-cirkits-file 

    Updated RR-CirKits MotorMan definition
    @bobjacobsen
    bobjacobsen committed Dec 7, 2017
    Copy the full SHA
    cb92d62 View commit details
    Browse the repository at this point in the history

  11. Merge pull request JMRI#4520 from geowar1/Regress-PositionablePoint-d… 

    …rawing-of-End-Bumpers-and-Edge-Connectors

Regress PositionablePoint drawing of End Bumpers and Edge-Connectors
    @bobjacobsen
    bobjacobsen committed Dec 7, 2017
    Copy the full SHA
    001977b View commit details
    Browse the repository at this point in the history

  12. Prevent an NPE if unable to create help menu.

    @rhwood
    rhwood committed Dec 7, 2017
    Copy the full SHA
    e5492d5 View commit details
    Browse the repository at this point in the history

  13. Merge pull request JMRI#4522 from pabender/testcreation 

    move SendPacketTool properties to the right bundle.
    @bobjacobsen
    bobjacobsen committed Dec 7, 2017
    Copy the full SHA
    2867e92 View commit details
    Browse the repository at this point in the history

  14. Merge pull request JMRI#4523 from pabender/master 

     set hasBackground to false if the background color alpha value=0
    @bobjacobsen
    bobjacobsen committed Dec 7, 2017
    Copy the full SHA
    ddfa1b0 View commit details
    Browse the repository at this point in the history

  15. Moved all decorations (arrow, bridge, bumper) into TrackSegment

    @geowar1
    geowar1 committed Dec 7, 2017
    Copy the full SHA
    7231754 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' of https://github.com/JMRI/JMRI into LayoutEdit… 

    …or-Add-decorations-to-TrackSegments-and-PositionalPoints
    @geowar1
    geowar1 committed Dec 7, 2017
    Copy the full SHA
    80439f1 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'LayoutEditor-development' into LayoutEditor-Add-decorat… 

    …ions-to-TrackSegments-and-PositionalPoints
    @geowar1
    geowar1 committed Dec 7, 2017
    Copy the full SHA
    5df175a View commit details
    Browse the repository at this point in the history

  18. Minor comment tweak (to restart AppVeyor)

    @geowar1
    geowar1 committed Dec 7, 2017
    Copy the full SHA
    0fa9334 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'LayoutEditor-Add-decorations-to-TrackSegments-and-Posit… 

    …ionalPoints' of https://github.com/geowar1/JMRI into LayoutEditor-Add-decorations-to-TrackSegments-and-PositionalPoints
    @geowar1
    geowar1 committed Dec 7, 2017
    Copy the full SHA
    4044908 View commit details
    Browse the repository at this point in the history

  20. Merge pull request JMRI#4528 from JMRI/rhwood-patch-2 

    Prevent an NPE if unable to create help menu
    @bobjacobsen
    bobjacobsen committed Dec 7, 2017
    Copy the full SHA
    498aac8 View commit details
    Browse the repository at this point in the history

  21. Add debug target for PanelPro

    @rhwood
    rhwood committed Dec 7, 2017
    Copy the full SHA
    2b3a981 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2017

  1. Added Tunnels & fixed dashed…

    @geowar1
    geowar1 committed Dec 8, 2017
    Copy the full SHA
    1444579 View commit details
    Browse the repository at this point in the history

  2. update cucumber related libraries to most recent version

    @pabender
    pabender committed Dec 8, 2017
    Copy the full SHA
    abb468b View commit details
    Browse the repository at this point in the history

  3. add new cucumber dependencies

    @pabender
    pabender committed Dec 8, 2017
    Copy the full SHA
    706f28d View commit details
    Browse the repository at this point in the history

  4. more work on upgrading cucumber version.

    @pabender
    pabender committed Dec 8, 2017
    Copy the full SHA
    6578aab View commit details
    Browse the repository at this point in the history

  5. add new cucumber libraries to netbeans config

    @pabender
    pabender committed Dec 8, 2017
    Copy the full SHA
    da44770 View commit details
    Browse the repository at this point in the history

  6. add new cucumber libraries to .classpath

    @pabender
    pabender committed Dec 8, 2017
    Copy the full SHA
    5bd12c3 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/JMRI/JMRI into cucumber

    @pabender
    pabender committed Dec 8, 2017
    Copy the full SHA
    48cdfbd View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/JMRI/JMRI into LayoutEdit… 

    …or-Add-decorations-to-TrackSegments-and-PositionalPoints
    @geowar1
    geowar1 committed Dec 8, 2017
    Copy the full SHA
    6e91c0f View commit details
    Browse the repository at this point in the history

  9. LTDOD:Change miminum # of rails to 1.

    @geowar1
    geowar1 committed Dec 8, 2017
    Copy the full SHA
    102f79b View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2017

  1. Merge pull request JMRI#4482 from pabender/RemoveActiveFlag 

    Remove last active flags
    @pabender
    pabender committed Dec 9, 2017
    Copy the full SHA
    8cee647 View commit details
    Browse the repository at this point in the history

  2. Saving work on decoration popup menus

    @geowar1
    geowar1 committed Dec 9, 2017
    Copy the full SHA
    ba81cd0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/JMRI/JMRI into LayoutEdit… 

    …or-Add-decorations-to-TrackSegments-and-PositionalPoints
    @geowar1
    geowar1 committed Dec 9, 2017
    Copy the full SHA
    36007d0 View commit details
    Browse the repository at this point in the history

  4. Saving and loading decorations working; still working on UI

    @geowar1
    geowar1 committed Dec 9, 2017
    Copy the full SHA
    5ed2a23 View commit details
    Browse the repository at this point in the history

  5. Refactor entry/exit properties

    @geowar1
    geowar1 committed Dec 9, 2017
    Copy the full SHA
    86c4d0f View commit details
    Browse the repository at this point in the history

  6. minor update

    @bobjacobsen
    bobjacobsen committed Dec 9, 2017
    Copy the full SHA
    7b23b43 View commit details
    Browse the repository at this point in the history

  7. Update to new release sequence

    @bobjacobsen
    bobjacobsen committed Dec 9, 2017
    Copy the full SHA
    a667a8c View commit details
    Browse the repository at this point in the history

  8. remove double semi-colon that was causing Jenkins compile to fail

    @bobjacobsen
    bobjacobsen committed Dec 9, 2017
    Copy the full SHA
    5fe1b66 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2017

  1. Merge pull request JMRI#4539 from bobjacobsen/bobj-jenkins 

    Remove double semi-colon that was causing Jenkins compile to fail
    @bobjacobsen
    bobjacobsen committed Dec 10, 2017
    Copy the full SHA
    f8c8be2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request JMRI#4540 from bobjacobsen/bobj-doc-update 

    Minor doc update
    @bobjacobsen
    bobjacobsen committed Dec 10, 2017
    Copy the full SHA
    4afc9c0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/JMRI/JMRI into cucumber

    @pabender
    pabender committed Dec 10, 2017
    Copy the full SHA
    6ceff16 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/JMRI/JMRI into LayoutEdit… 

    …or-Add-decorations-to-TrackSegments-and-PositionalPoints
    @geowar1
    geowar1 committed Dec 10, 2017
    Copy the full SHA
    17c43b3 View commit details
    Browse the repository at this point in the history

  5. Still need to prefect save/load xml schema 

    Spelling persistance => persistence
Refactor hideConstructionLines => setShowConstructionLines
Added QuickPromptUtil functions
Added ColorUtil.contrast
    @geowar1
    geowar1 committed Dec 10, 2017
    Copy the full SHA
    af3b072 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2017

  1. Merge pull request JMRI#4532 from rhwood/eclipse-debug-panelpro 

    Add debug target for PanelPro to Eclipse
    @rhwood
    rhwood committed Dec 11, 2017
    Copy the full SHA
    35a91e1 View commit details
    Browse the repository at this point in the history

  2. Suppress error message when an exception was thrown indicating we kno… 

    …w the port was closed or closing.
    @pabender
    pabender committed Dec 11, 2017
    Copy the full SHA
    58e2a42 View commit details
    Browse the repository at this point in the history

  3. compare message, not cause

    @pabender
    pabender committed Dec 11, 2017
    Copy the full SHA
    000332e View commit details
    Browse the repository at this point in the history

  4. remove accidentally included jar file (not ready for this yet)

    @pabender
    pabender committed Dec 11, 2017
    Copy the full SHA
    9e4807a View commit details
    Browse the repository at this point in the history

  5. Merge pull request JMRI#4546 from pabender/master 

     Suppress error message when an exception was thrown indicating we know the port was closed or closing.
    @pabender
    pabender committed Dec 11, 2017
    Copy the full SHA
    ae74220 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/JMRI/JMRI into cucumber

    @pabender
    pabender committed Dec 11, 2017
    Copy the full SHA
    5d1232f View commit details
    Browse the repository at this point in the history

  7. use webdrivermanager to manage selenium webdriver instances

    @pabender
    pabender committed Dec 11, 2017
    Copy the full SHA
    23cfe4e View commit details
    Browse the repository at this point in the history

  8. Merge pull request JMRI#4538 from pabender/cucumber 

    update cucumber libraries to 2.0.1
    @pabender
    pabender committed Dec 11, 2017
    Copy the full SHA
    3e3951a View commit details
    Browse the repository at this point in the history

  9. Added Arrow Styles / Icons

    @geowar1
    geowar1 committed Dec 11, 2017
    Copy the full SHA
    4bd867b View commit details
    Browse the repository at this point in the history

  10. update to version 2.0.1 (released yesterday)

    @pabender
    pabender committed Dec 11, 2017
    Copy the full SHA
    80e1362 View commit details
    Browse the repository at this point in the history

  11. restore setting paths for geckodriver/chromedriver on Appveyor (autom… 

    …atic download failing)
    @pabender
    pabender committed Dec 11, 2017
    Copy the full SHA
    f7ed1f0 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2017

  1. upgrade commons-io and commons-lang3 libraries to latest version (bot… 

    …h for ant and maven builds)
    @pabender
    pabender committed Dec 12, 2017
    Copy the full SHA
    1211e4e View commit details
    Browse the repository at this point in the history

  2. Merge pull request JMRI#4549 from pabender/cucumber 

    Use webdriver to manage selenium webdriver instances
    @pabender
    pabender committed Dec 12, 2017
    Copy the full SHA
    24086c0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/JMRI/JMRI into LayoutEdit… 

    …or-Add-decorations-to-TrackSegments-and-PositionalPoints
    @geowar1
    geowar1 committed Dec 12, 2017
    Copy the full SHA
    ff926c8 View commit details
    Browse the repository at this point in the history

  4. Finished up Arrow drawing code

    @geowar1
    geowar1 committed Dec 12, 2017
    Copy the full SHA
    8701b0b View commit details
    Browse the repository at this point in the history

  5. Updated XML schema for arrow, bridge, bumper and tunnel decorations

    @geowar1
    geowar1 committed Dec 12, 2017
    Copy the full SHA
    e83c4fc View commit details
    Browse the repository at this point in the history