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

More link shape properties #62

Merged
merged 173 commits into from
Mar 21, 2023
Merged

More link shape properties #62

merged 173 commits into from
Mar 21, 2023

Conversation

sanbales
Copy link
Contributor

@sanbales sanbales commented Mar 11, 2023 •
edited
Loading

References

Resolves #60 by adding curvature and line dashes to LinkShape.

Code changes

  • add curvature to LinkShape
  • add line_dash to LinkShape
    • disable this behavior in 3D (it is not supported)
  • add coercion to array for line_dash data
  • update notebooks
    • fixed a small issue with node selection in Behaviors.ipynb
  • update docs
  • add tests
    • str inputs
    • int inputs
    • float inputs
    • Column inputs
    • Nunjucks inputs
    • LinkShape.color
    • LinkShape.curvature
    • LinkShape.line_dash
    • LinkShape.width
  • Interaction with selection
    • need to make sure LinkSelection is included before LinkShape to show selection styling
    • LinkSelection works but it is not tested in conjunction with LinkShape
    • future work would be to figure out a way to make default_curvature=None to leave the link with its non-selected curvature

User-facing changes

  • Two new properties on LinkShape:
    • LinkShape.curvature:
      • 0.0 produces a straight link (default)
      • 1.0 circular link (i.e., radius of curvature = 0.5 * link length)
      • negative numbers mirror the link
    • LinkShape.line_dashes:
      • Define the line dashes using an array of numbers, reference

image

Backwards-incompatible changes

No backwards incompatible changes (knock on wood)

Santiago Balestrini and others added 30 commits February 21, 2023 15:03
GH-43: started to prototype the python side of the interface
916c9b5
Linted, fixed some issues, and added DOCSTRINGs
01e2cd8
Adding terms to dictionary
347354f
Getting mypy to run properly after adding annotations and helper func…
405eb5f 
…tions:
Added more Context Properties with proper Enums
028a3bc
Minor tweaks
f34adb0
@nrbgt
Merge remote-tracking branch 'UPSTREAM/main' into gh-43-custom-node-s…
8f39234 
…hapes
@nrbgt
add client for node text shapes, nunjucks and column widgets
d0a5740
@nrbgt
merge upstream
f3a6715
@nrbgt
more work on shapes
957dbdf
@nrbgt
Merge remote-tracking branch 'UPSTREAM/main' into gh-43-custom-node-s…
0ba6cc4 
…hapes
Merge remote-tracking branch 'origin/main' into gh-43-custom-node-shapes
9e3dd17
Adding copyright and license statement to new typescrypt files
fb6dee2
partial migration to the new way of doing business
e61d885
fixed a typo and added terms to the dictionary
90a99b0
Merge branch 'gh-43-custom-node-shapes' into gh-57-refactor-behaviors
125df65
more drastic breaking changes
dec3313
More drastic refactoring
844c321
Updated python and MD docs
d5fd2e5
Linted python code
7e2b1d7
Fixed some CRFL issues, improved the DOCSTRINGs on the behavior modul…
924a082 
…es, and added a general DynamicWidgetTrait
linted the js
4160031
fixed DOCSTRINGS on style behaviors
62673f2
Adding a functionality to coerce values, may not really work on pytho…
0bf1197 
…n side
Refining the DynamicValue widget and its DataTypes
c8875dc
Refining the DynamicValue and DataType
2a5917b
Janky attempt to get new link-arrow to work on the JS side, definitel…
c8607d5 
…y not there
Trying to get JS to build at least
72c002d
Adding missing terms to the dictionary
d0d8c55
Removing link directional JS files, and condensing labels to one tool…
8278e79 
…tip.ts file
@sanbales sanbales linked an issue Mar 16, 2023 that may be closed by this pull request
Add Additional Link Shape Properties #60
Closed
@sanbales sanbales added the enhancement New feature or request label Mar 16, 2023
@sanbales sanbales self-assigned this Mar 16, 2023
@nrbgt nrbgt changed the base branch from main to dev March 17, 2023 15:14
@sanbales sanbales marked this pull request as ready for review March 20, 2023 23:21
@sanbales
Copy link
Contributor Author

3D has rotation for links (spin around the axis between source and target), not sure it is worth it to bring that in or not, but it could make sense as dash_line only works on 2D.

nrbgt
nrbgt reviewed Mar 21, 2023
View reviewed changes
js/utils.ts Outdated Show resolved Hide resolved
@nrbgt
Copy link
Contributor

nrbgt commented Mar 21, 2023

but it could make sense as dash_line only works on 2D.

Again, not blocking, but should probably filter that out of the 3d demo.

@sanbales
Copy link
Contributor Author

but it could make sense as dash_line only works on 2D.

Again, not blocking, but should probably filter that out of the 3d demo.

Good call, fixed in da96020

@sanbales sanbales merged commit e14bc49 into dev Mar 21, 2023
@nrbgt nrbgt deleted the 60-more-link-shape-properties branch March 22, 2023 15:11
This was referenced Mar 23, 2023
Merged
Closed
Merged
nrbgt pushed a commit to nrbgt/ipyforcegraph that referenced this pull request May 11, 2023
@sanbales @nrbgt
More link shape properties (jupyrdf#62)
4f21cd0 
Resolves jupyrdf#60 by adding `curvature` and `line dashes` to `LinkShape`.

- [x] add `curvature` to `LinkShape`
- [x] add `line_dash` to `LinkShape`
  - [x] disable this behavior in 3D (it is not supported)
- [x] add coercion to `array` for `line_dash` data
- [x] update notebooks
  - [x] fixed a small issue with `node` selection in `Behaviors.ipynb`
- [x] update docs
- [x] add tests
  - [x] `str` inputs
  - [x] `int` inputs
  - [x] `float` inputs
  - [x] `Column` inputs
  - [x] `Nunjucks` inputs
  - [x] `LinkShape.color`
  - [x] `LinkShape.curvature`
  - [x] `LinkShape.line_dash`
  - [x] `LinkShape.width`
- [x] Interaction with selection
  - [x] need to make sure `LinkSelection` is included before `LinkShape` to show selection styling
  - [x] `LinkSelection` works but it is not tested in conjunction with `LinkShape`
  - [x] future work would be to figure out a way to make `default_curvature=None` to leave the link with its non-selected `curvature`

* Two new properties on `LinkShape`:
  * `LinkShape.curvature`:
    * 0.0 produces a straight link (default)
    * 1.0 circular link (i.e., `radius of curvature` = `0.5 * link length`)
    * negative numbers mirror the link
  * `LinkShape.line_dashes`:
    * Define the line dashes using an array of numbers, [reference](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash)

> No backwards incompatible changes (**knock on wood**)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nrbgt nrbgt nrbgt approved these changes

@dfreeman06 dfreeman06 Awaiting requested review from dfreeman06

Assignees

@sanbales sanbales

Labels
enhancement New feature or request
Projects
ipyforcegraph
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add Additional Link Shape Properties
2 participants
@sanbales @nrbgt