Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Python3 ArmarX
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
Python3 ArmarX
Commits
1518cd40
Commit
1518cd40
authored
2 months ago
by
Tilman Daab
Committed by
Timo Birr
2 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Undo __future__ import for type annotations, which is incompatible with python 3.6
parent
04827d40
No related branches found
Branches containing commit
No related tags found
1 merge request
!94
Undo __future__ import for type annotations, which is incompatible with python 3.6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
armarx_core/time/duration.py
+1
-1
1 addition, 1 deletion
armarx_core/time/duration.py
armarx_memory/aron/common/framed/__init__.py
+5
-2
5 additions, 2 deletions
armarx_memory/aron/common/framed/__init__.py
with
6 additions
and
3 deletions
armarx_core/time/duration.py
+
1
−
1
View file @
1518cd40
...
...
@@ -13,7 +13,7 @@ MIN_LONG_CPP = -9223372036854775808
@dataclasses.dataclass
class
Duration
(
AronDataclass
):
microSeconds
:
np
.
int64
=
MIN_LONG_CPP
,
# std::numeric_limits<long>::min()
microSeconds
:
np
.
int64
=
MIN_LONG_CPP
# std::numeric_limits<long>::min()
@staticmethod
def
from_seconds
(
seconds
:
float
)
->
"
Duration
"
:
...
...
This diff is collapsed.
Click to expand it.
armarx_memory/aron/common/framed/__init__.py
+
5
−
2
View file @
1518cd40
from
__future__
import
annotations
# Using classes in the type annotations of their own methods can be re-introduced once this import is compatible
# (>= python 3.7) or native support is ready
# from __future__ import annotations
#from __future__ import annotations
import
dataclasses
as
dc
import
numpy
as
np
...
...
@@ -46,7 +49,7 @@ class FramedPose(AronDataclass):
pose
:
np
.
ndarray
=
dc
.
field
(
default_factory
=
lambda
:
np
.
eye
(
4
,
dtype
=
np
.
float32
))
@classmethod
def
with_type_check
(
cls
,
header
:
FrameID
,
pose
:
np
.
ndarray
)
->
FramedPose
:
def
with_type_check
(
cls
,
header
:
FrameID
,
pose
:
np
.
ndarray
)
->
'
FramedPose
'
:
"""
Ensures that the data type of the pose array is correct; otherwise, there might be problems when reading
the memory from C++
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment