Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
Navigation
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
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
Skills
Navigation
Commits
495f7ad0
Commit
495f7ad0
authored
3 years ago
by
Fabian Reister
Browse files
Options
Downloads
Patches
Plain Diff
x traces
parent
54d18270
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/Navigation/components/Navigator/CMakeLists.txt
+1
-1
1 addition, 1 deletion
source/Navigation/components/Navigator/CMakeLists.txt
source/Navigation/components/Navigator/Navigator.cpp
+17
-2
17 additions, 2 deletions
source/Navigation/components/Navigator/Navigator.cpp
with
18 additions
and
3 deletions
source/Navigation/components/Navigator/CMakeLists.txt
+
1
−
1
View file @
495f7ad0
...
...
@@ -20,7 +20,7 @@ armarx_add_component(
ArmarXCore
## ArmarXCoreComponentPlugins # For DebugObserver plugin.
# ArmarXGui
##
ArmarXGuiComponentPlugins # For RemoteGui plugin.
ArmarXGuiComponentPlugins
# For RemoteGui plugin.
# RobotAPI
RobotAPICore
RobotAPIInterfaces
...
...
This diff is collapsed.
Click to expand it.
source/Navigation/components/Navigator/Navigator.cpp
+
17
−
2
View file @
495f7ad0
...
...
@@ -31,6 +31,7 @@
#include
<Eigen/src/Geometry/Transform.h>
#include
"ArmarXCore/core/services/tasks/TaskUtil.h"
#include
"ArmarXCore/util/CPPUtility/trace.h"
#include
"RobotAPI/libraries/core/remoterobot/RemoteRobot.h"
...
...
@@ -53,6 +54,10 @@ void armarx::nav::components::Navigator::onInitComponent()
void
armarx
::
nav
::
components
::
Navigator
::
onConnectComponent
()
{
{
createRemoteGuiTab
();
RemoteGui_startRunningTask
();
}
}
void
armarx
::
nav
::
components
::
Navigator
::
onDisconnectComponent
()
...
...
@@ -134,6 +139,8 @@ void armarx::nav::components::Navigator::resumeMovement(const Ice::Current&)
armarx
::
PropertyDefinitionsPtr
armarx
::
nav
::
components
::
Navigator
::
createPropertyDefinitions
()
{
ARMARX_TRACE
;
armarx
::
PropertyDefinitionsPtr
def
=
new
ComponentPropertyDefinitions
(
getConfigIdentifier
());
// Publish to a topic (passing the TopicListenerPrx).
...
...
@@ -156,6 +163,8 @@ armarx::PropertyDefinitionsPtr armarx::nav::components::Navigator::createPropert
armarx
::
nav
::
core
::
StaticScene
armarx
::
nav
::
components
::
Navigator
::
staticScene
()
{
ARMARX_TRACE
;
core
::
StaticScene
scene
;
objpose
::
ObjectPoseSeq
objectPoses
=
ObjectPoseClientPluginUser
::
getObjectPoses
();
...
...
@@ -167,6 +176,8 @@ armarx::nav::core::StaticScene armarx::nav::components::Navigator::staticScene()
VirtualRobot
::
RobotPtr
armarx
::
nav
::
components
::
Navigator
::
getRobot
()
{
ARMARX_TRACE
;
auto
robot
=
RemoteRobot
::
createLocalCloneFromFile
(
getRobotStateComponent
(),
VirtualRobot
::
RobotIO
::
RobotDescription
::
eFull
);
// auto robot = RemoteRobot::createLocalClone(getRobotStateComponent());
...
...
@@ -180,9 +191,9 @@ VirtualRobot::RobotPtr armarx::nav::components::Navigator::getRobot()
return
robot
;
}
void
armarx
::
nav
::
components
::
Navigator
::
createRemoteGuiTab
()
{
ARMARX_TRACE
;
using
namespace
armarx
::
RemoteGui
::
Client
;
// Setup the widgets.
...
...
@@ -209,12 +220,16 @@ void armarx::nav::components::Navigator::createRemoteGuiTab()
}
VBoxLayout
root
=
{
grid
,
VSpacer
()};
ARMARX_TRACE
;
RemoteGui_createTab
(
getName
(),
root
,
&
tab
);
}
void
armarx
::
nav
::
components
::
Navigator
::
RemoteGui_update
()
{
ARMARX_TRACE
;
// if (tab.boxLayerName.hasValueChanged() || tab.numBoxes.hasValueChanged())
// {
// std::scoped_lock lock(propertiesMutex);
...
...
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