Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
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
Package registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Florian Leander Singer
RobotAPI
Commits
cb948d49
Commit
cb948d49
authored
4 years ago
by
Rainer Kartmann
Browse files
Options
Downloads
Patches
Plain Diff
Tweak interfaces
parent
a3118159
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice
+7
-6
7 additions, 6 deletions
source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice
source/RobotAPI/interface/objectpose/ObjectPoseProvider.ice
+12
-8
12 additions, 8 deletions
source/RobotAPI/interface/objectpose/ObjectPoseProvider.ice
with
19 additions
and
14 deletions
source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice
+
7
−
6
View file @
cb948d49
...
@@ -35,18 +35,19 @@ module armarx
...
@@ -35,18 +35,19 @@ module armarx
{
{
interface
ObjectPoseObserverInterface
extends
ObserverInterface
,
ObjectPoseTopic
interface
ObjectPoseObserverInterface
extends
ObserverInterface
,
ObjectPoseTopic
{
{
InfoMap
getAvailableProvidersWithInfo
();
ObjectPoseSeq
getObjectPoses
();
ObjectPoseSeq
getObjectPosesByProvider
(
string
providerName
);
void
requestObjects
(
ObjectIDSeq
objectIDs
,
long
relativeTimeoutMS
);
Ice
::
StringSeq
getAvailableProviderNames
();
Ice
::
StringSeq
getAvailableProviderNames
();
ProviderInfoMap
getAvailableProvidersWithInfo
();
ProviderInfo
getProviderInfo
(
string
providerName
);
ProviderInfo
getProviderInfo
(
string
providerName
);
bool
hasProvider
(
string
providerName
);
bool
hasProvider
(
string
providerName
);
ObjectPoseSeq
getObjectPoses
();
ObjectPoseSeq
getObjectPosesByProvider
(
string
providerName
);
int
getUpdateCounterByProvider
(
string
providerName
);
int
getUpdateCounterByProvider
(
string
providerName
);
StringIntDictionary
getAllUpdateCounters
();
StringIntDictionary
getAllUpdateCounters
();
bool
setProviderConfig
(
string
providerName
,
StringVariantBaseMap
config
);
};
};
};
};
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/interface/objectpose/ObjectPoseProvider.ice
+
12
−
8
View file @
cb948d49
...
@@ -44,14 +44,15 @@ module armarx
...
@@ -44,14 +44,15 @@ module armarx
string
project
;
///< e.g. "KIT", "YCB", "SecondHands", ...
string
project
;
///< e.g. "KIT", "YCB", "SecondHands", ...
string
name
;
///< e.g. "Amicelli", "001_chips_can", ...
string
name
;
///< e.g. "Amicelli", "001_chips_can", ...
};
};
sequence
<
ObjectID
>
ObjectIDSeq
;
struct
ObjectPose
struct
ObjectPose
{
{
ObjectTypeEnum
objectType
=
AnyObject
;
ObjectTypeEnum
objectType
=
AnyObject
;
ObjectID
objectID
;
ObjectID
objectID
;
PoseBase
objectPose
;
///< In
r
ob
ot f
rame.
PoseBase
objectPose
;
///< In
`
ob
jectPoseF
rame
`
.
PoseBase
robotPose
;
///< In global f
rame
.
string
objectPoseF
rame
;
/// Confidence in [0, 1] (1 = full, 0 = none).
/// Confidence in [0, 1] (1 = full, 0 = none).
float
confidence
=
0
;
float
confidence
=
0
;
...
@@ -60,27 +61,30 @@ module armarx
...
@@ -60,27 +61,30 @@ module armarx
string
providerName
;
string
providerName
;
};
};
sequence
<
ObjectPose
>
ObjectPoseSeq
;
sequence
<
ObjectPose
>
ObjectPoseSeq
;
struct
ProviderInfo
struct
ProviderInfo
{
{
ObjectTypeEnum
objectType
=
AnyObject
;
ObjectTypeEnum
objectType
=
AnyObject
;
StringVariantBaseMap
currentConfig
;
ObjectIDSeq
supportedObjects
;
};
};
dictionary
<
string
,
ProviderInfo
>
ProviderInfoMap
;
dictionary
<
string
,
ProviderInfo
>
InfoMap
;
interface
ObjectPoseTopic
interface
ObjectPoseTopic
{
{
void
reportProviderInfo
(
string
providerName
,
ProviderInfo
info
);
/// Signal that a new provider is now available (and ready for `getProviderInfo()`.
void
reportProviderAvailable
(
string
providerName
);
void
reportObjectPoses
(
string
providerName
,
ObjectPoseSeq
candidates
);
void
reportObjectPoses
(
string
providerName
,
ObjectPoseSeq
candidates
);
};
};
interface
ObjectPoseProvider
Interface
extends
RequestableServiceListenerInterface
interface
ObjectPoseProvider
{
{
/// Get the provider info.
ProviderInfo
getProviderInfo
();
/// Request to track the specified objects for some time.
void
requestObjects
(
ObjectIDSeq
objectIDs
,
long
relativeTimeoutMS
);
};
};
};
};
...
...
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