Skip to content
This repository has been archived by the owner on Jul 29, 2019. It is now read-only.

Multiple base edges in clustered edge #3268

Merged
merged 9 commits into from
Jul 21, 2017
Merged

Multiple base edges in clustered edge #3268

merged 9 commits into from
Jul 21, 2017

Commits on Jul 8, 2017

  1. First interim commit

    @wimrijnders
    wimrijnders committed Jul 8, 2017
    Configuration menu
    Copy the full SHA
    ffe84d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2017

  1. Fixes during testing

    @wimrijnders
    wimrijnders committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    d32c2f4 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2017

  1. Merge branch 'develop' into multipleBaseEdgesInClusteredEdge

    @wimrijnders
    wimrijnders committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    48686fd View commit details
    Browse the repository at this point in the history

  2. Allow multiple edges to be hidden by a clustered edge. 

    Fix for almende#3245.

This fix adjusts the clustering edges so that theyi can refer to multiple edges instead of just one.

This API method is now insufficient, since multiple base edges can be returned.

- Added replacing method `clustering.getBaseEdges()`
- Adjusted example `changingClusteredEdgeNodes` for the new method. This is the *only* place where `getBaseEdge()` was used
- Adjusted documentation for new method and deprecation old method.

Method `getbaseEdge()` should now be considered `deprecated`, and in due time should be removed.
    @wimrijnders
    wimrijnders committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    e05b676 View commit details
    Browse the repository at this point in the history

  3. Edits of method name in example

    @wimrijnders
    wimrijnders committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    fc6b09d View commit details
    Browse the repository at this point in the history

  4. Edits of method name in example

    @wimrijnders
    wimrijnders committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    615484c View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2017

  1. Merged and fixed conflicts; adjusted deprecation getBaseEdge().

    @wimrijnders
    wimrijnders committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    abebb48 View commit details
    Browse the repository at this point in the history

  2. adjusted deprecation method getBaseEdge() in docs

    @wimrijnders
    wimrijnders committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    d99e488 View commit details
    Browse the repository at this point in the history

  3. Adjusted deprecation method for getBaseEdge() in docs

    @wimrijnders
    wimrijnders committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    b394963 View commit details
    Browse the repository at this point in the history