Commit Graph

196 Commits

Author SHA1 Message Date
Robert Haschke
4db7e8eb88 definition of PropertyInitializerSource moved to Stage 2018-02-04 08:56:11 +01:00
Robert Haschke
f6253c46a4 generalize initialization source from enum to int 2018-02-04 08:56:11 +01:00
Robert Haschke
59fe1e7860 separate setValue() and setCurrentValue()
setValue() also updates the default value.
reset() reset to the default value.
setCurrentValue() only updates the current value, keeping current default.
Thus setCurrentValue() can be reverted (to default) using reset().
2018-02-04 08:55:58 +01:00
Robert Haschke
d62b85572a remove property name from InitializerFunction's signature 2018-02-03 21:45:40 +01:00
Robert Haschke
0d6dbee215 initFrom() -> configureInitFrom() + performInitFrom()
Use different function names for different semantics.
2018-02-03 21:45:40 +01:00
Robert Haschke
32a0de6bf3 countDefined(): count number of defined properties 2018-02-03 21:45:40 +01:00
Robert Haschke
f2b688d1f0 generalize GenerateGraspPose
replacing scalar graspOffset and hard-coded Euler angles with arbitrary graspFrame
2018-02-03 21:45:40 +01:00
Robert Haschke
587dcaebb2 ur5 example: use properties 2017-12-13 14:19:20 +01:00
Robert Haschke
7d8f8dfc8d PropertyMap 2017-12-13 14:19:20 +01:00
Robert Haschke
0246d60de9 DisplaySolution: struct to unify all data corresponding to a sub trajectory 2017-11-30 18:15:47 +01:00
Robert Haschke
d4c1a9de5c cleanup RemoteTaskModel
update all solution's data in solution model
2017-11-30 15:38:58 +01:00
Robert Haschke
6ff5d453be use std::unique_ptr 2017-11-24 20:10:56 +01:00
Robert Haschke
40cfceb557 fix Trusty/Indigo build 2017-11-24 15:12:38 +01:00
Robert Haschke
1bc485658e Merge branch 'wip-visualization' into wip-refactor 2017-11-24 13:40:43 +01:00
Robert Haschke
b48ba91a75 cmake compatbility to 2.8.12 2017-11-24 13:37:50 +01:00
Robert Haschke
eb1569efc3 renamed TaskListModelCache -> MetaTaskListModel 2017-11-24 11:24:18 +01:00
Robert Haschke
9dd9bd5ac4 TaskPanel: create new Display if neccessary 2017-11-24 11:24:18 +01:00
Robert Haschke
9032dabca5 navigate solutions 2017-11-24 11:24:18 +01:00
Robert Haschke
1f7184b755 ui tuning
- TabWidget for Task Tree, Settings, ...
- adjust width of columns in task tree
- right-align numbers
- some icons
2017-11-24 00:41:20 +01:00
Robert Haschke
3faea3b63a use MergeProxyModels
- derive TaskListModel from FlatMergeProxyModel
- TaskDisplay owns its TaskListModel
- TaskListModelCache as TreeMergeProxyModel
2017-11-24 00:40:48 +01:00
Robert Haschke
92ce7e7efe MergeProxyModel 2017-11-24 00:40:48 +01:00
Robert Haschke
c6c97e1836 share scene/robot model between TaskDisplay and associated TaskListModel 2017-11-20 00:57:25 +01:00
Robert Haschke
957b10a7a8 don't export SerialContainer as pluginlib class
... it's imported as builtin
2017-11-20 00:07:27 +01:00
Robert Haschke
e52dc8db11 Introspection: start solution id at index 1
... allowing 0 to have special meaning "invalid"
2017-11-20 00:04:57 +01:00
Robert Haschke
46af6a28da Introspection: helper fillSolution() adding task_id 2017-11-20 00:04:35 +01:00
Robert Haschke
936cdc4945 TaskListModel: map all encountered source indexes 2017-11-19 23:50:22 +01:00
Robert Haschke
fdc0fa012a restore panel visibility when enabling 2017-11-19 22:26:09 +01:00
Robert Haschke
428bdd7d0c fixed visibility update of scene nodes
All scene nodes are hidden if
- there is no solution to display
- or if animation finished and neither the panel nor the trail are enabled

Hiding scene nodes is done by detaching them from their parent
2017-11-19 22:26:09 +01:00
Robert Haschke
d5627c0c39 cleanup 2017-11-19 22:26:05 +01:00
v4hn
81b1281c02 add myself as maintainer & travis recipient 2017-11-13 15:39:30 +01:00
v4hn
720c08354e fix qt4 build error due to known moc problem
qt4's moc is known to have problems with C preprocessor directives.

Documented e.g. here:
https://forum.qt.io/topic/37882/qt-4-8-qt_version_check-and-moc-workaround
2017-11-13 14:56:35 +01:00
Robert Haschke
df1bbc5d32 travis config + fixes 2017-11-13 01:33:33 +01:00
Robert Haschke
e9ba2248f8 Merge remote-tracking branch 'origin/master' into wip-refactor
- cmake 3.1 required for CMAKE_CXX_STANDARD
- more old-style signal/slots for Qt4 compatibility
2017-11-13 00:07:23 +01:00
Robert Haschke
d0e3783d4e removed statistics from task description
- make TaskStatistics a latched topic too
- subscribing to topics in order (1. description, 2. statistics, 3. solution)
  should ensure that we receive those latched messages in this order
2017-11-12 21:42:48 +01:00
Robert Haschke
12095405f4 DisplaySolution: make scene representing the end state
- start state is accessible via scene->getParent()
- allows to show the final state
2017-11-12 21:42:48 +01:00
Robert Haschke
67b5a99d8d receive task solutions
- remove parent_id from StageStatistics message
2017-11-12 21:42:48 +01:00
Robert Haschke
df074b48a5 cleanup TODO 2017-11-12 21:42:48 +01:00
Robert Haschke
9c5ddd3f6d split repo into different ROS packages: msgs, core, visualization 2017-11-12 21:42:48 +01:00
v4hn
2ad6e1d622 visualization: qt4 support for signal connections 2017-11-12 12:27:35 +01:00
Robert Haschke
3f93d6c9c3 Merge branches 'wip-solution' and 'wip-interaction' into wip-refactor 2017-11-12 11:44:17 +01:00
Robert Haschke
c1d676589a display scene corresponding to SubTrajectory 2017-11-12 11:42:29 +01:00
Robert Haschke
8129caa614 TaskSolutionVisualization: added scene, renamed vars 2017-11-12 10:35:59 +01:00
Robert Haschke
c516a537f5 TaskListModel: expand view's item when dropping onto it 2017-11-12 07:01:17 +01:00
Robert Haschke
fc9ca1b624 LocalTaskModel: allow removing of stages 2017-11-12 06:59:34 +01:00
Robert Haschke
953224eba1 LocalTaskModel: populate via drag-n-drop 2017-11-12 06:59:34 +01:00
Robert Haschke
1ae3793a9d TaskModel / TaskDisplay: keep names in sync 2017-11-12 06:59:34 +01:00
Robert Haschke
2bc1b08a00 TaskDisplay: show tasks 2017-11-12 06:59:34 +01:00
Robert Haschke
81126f5ef6 DisplaySolution class 2017-11-11 19:47:43 +01:00
Robert Haschke
eb9753271a removed extra variant of Task::SolutionProcessor 2017-11-11 19:47:43 +01:00
Robert Haschke
9aba70fd59 Introspection: private implementation to speedup compilation 2017-11-11 19:47:43 +01:00