Resolve "Add gui actions to Grasp Memory to visualize Grasps" (!246) · Merge requests · Software / ArmarX / RobotAPI · GitLab

Snippets Groups Projects

Merged Rainer Kartmann requested to merge 72-add-gui-actions-to-grasp-memory-to-visualize-grasps into master 2 years ago

May 31, 2022
- Update usage of time in grasp provider example · c46d9d7d
  Rainer Kartmann authored 2 years ago
  
  c46d9d7d
- Merge branch 'master' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps · dbf39b5e
  Rainer Kartmann authored 2 years ago
  
  # Conflicts: # source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.cpp # source/RobotAPI/libraries/GraspingUtility/GraspCandidateVisu.cpp
  dbf39b5e
- Use fromIce from ArmarXCore · 9d1c9aa8
  Rainer Kartmann authored 2 years ago
  
  9d1c9aa8
- Merge branch '94-gui-crashes-in-context-menus-of-memory-viewer' into... · 64aa3abf
  Rainer Kartmann authored 2 years ago
  
  Merge branch '94-gui-crashes-in-context-menus-of-memory-viewer' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps # Conflicts: # source/RobotAPI/libraries/aron/converter/eigen/EigenConverter.h
  64aa3abf
May 27, 2022

Merge remote-tracking branch 'origin/master' into... · ca5d5328

alissa authored 2 years ago

Merge remote-tracking branch 'origin/master' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps

ca5d5328

May 25, 2022
- Replace all memcpy's by Eigen::Map<>. · 21e225d8
  Rainer Kartmann authored 2 years ago
  
  Fix segfault in Memory Viewer when displaying Pose Fix return type of ConvertToArray()
  21e225d8
May 22, 2022
- Merge remote-tracking branch 'origin/master' into... · 59a4d382
  alissa authored 2 years ago
  
  Merge remote-tracking branch 'origin/master' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps
  59a4d382
- Added action for highlighting grasp candidates · 7584b4c2
  alissa authored 2 years ago
  
  7584b4c2
May 08, 2022

Merge remote-tracking branch 'origin/master' into... · 726cb89b

alissa authored 2 years ago

Merge remote-tracking branch 'origin/master' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps

726cb89b

May 01, 2022
- graspmem: add optional automatic tracking of new entities · e5cad9e9
  alissa authored 2 years ago
  
  e5cad9e9
- graspmem: added tracking action to multiple hierarchy levels · 2687c4eb
  alissa authored 2 years ago
  
  2687c4eb
- graspmem: switch position of tracking option in context menu to first · 910d6374
  alissa authored 2 years ago
  
  910d6374
- Change color of unreachable Grasp Candidates from red to orange · 62ca95b5
  alissa authored 2 years ago
  
  62ca95b5
- Exclude KnownGraspCandidate CoreSegment from ContextMenu actions · 48cab31d
  alissa authored 2 years ago
  
  48cab31d
- Merge remote-tracking branch 'origin/master' into... · 8221c697
  alissa authored 2 years ago
  
  Merge remote-tracking branch 'origin/master' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps
  8221c697
Apr 21, 2022

Merge remote-tracking branch 'origin/master' into... · 7c9f08dd

alissa authored 2 years ago

Merge remote-tracking branch 'origin/master' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps

7c9f08dd

Apr 15, 2022
- Added visual tracking of candidates for entities as context menu option · 83f179cf
  alissa authored 2 years ago
  
  83f179cf
Apr 06, 2022

Merge remote-tracking branch 'origin/master' into... · 38a082c2

alissa authored 2 years ago

Merge remote-tracking branch 'origin/master' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps

38a082c2

Mar 29, 2022
- Merge remote-tracking branch 'origin/master' into... · 91891871
  alissa authored 3 years ago
  
  Merge remote-tracking branch 'origin/master' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps
  91891871
- gui actions for visualization of grasp hierarchy · 89a38909
  alissa authored 3 years ago
  
  89a38909