Skip to content
Snippets Groups Projects
Commit a6e3e00b authored by Mirko Wächter's avatar Mirko Wächter
Browse files

Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

parents 81613111 7dbafc0a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 24 deletions
data/RobotAPI/VariantInfo-RobotAPI.xml
+ 10
− 1
View file @ a6e3e00b
......@@ -31,7 +31,8 @@
memberName="platformUnitObserver"
getterName="getPlatformUnitObserver"
propertyName="PlatformUnitObserverName"
propertyIsOptional="false" />
propertyIsOptional="true"
propertyDefaultValue="PlatformUnitObserver" />
<Proxy include="RobotAPI/interface/units/InertialMeasurementUnit.h"
humanName="Inertial Measurement Unit Observer"
typeName="InertialMeasurementUnitObserverInterfacePrx"
......@@ -56,6 +57,14 @@
propertyName="TCPControlUnitName"
propertyIsOptional="true"
propertyDefaultValue="TCPControlUnit" />
<Proxy include="RobotAPI/interface/units/TCPControlUnit.h"
humanName="TCPControlUnitObserver"
typeName="TCPControlUnitObserverInterfacePrx"
memberName="tcpControlUnitObserver"
getterName="getTCPControlUnitObserver"
propertyName="TCPControlUnitObserverName"
propertyIsOptional="true"
propertyDefaultValue="TCPControlUnitObserver" />
<Proxy include="RobotAPI/interface/units/HapticUnit.h"
humanName="Haptic Unit Observer"
typeName="HapticUnitObserverInterfacePrx"
......
source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.h
+ 1
− 1
View file @ a6e3e00b
......@@ -28,7 +28,7 @@
#include <Core/core/IceManager.h>
#include <Gui/ArmarXGuiLib/utility/IceProxyFinder.h>
#include <Gui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h>
namespace Ui {
class HandUnitConfigDialog;
......
source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h
+ 2
− 2
View file @ a6e3e00b
......@@ -28,8 +28,8 @@
/* ArmarX headers */
#include "ui_HandUnitGuiPlugin.h"
#include <Core/core/Component.h>
#include <Gui/ArmarXGuiLib/ArmarXGuiPlugin.h>
#include <Gui/ArmarXGuiLib/ArmarXComponentWidgetController.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXGuiPlugin.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXComponentWidgetController.h>
#include <RobotAPI/interface/units/HandUnitInterface.h>
......
source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h
+ 2
− 2
View file @ a6e3e00b
......@@ -28,8 +28,8 @@
/* ArmarX headers */
#include "ui_HapticUnitGuiPlugin.h"
#include <Core/core/Component.h>
#include <Gui/ArmarXGuiLib/ArmarXGuiPlugin.h>
#include <Gui/ArmarXGuiLib/ArmarXComponentWidgetController.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXGuiPlugin.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXComponentWidgetController.h>
#include <Core/observers/Observer.h>
/* Qt headers */
......
source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp
+ 1
− 1
View file @ a6e3e00b
......@@ -34,7 +34,7 @@
#include <IceUtil/UUID.h>
#include <Gui/ArmarXGuiLib/utility/IceProxyFinder.h>
#include <Gui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h>
using namespace armarx;
......
source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h
+ 1
− 1
View file @ a6e3e00b
......@@ -30,7 +30,7 @@
#include <Core/core/services/tasks/RunningTask.h>
#include <Core/core/IceManager.h>
#include <Core/core/ManagedIceObject.h>
#include <Gui/ArmarXGuiLib/utility/IceProxyFinder.h>
#include <Gui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h>
namespace Ui {
class KinematicUnitConfigDialog;
......
source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h
+ 2
− 2
View file @ a6e3e00b
......@@ -30,8 +30,8 @@
#include <RobotAPI/interface/units/KinematicUnitInterface.h>
#include <RobotAPI/components/DebugDrawer/DebugDrawerComponent.h>
#include <Gui/ArmarXGuiLib/ArmarXGuiPlugin.h>
#include <Gui/ArmarXGuiLib/ArmarXComponentWidgetController.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXGuiPlugin.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXComponentWidgetController.h>
#include <Core/core/Component.h>
......
source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitConfigDialog.h
+ 1
− 1
View file @ a6e3e00b
......@@ -26,7 +26,7 @@
#include <QDialog>
#include <Gui/ArmarXGuiLib/utility/IceProxyFinder.h>
#include <Gui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h>
#include <RobotAPI/interface/units/PlatformUnitInterface.h>
namespace Ui {
......
source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h
+ 3
− 3
View file @ a6e3e00b
......@@ -27,10 +27,10 @@
/* ArmarX headers */
#include "ui_PlatformUnitGuiPlugin.h"
#include <Gui/ArmarXGuiLib/utility/JoystickControlWidget.h>
#include <Gui/libraries/ArmarXGuiBase/widgets/JoystickControlWidget.h>
#include <Core/core/Component.h>
#include <Gui/ArmarXGuiLib/ArmarXGuiPlugin.h>
#include <Gui/ArmarXGuiLib/ArmarXComponentWidgetController.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXGuiPlugin.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXComponentWidgetController.h>
#include <RobotAPI/interface/units/PlatformUnitInterface.h>
......
source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.cpp
+ 1
− 1
View file @ a6e3e00b
......@@ -31,7 +31,7 @@
#include <IceUtil/UUID.h>
#include <Gui/ArmarXGuiLib/utility/IceProxyFinder.h>
#include <Gui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h>
#include <RobotAPI/interface/core/RobotState.h>
......
source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.h
+ 1
− 1
View file @ a6e3e00b
......@@ -30,7 +30,7 @@
#include <Core/core/services/tasks/RunningTask.h>
#include <Core/core/IceManager.h>
#include <Core/core/ManagedIceObject.h>
#include <Gui/ArmarXGuiLib/utility/IceProxyFinder.h>
#include <Gui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h>
namespace Ui {
class RobotViewerConfigDialog;
......
source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h
+ 2
− 2
View file @ a6e3e00b
......@@ -30,8 +30,8 @@
#include <RobotAPI/components/DebugDrawer/DebugDrawerComponent.h>
#include <RobotAPI/libraries/core/remoterobot/RemoteRobot.h>
#include <Gui/ArmarXGuiLib/ArmarXGuiPlugin.h>
#include <Gui/ArmarXGuiLib/ArmarXComponentWidgetController.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXGuiPlugin.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXComponentWidgetController.h>
#include <Core/core/Component.h>
......
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.h
+ 1
− 1
View file @ a6e3e00b
......@@ -27,7 +27,7 @@
#include "ui_ArmarXPlotter.h"
// ArmarX
#include <Gui/ArmarXGuiLib/ArmarXComponentWidgetController.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXComponentWidgetController.h>
#include <Gui/gui-plugins/ObserverPropertiesPlugin/ObserverItemModel.h>
#include <Core/core/Component.h>
......
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotterDialog.ui
+ 1
− 1
View file @ a6e3e00b
......@@ -254,7 +254,7 @@
<customwidget>
<class>FilterableTreeView</class>
<extends>QTreeView</extends>
<header location="global">Gui/ArmarXGui/Widgets/FilterableTreeView.h</header>
<header location="global">Gui/libraries/ArmarXGuiBase/widgets/FilterableTreeView.h</header>
</customwidget>
</customwidgets>
<resources/>
......
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMover.h
+ 2
− 2
View file @ a6e3e00b
......@@ -36,9 +36,9 @@
#include <VirtualRobot/Nodes/RobotNode.h>
#include <VirtualRobot/RobotNodeSet.h>
#include <VirtualRobot/IK/DifferentialIK.h>
#include <Gui/ArmarXGuiLib/utility/IceProxyFinder.h>
#include <Gui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h>
#include <Gui/ArmarXGuiLib/ArmarXComponentWidgetController.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXComponentWidgetController.h>
// Qt includes
#include <QDialog>
......
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMoverConfigDialog.h
+ 1
− 1
View file @ a6e3e00b
......@@ -28,7 +28,7 @@
#include <Core/core/IceManager.h>
#include <Gui/ArmarXGuiLib/utility/IceProxyFinder.h>
#include <Gui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h>
namespace Ui {
class TCPMoverConfigDialog;
......
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.h
+ 1
− 1
View file @ a6e3e00b
......@@ -24,7 +24,7 @@
#ifndef ARMARX_COMPONENT_MDIGUIPLUGIN_H
#define ARMARX_COMPONENT_MDIGUIPLUGIN_H
#include <Gui/ArmarXGuiLib/ArmarXGuiPlugin.h>
#include <Gui/libraries/ArmarXGuiBase/ArmarXGuiPlugin.h>
#include <Core/core/system/ImportExportComponent.h>
......
source/RobotAPI/interface/hardware/BusInspectionInterface.ice
+ 1
− 0
View file @ a6e3e00b
......@@ -67,6 +67,7 @@ module armarx
string type;
string node;
int heartBeatErrorCounter;
string firmwareBuildDate;
DeviceStatus status;
};
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment