Commits · 2683f4b9c8d938d647590f0bca4772b79847aca6 · Software / ArmarX / RobotAPI · GitLab

Snippets Groups Projects

Mar 18, 2021
- Merge branch '32-add-object-memory' into 'armem/dev' · 2683f4b9
  Fabian Reister authored 4 years ago
  
  Resolve "Add Object Memory" See merge request ArmarX/RobotAPI!128
  2683f4b9
- minor · a01f1ef9
  Fabian Reister authored 4 years ago
  
  a01f1ef9
- using proper time type · 24d95b83
  Fabian Reister authored 4 years ago
  
  24d95b83
Mar 17, 2021
- IntEnum generation aron · 0d0309b1
  Fabian Tërnava authored 4 years ago
  
  0d0309b1
- cleanup · c3f8cfb0
  Fabian Reister authored 4 years ago
  
  c3f8cfb0
- aron conversion · 4af23421
  Fabian Reister authored 4 years ago
  
  4af23421
- aron ObjectPose: changing bounding box field name · 21d64ab3
  Fabian Reister authored 4 years ago
  
  21d64ab3
- aron objectpose: successfully generated cpp code · f6ea7a99
  Fabian Reister authored 4 years ago
  
  f6ea7a99
- sorting io args; - const · 6d610e3a
  Fabian Reister authored 4 years ago
  
  6d610e3a
- - duplicate · d9b5fdda
  Fabian Reister authored 4 years ago
  
  d9b5fdda
- + aron ObjectAttachmentInfo · 51d7bf4a
  Fabian Reister authored 4 years ago
  
  51d7bf4a
- Merge remote-tracking branch 'origin/armem/dev' into 32-add-object-memory · bd5fabc4
  Fabian Reister authored 4 years ago
  
  bd5fabc4
- Fix include path in IVTCByteImageTest · 8572459c
  Rainer Kartmann authored 4 years ago
  
  8572459c
- removed ivt prefix on include (not working on several systems) · c7fb0c6d
  Fabian Tërnava authored 4 years ago
  
  c7fb0c6d
- Merge remote-tracking branch 'origin/aron/dev' into armem/dev · 3269dd5c
  Rainer Kartmann authored 4 years ago
  
  3269dd5c
- added robot state component poll to robot sensor memory · ebdb4d02
  Fabian Tërnava authored 4 years ago
  
  ebdb4d02
- Merge remote-tracking branch 'origin/aron/dev' into armem/dev · fa620961
  Rainer Kartmann authored 4 years ago
  
  # Conflicts: # source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp # source/RobotAPI/libraries/armem_gui/instance/InstanceView.h # source/RobotAPI/libraries/armem_gui/instance/TreeTypedDataVisitor.cpp # source/RobotAPI/libraries/armem_gui/instance/TreeTypedDataVisitor.h # source/RobotAPI/libraries/armem_gui/memory/TreeWidget.cpp
  fa620961
- auto -y aron::ObjectPose · ca457615
  Fabian Reister authored 4 years ago
  
  ca457615
- forward decl · db75da3f
  Fabian Reister authored 4 years ago
  
  db75da3f
- removing fixmes · 09660b81
  Fabian Reister authored 4 years ago
  
  09660b81
- int enum to uppercase · e5ce3ae7
  Fabian Reister authored 4 years ago
  
  e5ce3ae7
- enabled aron gen of ObjectPose · 66f3471b
  Fabian Reister authored 4 years ago
  
  66f3471b
- aron conversions: skeleton · 081e18f3
  Fabian Reister authored 4 years ago
  
  081e18f3
- first version of aron ObjectPose · d5c034c7
  Fabian Reister authored 4 years ago
  
  d5c034c7
- adding files to cmake · 395ffc39
  Fabian Reister authored 4 years ago
  
  395ffc39
- aron: adding new files · dc0b2e92
  Fabian Reister authored 4 years ago
  
  dc0b2e92
- Add and use LifecycleServer and Client · 6b05b786
  Rainer Kartmann authored 4 years ago
  
  6b05b786
- Check for layouts in useSplitter() · c307bce4
  Rainer Kartmann authored 4 years ago
  
  c307bce4
Mar 13, 2021
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into aron/dev · 015d0f7e
  Fabian Tërnava authored 4 years ago
  
  015d0f7e
- Fixed missing header include · 41990a26
  Christoph Pohl authored 4 years ago
  
  41990a26
Mar 12, 2021
- Remove includes · 2397887e
  Rainer Kartmann authored 4 years ago
  
  2397887e
- Move more code to MemoryViewer · 143828e4
  Rainer Kartmann authored 4 years ago
  
  143828e4
- Move more code to MemoryViewer · a8835f28
  Rainer Kartmann authored 4 years ago
  
  a8835f28
- Refactor code out of ArMemMemoryViewer · 753c394f
  Rainer Kartmann authored 4 years ago
  
  753c394f
- Move more code to utils · 88e7c201
  Rainer Kartmann authored 4 years ago
  
  88e7c201
- ArMemMemoryViewer: Move update handling widget to own file · f88f89e3
  Rainer Kartmann authored 4 years ago
  
  f88f89e3
Mar 11, 2021
- Merge branch 'CartesianImpedanceControllerGui' into 'master' · dfe887c8
  Raphael Grimm authored 4 years ago
  
  Add changes to CartesianImpedanceController GUI See merge request ArmarX/RobotAPI!122
  dfe887c8
Mar 09, 2021
- Merge branch 'master' into 'armem/dev' · 6149152e
  Rainer Kartmann authored 4 years ago
  
  Update armem/dev to master See merge request ArmarX/RobotAPI!127
  6149152e
- ArViz Performance: Do not use Simox functions for ArrowCircle · 9f5d0a93
  Fabian Paus authored 4 years ago
  
  9f5d0a93
- ArViz: Use reasonable parameter name · d176bb00
  Fabian Paus authored 4 years ago
  
  d176bb00