Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ArmarXGui
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

c5c7b482

Commit c5c7b482 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'ParameterizedDragnDrop' into 'master'

Parameterized dragn drop

Statechart group can be dragged and dropped from the statechart editor to scenario manager with correct parameterization for that statechart group

See merge request !21

parents cd8b4d58 199fd469

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp 43 additions, 21 deletions

...ins/ScenarioManager/controller/ScenarioListController.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.h 1 addition, 1 deletion

...ugins/ScenarioManager/controller/ScenarioListController.h
source/ArmarXGui/gui-plugins/ScenarioManager/gui/applicationdatabasemodel.cpp 1 addition, 0 deletions

...-plugins/ScenarioManager/gui/applicationdatabasemodel.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariomodel.cpp 4 additions, 4 deletions

...marXGui/gui-plugins/ScenarioManager/gui/scenariomodel.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariomodel.h 1 addition, 1 deletion

...ArmarXGui/gui-plugins/ScenarioManager/gui/scenariomodel.h
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/CMakeLists.txt 2 additions, 1 deletion

...marXGui/gui-plugins/StatechartEditorPlugin/CMakeLists.txt
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.cpp 45 additions, 2 deletions

...ui-plugins/StatechartEditorPlugin/StateTreeController.cpp
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.h 3 additions, 0 deletions

.../gui-plugins/StatechartEditorPlugin/StateTreeController.h

with 100 additions and 30 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment