Skip to content
Snippets Groups Projects
Commit 9a917951 authored by Fabian Reister's avatar Fabian Reister
Browse files

update

parent 57539bfd
No related branches found
No related tags found
No related merge requests found
......@@ -33,6 +33,7 @@
#include "ArmarXCore/core/services/tasks/TaskUtil.h"
#include "ArmarXCore/util/CPPUtility/trace.h"
#include "ArmarXGui/libraries/RemoteGui/Client/Widgets.h"
#include "RobotAPI/libraries/core/remoterobot/RemoteRobot.h"
......@@ -261,6 +262,11 @@ void armarx::nav::components::Navigator::createRemoteGuiTab()
GridLayout grid;
int row = 0;
{
tab.controlGroup.continueButton.setLabel("Continue");
tab.controlGroup.pauseButton.setLabel("Pause");
tab.controlGroup.moveToButton.setLabel("MoveTo");
grid.add(Label("X"), {row, 0}).add(tab.targetPoseGroup.targetPoseX, {row, 1});
++row;
......@@ -295,7 +301,7 @@ void armarx::nav::components::Navigator::createRemoteGuiTab()
tab.controlGroup.group.setLabel("Control");
GridLayout grid;
int row = 0;
int row = 10;
{
grid.add(tab.controlGroup.moveToButton, {row, 1});
++row;
......@@ -313,7 +319,10 @@ void armarx::nav::components::Navigator::createRemoteGuiTab()
ARMARX_TRACE;
RemoteGui_createTab(getName(), tab.targetPoseGroup.group, &tab);
tab.hbox.addChild(tab.targetPoseGroup.group);
tab.hbox.addChild(tab.controlGroup.group);
RemoteGui_createTab(getName(), tab.hbox, &tab);
}
void armarx::nav::components::Navigator::RemoteGui_update()
......
......@@ -130,6 +130,7 @@ namespace armarx::nav::components
struct RemoteGuiTab : armarx::RemoteGui::Client::Tab
{
armarx::RemoteGui::Client::HBoxLayout hbox;
struct
{
......@@ -151,7 +152,6 @@ namespace armarx::nav::components
armarx::RemoteGui::Client::Button pauseButton;
armarx::RemoteGui::Client::Button continueButton;
} controlGroup;
};
RemoteGuiTab tab;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment