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.

Sign up for GitHub

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

Add support for Multicolored Wires #17

Closed
wants to merge 15 commits into from
Closed

Add support for Multicolored Wires #17

wants to merge 15 commits into from

Commits on Jun 25, 2020

  1. Ignore IDE settings and windows stuff

    @aakatz3
    aakatz3 committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    10e747c View commit details
    Browse the repository at this point in the history

  2. Add support for Multicolored (banded) wires 

    Also add in the 25 pair code, and the full DIN code
    @aakatz3
    aakatz3 committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    21bc9b1 View commit details
    Browse the repository at this point in the history

  3. Add example for banded wires

    @aakatz3
    aakatz3 committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    dccdfa7 View commit details
    Browse the repository at this point in the history

  4. Create multicolored wires with multiple HTML rows to match the curved… 

    … wires
    @kvid
    kvid committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    f23c186 View commit details
    Browse the repository at this point in the history

  5. Fix table color issue

    @aakatz3
    aakatz3 committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    89048d0 View commit details
    Browse the repository at this point in the history

  6. Merge #1 

    # Conflicts:
#	src/wireviz.py
    @aakatz3
    aakatz3 committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    3562c0e View commit details
    Browse the repository at this point in the history

  7. Reverse colors to match the curved wires when more than 2 colors

    @kvid
    kvid committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    b253d0a View commit details
    Browse the repository at this point in the history

  8. Merge pull request #5 from kvid/kvid/feature-multicolor-wires 

    Reverse colors to match the curved wires when more than 2 colors
    @aakatz3
    aakatz3 committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    9cd46e4 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2020

  1. Rename examples to allow merge

    @aakatz3
    aakatz3 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    e631753 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into feature-multicolor-wires 

    # Conflicts:
#	.gitignore
#	src/batch.py
#	src/wireviz.py
#	src/wv_colors.py
    @aakatz3
    aakatz3 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    f0d10bf View commit details
    Browse the repository at this point in the history

  3. Merge multi-color wires into refactored code

    @aakatz3
    aakatz3 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    525be74 View commit details
    Browse the repository at this point in the history

  4. Add Jetbrains IDE config 

    for PyCharm, if anyone else is using it
    @aakatz3
    aakatz3 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    4f076a5 View commit details
    Browse the repository at this point in the history

  5. Update all examples

    @aakatz3
    aakatz3 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    61a5545 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. Merge branch 'dev' into feature-multicolor-wires 

    # Conflicts:
#	examples/ex01.bom.tsv
#	examples/ex01.gv
#	examples/ex01.html
#	examples/ex01.png
#	examples/ex01.svg
#	examples/ex05.gv
#	examples/ex05.html
#	examples/ex05.png
#	examples/ex05.svg
#	src/wireviz/Harness.py
#	src/wireviz/build_examples.py
    @aakatz3
    aakatz3 committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    bb0826a View commit details
    Browse the repository at this point in the history

  2. Prepare for dev reset and re-merge

    @aakatz3
    aakatz3 committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    e4a034c View commit details
    Browse the repository at this point in the history