-
- Downloads
Merge branch 'master' of https://gitlab.com/ArmarX/ArmarXGui
Conflicts: source/ArmarXGui/gui-plugins/StatechartEditorPlugin/test/XmlReaderTest.cpp
No related branches found
No related tags found
Showing
- data/ArmarXGui/GuiDefaultConfigs/Statecharts.armarxgui 1 addition, 1 deletiondata/ArmarXGui/GuiDefaultConfigs/Statecharts.armarxgui
- source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp 111 additions, 62 deletionssource/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
- source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h 6 additions, 1 deletionsource/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
- source/ArmarXGui/applications/ArmarXGui/Widgets/UseCaseSelectorItem.cpp 21 additions, 6 deletions...ui/applications/ArmarXGui/Widgets/UseCaseSelectorItem.cpp
- source/ArmarXGui/applications/ArmarXGui/Widgets/UseCaseSelectorItem.h 1 addition, 1 deletion...XGui/applications/ArmarXGui/Widgets/UseCaseSelectorItem.h
- source/ArmarXGui/gui-plugins/ScenarioManager/controller/SettingsController.cpp 13 additions, 0 deletions...plugins/ScenarioManager/controller/SettingsController.cpp
- source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.cpp 9 additions, 5 deletions...i-plugins/ScenarioManager/gui/detailedapplicationview.cpp
- source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenarioitem.cpp 38 additions, 18 deletions...rmarXGui/gui-plugins/ScenarioManager/gui/scenarioitem.cpp
- source/ArmarXGui/gui-plugins/StatechartEditorPlugin/io/XmlReader.cpp 57 additions, 11 deletions...rXGui/gui-plugins/StatechartEditorPlugin/io/XmlReader.cpp
- source/ArmarXGui/gui-plugins/StatechartEditorPlugin/io/XmlReader.h 3 additions, 1 deletion...marXGui/gui-plugins/StatechartEditorPlugin/io/XmlReader.h
- source/ArmarXGui/gui-plugins/StatechartEditorPlugin/model/StateTreeModel.cpp 4 additions, 4 deletions...i-plugins/StatechartEditorPlugin/model/StateTreeModel.cpp
- source/ArmarXGui/gui-plugins/StatechartEditorPlugin/test/XmlReaderTest.cpp 16 additions, 16 deletions...gui-plugins/StatechartEditorPlugin/test/XmlReaderTest.cpp
- source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.cpp 1 addition, 1 deletion...rXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.cpp
- source/ArmarXGui/gui-plugins/StatechartViewerPlugin/layout/LayoutController.cpp 4 additions, 3 deletions...lugins/StatechartViewerPlugin/layout/LayoutController.cpp
- source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt 2 additions, 0 deletionssource/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt
- source/ArmarXGui/libraries/ArmarXGuiBase/PluginCache.cpp 351 additions, 0 deletionssource/ArmarXGui/libraries/ArmarXGuiBase/PluginCache.cpp
- source/ArmarXGui/libraries/ArmarXGuiBase/PluginCache.h 68 additions, 0 deletionssource/ArmarXGui/libraries/ArmarXGuiBase/PluginCache.h
Loading
Please register or sign in to comment