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

Added implementation for hexagonal segmentation and also staggered square segmentations #1161

Merged
merged 40 commits into from
Sep 20, 2023
Merged

Added implementation for hexagonal segmentation and also staggered square segmentations #1161

merged 40 commits into from
Sep 20, 2023
+532 −0

Commits on Aug 15, 2023

  1. Added hex and staggered square segmentations src

    @sebouh137
    sebouh137 authored Aug 15, 2023
    Configuration menu
    Copy the full SHA
    7754e37 View commit details
    Browse the repository at this point in the history

  2. Added .h for hex and staggered square segmentation

    @sebouh137
    sebouh137 authored Aug 15, 2023
    Configuration menu
    Copy the full SHA
    83eb406 View commit details
    Browse the repository at this point in the history

  3. Update HexGrid.h

    @sebouh137
    sebouh137 authored Aug 15, 2023
    Configuration menu
    Copy the full SHA
    8be52c6 View commit details
    Browse the repository at this point in the history

  4. Update SquareGrid.h

    @sebouh137
    sebouh137 authored Aug 15, 2023
    Configuration menu
    Copy the full SHA
    8ec6ab6 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Update DDCore/src/segmentations/HexGrid.cpp 

    Co-authored-by: Andre Sailer <[email protected]>
    @sebouh137 @andresailer
    sebouh137 and andresailer authored Aug 25, 2023
    Configuration menu
    Copy the full SHA
    9012472 View commit details
    Browse the repository at this point in the history

  2. Update DDCore/src/segmentations/HexGrid.cpp 

    Co-authored-by: Andre Sailer <[email protected]>
    @sebouh137 @andresailer
    sebouh137 and andresailer authored Aug 25, 2023
    Configuration menu
    Copy the full SHA
    195024a View commit details
    Browse the repository at this point in the history

  3. Update DDCore/src/segmentations/SquareGrid.cpp 

    Co-authored-by: Andre Sailer <[email protected]>
    @sebouh137 @andresailer
    sebouh137 and andresailer authored Aug 25, 2023
    Configuration menu
    Copy the full SHA
    b1f76eb View commit details
    Browse the repository at this point in the history

  4. Update DDCore/src/segmentations/SquareGrid.cpp 

    Co-authored-by: Andre Sailer <[email protected]>
    @sebouh137 @andresailer
    sebouh137 and andresailer authored Aug 25, 2023
    Configuration menu
    Copy the full SHA
    22576d0 View commit details
    Browse the repository at this point in the history

  5. Update HexGrid.cpp 

    removed commented code; fixed indentations
    @sebouh137
    sebouh137 authored Aug 25, 2023
    Configuration menu
    Copy the full SHA
    84373a2 View commit details
    Browse the repository at this point in the history

  6. Update HexGrid.cpp 

    added license information
    @sebouh137
    sebouh137 authored Aug 25, 2023
    Configuration menu
    Copy the full SHA
    ade020d View commit details
    Browse the repository at this point in the history

  7. Update SquareGrid.cpp 

    added license
    @sebouh137
    sebouh137 authored Aug 25, 2023
    Configuration menu
    Copy the full SHA
    9b7833c View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. Update CartesianGridXY.cpp

    @sebouh137
    sebouh137 authored Aug 31, 2023
    Configuration menu
    Copy the full SHA
    2ef97dd View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Update CartesianGridXY.h

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    18151d1 View commit details
    Browse the repository at this point in the history

  2. Update CartesianGridXY.cpp

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    7d9268e View commit details
    Browse the repository at this point in the history

  3. Update CartesianGridXY.cpp

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    ae359af View commit details
    Browse the repository at this point in the history

  4. Update HexGrid.cpp

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    8ca1c92 View commit details
    Browse the repository at this point in the history

  5. Update CartesianGridXY.cpp

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    1375ffa View commit details
    Browse the repository at this point in the history

  6. Update CartesianGridXY.cpp

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    d128b9a View commit details
    Browse the repository at this point in the history

  7. Update HexGrid.cpp

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    f2dc23a View commit details
    Browse the repository at this point in the history

  8. Update HexGrid.h

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    6546b6b View commit details
    Browse the repository at this point in the history

  9. Update CartesianGridXY.h

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    bcefcd1 View commit details
    Browse the repository at this point in the history

  10. Update HexGrid.h

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    9851acd View commit details
    Browse the repository at this point in the history

  11. Update HexGrid.cpp

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    1b8a78f View commit details
    Browse the repository at this point in the history

  12. Update CartesianGridXY.cpp

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    edc80c1 View commit details
    Browse the repository at this point in the history

  13. removed SquareGrid.h and SquareGrid.cpp, which became redundant when … 

    …adding staggering option to the CartesianGridXY
    @sebouh137
    sebouh137 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    d1e90a2 View commit details
    Browse the repository at this point in the history

  14. Update DDCore/include/DDSegmentation/HexGrid.h 

    Co-authored-by: Andre Sailer <[email protected]>
    @sebouh137 @andresailer
    sebouh137 and andresailer authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    c90594c View commit details
    Browse the repository at this point in the history

  15. Update HexGrid.cpp 

    removed unused variables
    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    45e4385 View commit details
    Browse the repository at this point in the history

  16. Update CartesianGridXY.cpp 

    make staggering parameters optional for CartesianGridXY
    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    9816e48 View commit details
    Browse the repository at this point in the history

  17. Update CartesianGridXY.cpp

    @sebouh137
    sebouh137 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    9ce45fb View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. ...

    @sebouh137
    sebouh137 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    e2ed050 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Update CartesianGridXY.cpp 

    do not assume that there exists a keyword corresponding to the layer, unless staggering is enabled
    @sebouh137
    sebouh137 authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    c07dfd4 View commit details
    Browse the repository at this point in the history

  2. Update HexGrid.cpp 

    avoid crashing if there is no field called "layer" or some equivalent thereof.
    @sebouh137
    sebouh137 authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    c16d729 View commit details
    Browse the repository at this point in the history

  3. Update HexGrid.cpp

    @sebouh137
    sebouh137 authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    551fe45 View commit details
    Browse the repository at this point in the history

  4. CartesianGridXY: add missing parenthesis

    @andresailer
    andresailer authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    898186b View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. added CartesianGridXYStaggered.cpp and .h

    @sebouh137
    sebouh137 committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    18146de View commit details
    Browse the repository at this point in the history

  2. reverted CartesianGridXY.h and CartesianGridXY.cpp to the upstream ma… 

    …ster versions
    @sebouh137
    sebouh137 committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    1138508 View commit details
    Browse the repository at this point in the history

  3. merged

    @sebouh137
    sebouh137 committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    385d753 View commit details
    Browse the repository at this point in the history

  4. fixed merge

    @sebouh137
    sebouh137 committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    4aec387 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. CartesianGridXYStaggered: fix cellDimensions function declaration

    @andresailer
    andresailer authored Sep 19, 2023
    Configuration menu
    Copy the full SHA
    dccd89f View commit details
    Browse the repository at this point in the history

  2. Update CartesianGridXYStaggered.cpp 

    added "CartesianGridXYStaggered::" to the cellDimensions method in CartesianGridXYStaggered.cpp.
    @sebouh137
    sebouh137 authored Sep 19, 2023
    Configuration menu
    Copy the full SHA
    87689b9 View commit details
    Browse the repository at this point in the history