Merge remote-tracking branch 'origin/master' into RobotStateHistory
* origin/master: Scaling support for RobotStateComponent (also fixes issues with poses of scaled models in the world) fixed statechart profile prefix RobotStateComponentName is added as an optional property..It was hard coded fixed kinematicunit gui dialog: combobox update was not correctly handled fixed ft observer visu update cycle optimized force torque observer performance Conflicts: source/RobotAPI/components/RobotState/RobotStateComponent.h
Showing
- scenarios/tests/StatechartProfilesTestArmar3Simulation/config/RobotControl.cfg 1 addition, 1 deletion...chartProfilesTestArmar3Simulation/config/RobotControl.cfg
- scenarios/tests/StatechartProfilesTestArmar3a/config/RobotControl.cfg 1 addition, 1 deletion...sts/StatechartProfilesTestArmar3a/config/RobotControl.cfg
- source/RobotAPI/components/RobotState/RobotStateComponent.cpp 14 additions, 0 deletions...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
- source/RobotAPI/components/RobotState/RobotStateComponent.h 4 additions, 1 deletionsource/RobotAPI/components/RobotState/RobotStateComponent.h
- source/RobotAPI/components/units/ForceTorqueObserver.cpp 43 additions, 20 deletionssource/RobotAPI/components/units/ForceTorqueObserver.cpp
- source/RobotAPI/components/units/ForceTorqueObserver.h 5 additions, 3 deletionssource/RobotAPI/components/units/ForceTorqueObserver.h
- source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp 28 additions, 11 deletions...plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp
- source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h 4 additions, 0 deletions...i-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h
- source/RobotAPI/interface/core/RobotState.ice 8 additions, 0 deletionssource/RobotAPI/interface/core/RobotState.ice
- source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp 8 additions, 2 deletionssource/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
- source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h 1 addition, 1 deletionsource/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
- source/RobotAPI/statecharts/operations/RobotControl.cpp 1 addition, 1 deletionsource/RobotAPI/statecharts/operations/RobotControl.cpp
- source/RobotAPI/statecharts/operations/RobotControl.h 2 additions, 0 deletionssource/RobotAPI/statecharts/operations/RobotControl.h
Loading
Please register or sign in to comment