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

SpatialSeries and DynamicTraceSegment #699

Merged
merged 76 commits into from
Feb 28, 2022
Merged

SpatialSeries and DynamicTraceSegment #699

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
9f8f270
Add SpatialData
vhirtham Feb 2, 2022
95b5f21
Add notebooks
vhirtham Feb 2, 2022
b2e5a01
Refactor SpatialSeries
vhirtham Feb 4, 2022
50d2d72
Fix constraint behavior during evaluation
vhirtham Feb 4, 2022
ce6fa6b
Run pre-commit
vhirtham Feb 4, 2022
f1962fc
Add sympy length calculation
vhirtham Feb 7, 2022
6613907
Fix unit error
vhirtham Feb 8, 2022
7c1caa8
Fix test
vhirtham Feb 8, 2022
51a67c1
Fix all tests
vhirtham Feb 8, 2022
8691993
Add DynamicTraceSegment
vhirtham Feb 8, 2022
825d6fe
Run pre-commit
vhirtham Feb 8, 2022
54b132a
lint
CagtayFabry Feb 8, 2022
10f5987
add _k3d_line to Trace
CagtayFabry Feb 8, 2022
9c4fde0
Merge branch 'master' into 691_spatial_series
CagtayFabry Feb 8, 2022
74110dc
clean notebooks
CagtayFabry Feb 8, 2022
42074f7
mypy
CagtayFabry Feb 8, 2022
d6e1304
Use MathExpr for derivative
vhirtham Feb 14, 2022
993f39e
Add alternative length calculation
vhirtham Feb 14, 2022
ed12568
Add option to limit orientation to the xy plane
vhirtham Feb 15, 2022
34ed2ae
Add
vhirtham Feb 16, 2022
43752e7
Replace code with function
vhirtham Feb 17, 2022
3b805d2
Merge branch 'master' into 691_spatial_series
vhirtham Feb 17, 2022
e699f9b
Merge branch '691_spatial_series' of https://github.com/vhirtham/weld…
vhirtham Feb 17, 2022
c01f180
Fix tests
vhirtham Feb 18, 2022
f8d75b6
Add docstrings
vhirtham Feb 18, 2022
fe40639
Run cleanup scripts
vhirtham Feb 18, 2022
896cdd0
Fix pydocstyle issues
vhirtham Feb 18, 2022
6ececce
Fix a deepsource issue
vhirtham Feb 18, 2022
805cbbe
Remove unused code
vhirtham Feb 18, 2022
e514d3b
Express LinearHorizontalTraceSegment as DynamicSegment
vhirtham Feb 18, 2022
5890308
Express RadialHorizontalTraceSegment as DynamicSegment
vhirtham Feb 18, 2022
b2cff2d
Remove legacy code
vhirtham Feb 18, 2022
7b4596d
Fix notebook
vhirtham Feb 21, 2022
2b4ce61
run cleanup
vhirtham Feb 21, 2022
43c5c52
Fix deepsource issues
vhirtham Feb 21, 2022
e596c86
Fix deepsource issues
vhirtham Feb 21, 2022
e9bac02
add some doc fixes
vhirtham Feb 21, 2022
3a90ef9
Test docfix
vhirtham Feb 21, 2022
952e401
Add some quality of life functions to SpatialSeries
vhirtham Feb 21, 2022
c0ce76c
Fix linter issues
vhirtham Feb 21, 2022
93c516d
Add more quality of life functionality
vhirtham Feb 22, 2022
6080323
Simplify implementation of 'old' trace segments
vhirtham Feb 22, 2022
6734a99
Do some refactoring
vhirtham Feb 22, 2022
959429d
Take advantage of xarray
vhirtham Feb 22, 2022
c5f1f00
Prepare array evaluation
vhirtham Feb 22, 2022
be8c99f
Segment array evaluation works for expressions
vhirtham Feb 23, 2022
f3da1ab
Add full array support for segment lcs
vhirtham Feb 23, 2022
64712ec
Fix deepsource issues
vhirtham Feb 23, 2022
1fdce46
Update changelog
vhirtham Feb 23, 2022
ae9db90
Fix error in changelog
vhirtham Feb 23, 2022
88e7de9
Add function to calculate the length along the segment
vhirtham Feb 24, 2022
5731489
Rename variables and functions
vhirtham Feb 24, 2022
a5d1089
Replace obsolete function
vhirtham Feb 24, 2022
7d1c76d
Merge branch 'master' into 691_spatial_series
vhirtham Feb 24, 2022
7cb530d
Try fix doc
vhirtham Feb 24, 2022
ecc712b
Try fix docs
vhirtham Feb 24, 2022
149b705
Fix a doc error
vhirtham Feb 24, 2022
edc826a
Try more fixes
vhirtham Feb 25, 2022
6fc8368
Fix doc errors
vhirtham Feb 25, 2022
2309d16
Silence deepsource issues
vhirtham Feb 25, 2022
3a0b3e7
Test Sphinx fix
vhirtham Feb 25, 2022
7296d57
Test undoing some previous fixes
vhirtham Feb 25, 2022
de3828e
Undo changes
vhirtham Feb 25, 2022
3057330
assign array coords before calling evaluate
CagtayFabry Feb 25, 2022
6f577ec
Add type hint
vhirtham Feb 28, 2022
5ce033e
Merge branch '691_spatial_series' of https://github.com/vhirtham/weld…
vhirtham Feb 28, 2022
8c57089
Update weldx/geometry.py
vhirtham Feb 28, 2022
e83e3b0
Update weldx/core.py
vhirtham Feb 28, 2022
82bd7f1
Merge branch 'master' into 691_spatial_series
vhirtham Feb 28, 2022
2ee8051
Run pre-commit
vhirtham Feb 28, 2022
a92fc5a
Fix docs
vhirtham Feb 28, 2022
2c99112
Rename internal variable and add property
vhirtham Feb 28, 2022
92644b4
Generalize variable name in DynamicTraceSegment
vhirtham Feb 28, 2022
e314d79
Rename all variables related to 's'
vhirtham Feb 28, 2022
684b592
Remove obsolete function
vhirtham Feb 28, 2022
7c3123c
Fix todo
vhirtham Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
added
=====

- `SpatialSeries` and `DynamicTraceSegment` [:pull:`699`]
- ``SpatialSeries`` and ``DynamicTraceSegment`` [:pull:`699`]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like sphink does not find those two. I already added them to the __init__.py. Is there another place I forgot?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have you tried ~weldx.core.SpatialSeries ?
Maybe it works if you add it to the user API documentation in weldx/__init__.py

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used the previous method already in the docstrings and it worked. Was just wondering why it is necessary for some of our classes while others don't need it. Your second suggestion at least worked for the changelog.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think because of the user API some elements (our main classes) appear two times in the sphinx tree, e.g. once as weldx.time.Time and once as weldx.Time (user API)
In these cases the references have to be explicit or sphinx might throw an error (because it doesn't know which page to link to). But that should be mostly on the API documentation site

For the changelog I am nur sure what the sphinx context is for resolving these (or if there is any difference)


- first draft of the ``multi_pass_weld`` schema for WelDX files [:pull:`667`]

Expand Down
6 changes: 3 additions & 3 deletions weldx/geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,9 +1403,9 @@ def __init__(
first argument to of the ``__init__`` method of the
`~weldx.core.SpatialSeries`.
max_s:
[only expression based `SpatialSeries`] The maximum value of the passed
series ``s`` parameter. The value defines the segments length by evaluating
the expression on the interval [0, ``max_s``]
[only expression based `~weldx.core.SpatialSeries`] The maximum value of
the passed series ``s`` parameter. The value defines the segments length by
evaluating the expression on the interval [0, ``max_s``]
limit_orientation_to_xy:
If `True`, the orientation vectors of the coordinate systems along the trace
are confined to the xy-plane.
Expand Down