Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to fdf25d0ba573a8a5905f4dc46fc206976a07c59b (commit) via 012942810827c0e201a91e79cc64572b254e8fa8 (commit) via a9cf4d573b5886da70b76308a07493d0a6e1eebd (commit) via 7f2d276c9a18a1d29adbed5906befb22a34ef14d (commit) via 40912a7b0cb495b178b3755a83b647eb45ac08d6 (commit) via e6ca1203e130b0b32f853019b938c4e33c37a826 (commit) via 0ecbf7c5f20fc6a3be74f51fb2eb0e12f485be00 (commit) via 56c48b8a866fd899a3d23db9cd4f82ad556070f9 (commit) via 23ad5a216063f6d39a2525176998c30fcbd0fb43 (commit) via 49a6aefec5fc0fdf47c0a4ce4474e4834c61d797 (commit) via aee8c0a7b3c3c4eb3c1318866320554961e8b46d (commit) via 11d832bebeb928867681aec8fe5f72e80f39d977 (commit) via cd2ade005a1a9d002c15a9a7e59157b19de3524e (commit) via 71c107744fb385997c7f4cc4276663743e272c54 (commit) via e2fe7bf33977374ff59ded69cbe81a5b335224b9 (commit) via ac6ca63474af331f668f319bedb71af43653b89f (commit) via a5f032bd56792304e5b048ab5279096d65abbdcc (commit) via e655710f8019159a089a0a6cf83a45877e123e66 (commit) via c11bd7025eb5e83cc9850c9b1cc6fc936cb35669 (commit) via 8b0c90235ec9f98ccbffc999fce7710fd99e6eeb (commit) via 7383cbc889c98bc2039030a2a3ddc7914aed909e (commit) via 5ad234ae02c63f071850a06d45fb8249281f9314 (commit) via 2128e889ace9c7c5e41f25b169d1f1c4c9a76ea7 (commit) via 1d306f212b1d6237663afe043b14f59b5bf50052 (commit) via 4d08ffe4f36bfd666c019004b98ee0bdab8cf154 (commit) via 817de047259d09a1d95f2aca3695e7350d04b68d (commit) via 19ce4d0e39b1094703d454db8265b9f0fbf6331f (commit) via 8c1aa9014abec21a9b6df8404ba59c11db9bbaf5 (commit) via 35a5f413386a8b2a9d565451152d4c3c94eda296 (commit) via 921c1dae4f690e16b027fa4f3607517338f2d71c (commit) via b7d5db3008e1db496c0485c614cece30e4570526 (commit) via 891e7d8483f91cf397b1df3465d9a3af776be3dd (commit) via 480da4a8c46b1b3870f91d883812af05286d0de8 (commit) via 338d84a6aa01150f24b16dd5dd81bb6b8f93a695 (commit) via b6d6ef265baa7eeefe326a0ab2fa1078cbc584de (commit) via 4abb38ff69c300a3c0097e378436ffb1965566eb (commit) via dc53e8042b86fa4d8e9559cac217967c159320ee (commit) via f54d615201b457eea660dd2a30c7c2f5a0577ea9 (commit) via 182676f9ae9f99399bccefb681f8f920483878ff (commit) via 11e641d8e65e763e61329cd8ed9d46731fc9a482 (commit) via 4d6b8b9217b49181769d718f8a7d2f8b2356a855 (commit) via 93c3f880af3d5d4748831c43848bad3cc649e030 (commit) via d49761586d7c9693a74123c7e23674956393e009 (commit) via c5ead7c94daaf9d6427721475fe88ad2bc3e10df (commit) via edad2d54a1ccbcdaf1d69aced2ce23bef6f7e91c (commit) via dcc41e581bd5889e28b62f2e8eba192ac30b5285 (commit) via 5e204dc515656db7957ddb5a7dbc1b05bf5b7cf7 (commit) via fd8c527095b3be456fd0d02cf6b5d967cd019fd3 (commit) via bcb351a807ceb963546e2ea4aa0d88eef971a2ed (commit) via a06331bd0f4fcc5daec540b4f65372897d3324c5 (commit) via 5ae01f8a22ba112adaa7c81047244eec23c7578f (commit) via 86ab666a3fa2f7ab38620f3c040185e7e61571f4 (commit) via 2783e6cdf27c7030dbe5fb133954b291833a60ea (commit) from 449543aaefbcc0aa03320ef95d1405297359bd9d (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --------------------------------------------------------------- commit fdf25d0ba573a8a5905f4dc46fc206976a07c59b Merge: 449543a 0129428 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Apr 12 10:34:48 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Apr 12 10:34:48 2018 +0200 Merge remote-tracking branch 'origin/timn/webview-2.0' into common/current http://git.fawkesrobotics.org/fawkes.git/commit/fdf25d0 http://trac.fawkesrobotics.org/changeset/fdf25d0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- .../templates/typescript-angular.ts.api.template | 6 +- .../frontend/src/assets => res/webview}/.gitkeep | 0 res/webview/chrome/dots.gif | Bin 50 -> 0 bytes res/webview/chrome/navlogo.png | Bin 1555 -> 0 bytes res/webview/chrome/navlogo.xcf | Bin 3415 -> 0 bytes res/webview/chrome/topbar_gradient.png | Bin 350 -> 0 bytes res/webview/chrome/topbar_gradient2.png | Bin 309 -> 0 bytes res/webview/css/blackboard.css | 8 - .../css/jqtheme/images/animated-overlay.gif | Bin 1738 -> 0 bytes .../jqtheme/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 212 -> 0 bytes .../jqtheme/images/ui-bg_flat_75_ffffff_40x100.png | Bin 208 -> 0 bytes .../jqtheme/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 335 -> 0 bytes .../ui-bg_highlight-soft_50_880000_1x100.png | Bin 358 -> 0 bytes .../ui-bg_highlight-soft_50_e6e6e6_1x100.png | Bin 278 -> 0 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 280 -> 0 bytes .../images/ui-bg_inset-soft_95_fef1ec_1x100.png | Bin 370 -> 0 bytes .../css/jqtheme/images/ui-icons_222222_256x240.png | Bin 6922 -> 0 bytes .../css/jqtheme/images/ui-icons_880000_256x240.png | Bin 4549 -> 0 bytes .../css/jqtheme/images/ui-icons_888888_256x240.png | Bin 6999 -> 0 bytes .../css/jqtheme/images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 0 bytes .../css/jqtheme/images/ui-icons_dddddd_256x240.png | Bin 6923 -> 0 bytes res/webview/css/jqtheme/jquery-ui.custom.css | 1162 -------------------- res/webview/css/rrdweb.css | 4 - res/webview/css/webview-ptzcam.css | 13 - res/webview/css/webview.css | 131 --- res/webview/fawkes.png | Bin 2006 -> 0 bytes res/webview/images/favicon.ico | Bin 2966 -> 0 bytes res/webview/images/favicon.png | Bin 280 -> 0 bytes res/webview/images/icon-triangle-e.png | Bin 407 -> 0 bytes res/webview/images/icon-triangle-s.png | Bin 403 -> 0 bytes res/webview/js/jquery-ui.custom.min.js | 7 - res/webview/js/jquery.min.js | 4 - res/webview/webview.png | Bin 4580 -> 0 bytes src/libs/baseapp/thread_manager.cpp | 13 +- src/libs/core/threading/thread_initializer.cpp | 9 + src/libs/core/threading/thread_initializer.h | 1 + src/libs/core/threading/thread_list.cpp | 11 +- src/libs/plugin/manager.cpp | 41 +- src/libs/plugin/manager.h | 10 +- src/libs/webview/formatters/tracwiki.cpp | 120 -- src/libs/webview/formatters/tracwiki.h | 48 - src/libs/webview/request.cpp | 24 + src/libs/webview/request.h | 2 + src/libs/webview/request_dispatcher.cpp | 8 +- src/libs/webview/rest_api.h | 55 +- src/plugins/Makefile | 5 +- src/plugins/{ => attic}/rrdweb/Makefile | 0 src/plugins/{ => attic}/rrdweb/rrdweb_plugin.cpp | 0 src/plugins/{ => attic}/rrdweb/rrdweb_plugin.h | 0 .../{ => attic}/rrdweb/rrdweb_processor.cpp | 0 src/plugins/{ => attic}/rrdweb/rrdweb_processor.h | 0 src/plugins/{ => attic}/rrdweb/rrdweb_thread.cpp | 0 src/plugins/{ => attic}/rrdweb/rrdweb_thread.h | 0 src/plugins/{ => attic}/webview-ptzcam/Makefile | 0 .../webview-ptzcam/webview-ptzcam-plugin.cpp | 0 .../webview-ptzcam/webview-ptzcam-processor.cpp | 0 .../webview-ptzcam/webview-ptzcam-processor.h | 0 .../webview-ptzcam/webview-ptzcam-thread.cpp | 0 .../webview-ptzcam/webview-ptzcam-thread.h | 0 src/plugins/clips-executive/rest-api/api.yaml | 40 +- .../rest-api/clips-executive-rest-api.cpp | 51 +- .../rest-api/clips-executive-rest-api.h | 27 +- src/plugins/clips-webview/Makefile | 57 - src/plugins/clips-webview/clips-webview-plugin.cpp | 45 - .../clips-webview/clips-webview-processor.cpp | 315 ------ .../clips-webview/clips-webview-processor.h | 68 -- src/plugins/clips-webview/clips-webview-thread.cpp | 83 -- src/plugins/clips-webview/clips-webview-thread.h | 61 - src/plugins/clips/rest-api/clips-rest-api.cpp | 11 +- src/plugins/clips/rest-api/clips-rest-api.h | 3 +- src/plugins/skiller/rest-api/skiller-rest-api.cpp | 27 +- src/plugins/skiller/rest-api/skiller-rest-api.h | 5 +- src/plugins/webview/Makefile | 117 +-- .../Makefile | 0 src/plugins/webview/backendinfo-rest-api/api.yaml | 82 ++ .../backendinfo-rest-api/backendinfo-rest-api.cpp | 107 ++ .../backendinfo-rest-api/backendinfo-rest-api.h | 52 + .../webview/backendinfo-rest-api/model/Backend.cpp | 180 +++ .../webview/backendinfo-rest-api/model/Backend.h | 220 ++++ .../webview/backendinfo-rest-api/model/Service.cpp | 122 ++ .../webview/backendinfo-rest-api/model/Service.h | 124 +++ src/plugins/webview/blackboard-rest-api/api.yaml | 39 + .../blackboard-rest-api/blackboard-rest-api.cpp | 136 ++- .../blackboard-rest-api/blackboard-rest-api.h | 8 +- .../blackboard-rest-api/model/BlackboardGraph.cpp | 131 +++ .../blackboard-rest-api/model/BlackboardGraph.h | 142 +++ src/plugins/webview/blackboard_processor.cpp | 398 ------- src/plugins/webview/blackboard_processor.h | 62 - src/plugins/webview/footer_generator.cpp | 77 -- src/plugins/webview/footer_generator.h | 41 - src/plugins/webview/frontend/Makefile | 6 +- src/plugins/webview/frontend/src/_theming.scss | 2 +- .../webview/frontend/src/app/app.component.ts | 8 +- src/plugins/webview/frontend/src/app/app.module.ts | 9 +- .../webview/frontend/src/chrome/component.ts | 19 +- .../webview/frontend/src/chrome/nav/template.html | 8 + src/plugins/webview/frontend/src/chrome/style.scss | 15 + .../webview/frontend/src/chrome/template.html | 50 +- .../webview/frontend/src/components/module.ts | 2 + .../frontend/src/components/promchart/component.ts | 61 +- .../src/components/promchart/template.html | 2 +- .../frontend/src/components/promstat/component.ts | 169 +++ .../frontend/src/components/promstat/style.scss | 51 + .../frontend/src/components/promstat/template.html | 15 + .../blackboard/components/overview.component.html | 73 +- .../blackboard/components/overview.component.scss | 20 + .../blackboard/components/overview.component.ts | 136 +++- .../src/parts/blackboard/models/BlackboardGraph.ts | 27 + .../src/parts/blackboard/services/api.service.ts | 53 +- .../components/domain.component.html | 2 +- .../clips-executive/components/domain.component.ts | 34 +- .../components/goal-detail.component.ts | 33 +- .../components/goal-list.component.ts | 19 +- .../parts/clips-executive/services/api.service.ts | 96 ++- .../clips/components/clips-env.component.html | 2 +- .../clips/components/clips-env.component.scss | 10 + .../parts/clips/components/clips-env.component.ts | 26 +- .../src/parts/clips/services/api.service.ts | 20 +- .../dashboard/components/dashboard.component.html | 23 + .../dashboard/components/dashboard.component.ts | 27 +- .../images/components/overview.component.html | 4 +- .../parts/images/components/overview.component.ts | 22 +- .../src/parts/images/services/api.service.ts | 8 +- .../frontend/src/parts/plugins/component.module.ts | 30 + .../plugins/components/overview.component.html | 72 ++ .../plugins/components/overview.component.scss | 33 + .../plugins/components/overview.component.spec.ts | 29 + .../parts/plugins/components/overview.component.ts | 172 +++ .../frontend/src/parts/plugins/models/Plugin.ts | 31 + .../src/parts/plugins/models/PluginOpRequest.ts | 33 + .../src/parts/plugins/models/PluginOpResponse.ts | 36 + .../webview/frontend/src/parts/plugins/module.ts | 23 + .../frontend/src/parts/plugins/routing.module.ts | 18 + .../frontend/src/parts/plugins/service.module.ts | 14 + .../src/parts/plugins/services/api.service.spec.ts | 19 + .../src/parts/plugins/services/api.service.ts | 82 ++ .../parts/skiller/components/overview.component.ts | 21 +- .../src/parts/skiller/services/api.service.ts | 12 +- .../src/parts/transforms/component.module.ts | 30 + .../transforms/components/overview.component.html | 44 + .../transforms/components/overview.component.scss | 20 + .../components/overview.component.spec.ts | 29 + .../transforms/components/overview.component.ts | 98 ++ .../src/parts/transforms/models/TransformsGraph.ts | 27 + .../frontend/src/parts/transforms/module.ts | 23 + .../src/parts/transforms/routing.module.ts | 19 + .../src/parts/transforms/service.module.ts | 11 + .../src/parts/transforms/services/api.service.ts | 43 + .../backend-config/backend-config.service.ts | 209 ++++ .../src/services/backend-config/model/Backend.ts | 31 + .../src/services/backend-config/model/Service.ts | 26 + .../frontend/src/services/config.service.ts | 58 - .../update-notifier/update-notifier.service.ts | 57 + src/plugins/webview/frontend/src/shared.module.ts | 4 +- src/plugins/webview/header_generator.cpp | 91 -- src/plugins/webview/header_generator.h | 50 - .../webview/image-rest-api/image-rest-api.cpp | 8 +- .../webview/image-rest-api/image-rest-api.h | 3 +- src/plugins/webview/plugin-rest-api/Makefile | 20 + src/plugins/webview/plugin-rest-api/api.yaml | 179 +++ .../webview/plugin-rest-api/model/Plugin.cpp | 175 +++ src/plugins/webview/plugin-rest-api/model/Plugin.h | 230 ++++ .../plugin-rest-api/model/PluginOpRequest.cpp | 139 +++ .../plugin-rest-api/model/PluginOpRequest.h | 160 +++ .../plugin-rest-api/model/PluginOpResponse.cpp | 148 +++ .../plugin-rest-api/model/PluginOpResponse.h | 178 +++ .../webview/plugin-rest-api/plugin-rest-api.cpp | 152 +++ .../webview/plugin-rest-api/plugin-rest-api.h | 58 + src/plugins/webview/plugins_processor.cpp | 149 --- src/plugins/webview/plugins_processor.h | 49 - src/plugins/webview/startpage_processor.cpp | 88 -- src/plugins/webview/startpage_processor.h | 47 - .../{blackboard-rest-api => tf-rest-api}/Makefile | 0 src/plugins/webview/tf-rest-api/api.yaml | 59 + .../webview/tf-rest-api/model/TransformsGraph.cpp | 131 +++ .../webview/tf-rest-api/model/TransformsGraph.h | 142 +++ src/plugins/webview/tf-rest-api/tf-rest-api.cpp | 82 ++ src/plugins/webview/tf-rest-api/tf-rest-api.h | 53 + src/plugins/webview/tf_processor.cpp | 106 -- src/plugins/webview/tf_processor.h | 56 - src/plugins/webview/webview_plugin.cpp | 16 +- src/plugins/webview/webview_thread.cpp | 69 +-- src/plugins/webview/webview_thread.h | 33 +- 183 files changed, 5649 insertions(+), 3941 deletions(-) copy {src/plugins/webview/frontend/src/assets => res/webview}/.gitkeep (100%) delete mode 100644 res/webview/chrome/dots.gif delete mode 100644 res/webview/chrome/navlogo.png delete mode 100644 res/webview/chrome/navlogo.xcf delete mode 100644 res/webview/chrome/topbar_gradient.png delete mode 100644 res/webview/chrome/topbar_gradient2.png delete mode 100644 res/webview/css/blackboard.css delete mode 100644 res/webview/css/jqtheme/images/animated-overlay.gif delete mode 100644 res/webview/css/jqtheme/images/ui-bg_flat_0_aaaaaa_40x100.png delete mode 100644 res/webview/css/jqtheme/images/ui-bg_flat_75_ffffff_40x100.png delete mode 100644 res/webview/css/jqtheme/images/ui-bg_glass_55_fbf9ee_1x400.png delete mode 100644 res/webview/css/jqtheme/images/ui-bg_highlight-soft_50_880000_1x100.png delete mode 100644 res/webview/css/jqtheme/images/ui-bg_highlight-soft_50_e6e6e6_1x100.png delete mode 100644 res/webview/css/jqtheme/images/ui-bg_highlight-soft_75_cccccc_1x100.png delete mode 100644 res/webview/css/jqtheme/images/ui-bg_inset-soft_95_fef1ec_1x100.png delete mode 100644 res/webview/css/jqtheme/images/ui-icons_222222_256x240.png delete mode 100644 res/webview/css/jqtheme/images/ui-icons_880000_256x240.png delete mode 100644 res/webview/css/jqtheme/images/ui-icons_888888_256x240.png delete mode 100644 res/webview/css/jqtheme/images/ui-icons_cd0a0a_256x240.png delete mode 100644 res/webview/css/jqtheme/images/ui-icons_dddddd_256x240.png delete mode 100644 res/webview/css/jqtheme/jquery-ui.custom.css delete mode 100644 res/webview/css/rrdweb.css delete mode 100644 res/webview/css/webview-ptzcam.css delete mode 100644 res/webview/css/webview.css delete mode 100644 res/webview/fawkes.png delete mode 100644 res/webview/images/favicon.ico delete mode 100644 res/webview/images/favicon.png delete mode 100644 res/webview/images/icon-triangle-e.png delete mode 100644 res/webview/images/icon-triangle-s.png delete mode 100644 res/webview/js/jquery-ui.custom.min.js delete mode 100644 res/webview/js/jquery.min.js delete mode 100644 res/webview/webview.png delete mode 100644 src/libs/webview/formatters/tracwiki.cpp delete mode 100644 src/libs/webview/formatters/tracwiki.h rename src/plugins/{ => attic}/rrdweb/Makefile (100%) rename src/plugins/{ => attic}/rrdweb/rrdweb_plugin.cpp (100%) rename src/plugins/{ => attic}/rrdweb/rrdweb_plugin.h (100%) rename src/plugins/{ => attic}/rrdweb/rrdweb_processor.cpp (100%) rename src/plugins/{ => attic}/rrdweb/rrdweb_processor.h (100%) rename src/plugins/{ => attic}/rrdweb/rrdweb_thread.cpp (100%) rename src/plugins/{ => attic}/rrdweb/rrdweb_thread.h (100%) rename src/plugins/{ => attic}/webview-ptzcam/Makefile (100%) rename src/plugins/{ => attic}/webview-ptzcam/webview-ptzcam-plugin.cpp (100%) rename src/plugins/{ => attic}/webview-ptzcam/webview-ptzcam-processor.cpp (100%) rename src/plugins/{ => attic}/webview-ptzcam/webview-ptzcam-processor.h (100%) rename src/plugins/{ => attic}/webview-ptzcam/webview-ptzcam-thread.cpp (100%) rename src/plugins/{ => attic}/webview-ptzcam/webview-ptzcam-thread.h (100%) delete mode 100644 src/plugins/clips-webview/Makefile delete mode 100644 src/plugins/clips-webview/clips-webview-plugin.cpp delete mode 100644 src/plugins/clips-webview/clips-webview-processor.cpp delete mode 100644 src/plugins/clips-webview/clips-webview-processor.h delete mode 100644 src/plugins/clips-webview/clips-webview-thread.cpp delete mode 100644 src/plugins/clips-webview/clips-webview-thread.h copy src/plugins/webview/{blackboard-rest-api => backendinfo-rest-api}/Makefile (100%) create mode 100644 src/plugins/webview/backendinfo-rest-api/api.yaml create mode 100644 src/plugins/webview/backendinfo-rest-api/backendinfo-rest-api.cpp create mode 100644 src/plugins/webview/backendinfo-rest-api/backendinfo-rest-api.h create mode 100644 src/plugins/webview/backendinfo-rest-api/model/Backend.cpp create mode 100644 src/plugins/webview/backendinfo-rest-api/model/Backend.h create mode 100644 src/plugins/webview/backendinfo-rest-api/model/Service.cpp create mode 100644 src/plugins/webview/backendinfo-rest-api/model/Service.h create mode 100644 src/plugins/webview/blackboard-rest-api/model/BlackboardGraph.cpp create mode 100644 src/plugins/webview/blackboard-rest-api/model/BlackboardGraph.h delete mode 100644 src/plugins/webview/blackboard_processor.cpp delete mode 100644 src/plugins/webview/blackboard_processor.h delete mode 100644 src/plugins/webview/footer_generator.cpp delete mode 100644 src/plugins/webview/footer_generator.h create mode 100644 src/plugins/webview/frontend/src/components/promstat/component.ts create mode 100644 src/plugins/webview/frontend/src/components/promstat/style.scss create mode 100644 src/plugins/webview/frontend/src/components/promstat/template.html create mode 100644 src/plugins/webview/frontend/src/parts/blackboard/models/BlackboardGraph.ts create mode 100644 src/plugins/webview/frontend/src/parts/plugins/component.module.ts create mode 100644 src/plugins/webview/frontend/src/parts/plugins/components/overview.component.html create mode 100644 src/plugins/webview/frontend/src/parts/plugins/components/overview.component.scss create mode 100644 src/plugins/webview/frontend/src/parts/plugins/components/overview.component.spec.ts create mode 100644 src/plugins/webview/frontend/src/parts/plugins/components/overview.component.ts create mode 100644 src/plugins/webview/frontend/src/parts/plugins/models/Plugin.ts create mode 100644 src/plugins/webview/frontend/src/parts/plugins/models/PluginOpRequest.ts create mode 100644 src/plugins/webview/frontend/src/parts/plugins/models/PluginOpResponse.ts create mode 100644 src/plugins/webview/frontend/src/parts/plugins/module.ts create mode 100644 src/plugins/webview/frontend/src/parts/plugins/routing.module.ts create mode 100644 src/plugins/webview/frontend/src/parts/plugins/service.module.ts create mode 100644 src/plugins/webview/frontend/src/parts/plugins/services/api.service.spec.ts create mode 100644 src/plugins/webview/frontend/src/parts/plugins/services/api.service.ts create mode 100644 src/plugins/webview/frontend/src/parts/transforms/component.module.ts create mode 100644 src/plugins/webview/frontend/src/parts/transforms/components/overview.component.html create mode 100644 src/plugins/webview/frontend/src/parts/transforms/components/overview.component.scss create mode 100644 src/plugins/webview/frontend/src/parts/transforms/components/overview.component.spec.ts create mode 100644 src/plugins/webview/frontend/src/parts/transforms/components/overview.component.ts create mode 100644 src/plugins/webview/frontend/src/parts/transforms/models/TransformsGraph.ts create mode 100644 src/plugins/webview/frontend/src/parts/transforms/module.ts create mode 100644 src/plugins/webview/frontend/src/parts/transforms/routing.module.ts create mode 100644 src/plugins/webview/frontend/src/parts/transforms/service.module.ts create mode 100644 src/plugins/webview/frontend/src/parts/transforms/services/api.service.ts create mode 100644 src/plugins/webview/frontend/src/services/backend-config/backend-config.service.ts create mode 100644 src/plugins/webview/frontend/src/services/backend-config/model/Backend.ts create mode 100644 src/plugins/webview/frontend/src/services/backend-config/model/Service.ts delete mode 100644 src/plugins/webview/frontend/src/services/config.service.ts create mode 100644 src/plugins/webview/frontend/src/services/update-notifier/update-notifier.service.ts delete mode 100644 src/plugins/webview/header_generator.cpp delete mode 100644 src/plugins/webview/header_generator.h create mode 100644 src/plugins/webview/plugin-rest-api/Makefile create mode 100644 src/plugins/webview/plugin-rest-api/api.yaml create mode 100644 src/plugins/webview/plugin-rest-api/model/Plugin.cpp create mode 100644 src/plugins/webview/plugin-rest-api/model/Plugin.h create mode 100644 src/plugins/webview/plugin-rest-api/model/PluginOpRequest.cpp create mode 100644 src/plugins/webview/plugin-rest-api/model/PluginOpRequest.h create mode 100644 src/plugins/webview/plugin-rest-api/model/PluginOpResponse.cpp create mode 100644 src/plugins/webview/plugin-rest-api/model/PluginOpResponse.h create mode 100644 src/plugins/webview/plugin-rest-api/plugin-rest-api.cpp create mode 100644 src/plugins/webview/plugin-rest-api/plugin-rest-api.h delete mode 100644 src/plugins/webview/plugins_processor.cpp delete mode 100644 src/plugins/webview/plugins_processor.h delete mode 100644 src/plugins/webview/startpage_processor.cpp delete mode 100644 src/plugins/webview/startpage_processor.h copy src/plugins/webview/{blackboard-rest-api => tf-rest-api}/Makefile (100%) create mode 100644 src/plugins/webview/tf-rest-api/api.yaml create mode 100644 src/plugins/webview/tf-rest-api/model/TransformsGraph.cpp create mode 100644 src/plugins/webview/tf-rest-api/model/TransformsGraph.h create mode 100644 src/plugins/webview/tf-rest-api/tf-rest-api.cpp create mode 100644 src/plugins/webview/tf-rest-api/tf-rest-api.h delete mode 100644 src/plugins/webview/tf_processor.cpp delete mode 100644 src/plugins/webview/tf_processor.h - *Diffs* ------------------------------------------------------------- - *commit* fdf25d0ba573a8a5905f4dc46fc206976a07c59b - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu Apr 12 10:34:48 2018 +0200 Subject: Merge remote-tracking branch 'origin/timn/webview-2.0' into common/current .../templates/typescript-angular.ts.api.template | 6 +- .../frontend/src/assets => res/webview}/.gitkeep | 0 res/webview/chrome/dots.gif | Bin 50 -> 0 bytes res/webview/chrome/navlogo.png | Bin 1555 -> 0 bytes res/webview/chrome/navlogo.xcf | Bin 3415 -> 0 bytes res/webview/chrome/topbar_gradient.png | Bin 350 -> 0 bytes res/webview/chrome/topbar_gradient2.png | Bin 309 -> 0 bytes res/webview/css/blackboard.css | 8 - .../css/jqtheme/images/animated-overlay.gif | Bin 1738 -> 0 bytes .../jqtheme/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 212 -> 0 bytes .../jqtheme/images/ui-bg_flat_75_ffffff_40x100.png | Bin 208 -> 0 bytes .../jqtheme/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 335 -> 0 bytes .../ui-bg_highlight-soft_50_880000_1x100.png | Bin 358 -> 0 bytes .../ui-bg_highlight-soft_50_e6e6e6_1x100.png | Bin 278 -> 0 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 280 -> 0 bytes .../images/ui-bg_inset-soft_95_fef1ec_1x100.png | Bin 370 -> 0 bytes .../css/jqtheme/images/ui-icons_222222_256x240.png | Bin 6922 -> 0 bytes .../css/jqtheme/images/ui-icons_880000_256x240.png | Bin 4549 -> 0 bytes .../css/jqtheme/images/ui-icons_888888_256x240.png | Bin 6999 -> 0 bytes .../css/jqtheme/images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 0 bytes .../css/jqtheme/images/ui-icons_dddddd_256x240.png | Bin 6923 -> 0 bytes res/webview/css/jqtheme/jquery-ui.custom.css | 1162 -------------------- res/webview/css/rrdweb.css | 4 - res/webview/css/webview-ptzcam.css | 13 - res/webview/css/webview.css | 131 --- res/webview/fawkes.png | Bin 2006 -> 0 bytes res/webview/images/favicon.ico | Bin 2966 -> 0 bytes res/webview/images/favicon.png | Bin 280 -> 0 bytes res/webview/images/icon-triangle-e.png | Bin 407 -> 0 bytes res/webview/images/icon-triangle-s.png | Bin 403 -> 0 bytes res/webview/js/jquery-ui.custom.min.js | 7 - res/webview/js/jquery.min.js | 4 - res/webview/webview.png | Bin 4580 -> 0 bytes src/libs/baseapp/thread_manager.cpp | 13 +- src/libs/core/threading/thread_initializer.cpp | 9 + src/libs/core/threading/thread_initializer.h | 1 + src/libs/core/threading/thread_list.cpp | 11 +- src/libs/plugin/manager.cpp | 41 +- src/libs/plugin/manager.h | 10 +- src/libs/webview/formatters/tracwiki.cpp | 120 -- src/libs/webview/formatters/tracwiki.h | 48 - src/libs/webview/request.cpp | 24 + src/libs/webview/request.h | 2 + src/libs/webview/request_dispatcher.cpp | 8 +- src/libs/webview/rest_api.h | 55 +- src/plugins/Makefile | 5 +- src/plugins/{ => attic}/rrdweb/Makefile | 0 src/plugins/{ => attic}/rrdweb/rrdweb_plugin.cpp | 0 src/plugins/{ => attic}/rrdweb/rrdweb_plugin.h | 0 .../{ => attic}/rrdweb/rrdweb_processor.cpp | 0 src/plugins/{ => attic}/rrdweb/rrdweb_processor.h | 0 src/plugins/{ => attic}/rrdweb/rrdweb_thread.cpp | 0 src/plugins/{ => attic}/rrdweb/rrdweb_thread.h | 0 src/plugins/{ => attic}/webview-ptzcam/Makefile | 0 .../webview-ptzcam/webview-ptzcam-plugin.cpp | 0 .../webview-ptzcam/webview-ptzcam-processor.cpp | 0 .../webview-ptzcam/webview-ptzcam-processor.h | 0 .../webview-ptzcam/webview-ptzcam-thread.cpp | 0 .../webview-ptzcam/webview-ptzcam-thread.h | 0 src/plugins/clips-executive/rest-api/api.yaml | 40 +- .../rest-api/clips-executive-rest-api.cpp | 51 +- .../rest-api/clips-executive-rest-api.h | 27 +- src/plugins/clips-webview/Makefile | 57 - src/plugins/clips-webview/clips-webview-plugin.cpp | 45 - .../clips-webview/clips-webview-processor.cpp | 315 ------ .../clips-webview/clips-webview-processor.h | 68 -- src/plugins/clips-webview/clips-webview-thread.cpp | 83 -- src/plugins/clips-webview/clips-webview-thread.h | 61 - src/plugins/clips/rest-api/clips-rest-api.cpp | 11 +- src/plugins/clips/rest-api/clips-rest-api.h | 3 +- src/plugins/skiller/rest-api/skiller-rest-api.cpp | 27 +- src/plugins/skiller/rest-api/skiller-rest-api.h | 5 +- src/plugins/webview/Makefile | 117 +-- .../Makefile | 0 src/plugins/webview/backendinfo-rest-api/api.yaml | 82 ++ .../backendinfo-rest-api/backendinfo-rest-api.cpp | 107 ++ .../backendinfo-rest-api/backendinfo-rest-api.h | 52 + .../webview/backendinfo-rest-api/model/Backend.cpp | 180 +++ .../webview/backendinfo-rest-api/model/Backend.h | 220 ++++ .../webview/backendinfo-rest-api/model/Service.cpp | 122 ++ .../webview/backendinfo-rest-api/model/Service.h | 124 +++ src/plugins/webview/blackboard-rest-api/api.yaml | 39 + .../blackboard-rest-api/blackboard-rest-api.cpp | 136 ++- .../blackboard-rest-api/blackboard-rest-api.h | 8 +- .../blackboard-rest-api/model/BlackboardGraph.cpp | 131 +++ .../blackboard-rest-api/model/BlackboardGraph.h | 142 +++ src/plugins/webview/blackboard_processor.cpp | 398 ------- src/plugins/webview/blackboard_processor.h | 62 - src/plugins/webview/footer_generator.cpp | 77 -- src/plugins/webview/footer_generator.h | 41 - src/plugins/webview/frontend/Makefile | 6 +- src/plugins/webview/frontend/src/_theming.scss | 2 +- .../webview/frontend/src/app/app.component.ts | 8 +- src/plugins/webview/frontend/src/app/app.module.ts | 9 +- .../webview/frontend/src/chrome/component.ts | 19 +- .../webview/frontend/src/chrome/nav/template.html | 8 + src/plugins/webview/frontend/src/chrome/style.scss | 15 + .../webview/frontend/src/chrome/template.html | 50 +- .../webview/frontend/src/components/module.ts | 2 + .../frontend/src/components/promchart/component.ts | 61 +- .../src/components/promchart/template.html | 2 +- .../frontend/src/components/promstat/component.ts | 169 +++ .../frontend/src/components/promstat/style.scss | 51 + .../frontend/src/components/promstat/template.html | 15 + .../blackboard/components/overview.component.html | 73 +- .../blackboard/components/overview.component.scss | 20 + .../blackboard/components/overview.component.ts | 136 +++- .../src/parts/blackboard/models/BlackboardGraph.ts | 27 + .../src/parts/blackboard/services/api.service.ts | 53 +- .../components/domain.component.html | 2 +- .../clips-executive/components/domain.component.ts | 34 +- .../components/goal-detail.component.ts | 33 +- .../components/goal-list.component.ts | 19 +- .../parts/clips-executive/services/api.service.ts | 96 ++- .../clips/components/clips-env.component.html | 2 +- .../clips/components/clips-env.component.scss | 10 + .../parts/clips/components/clips-env.component.ts | 26 +- .../src/parts/clips/services/api.service.ts | 20 +- .../dashboard/components/dashboard.component.html | 23 + .../dashboard/components/dashboard.component.ts | 27 +- .../images/components/overview.component.html | 4 +- .../parts/images/components/overview.component.ts | 22 +- .../src/parts/images/services/api.service.ts | 8 +- .../frontend/src/parts/plugins/component.module.ts | 30 + .../plugins/components/overview.component.html | 72 ++ .../plugins/components/overview.component.scss | 33 + .../plugins/components/overview.component.spec.ts | 29 + .../parts/plugins/components/overview.component.ts | 172 +++ .../frontend/src/parts/plugins/models/Plugin.ts | 31 + .../src/parts/plugins/models/PluginOpRequest.ts | 33 + .../src/parts/plugins/models/PluginOpResponse.ts | 36 + .../webview/frontend/src/parts/plugins/module.ts | 23 + .../frontend/src/parts/plugins/routing.module.ts | 18 + .../frontend/src/parts/plugins/service.module.ts | 14 + .../src/parts/plugins/services/api.service.spec.ts | 19 + .../src/parts/plugins/services/api.service.ts | 82 ++ .../parts/skiller/components/overview.component.ts | 21 +- .../src/parts/skiller/services/api.service.ts | 12 +- .../src/parts/transforms/component.module.ts | 30 + .../transforms/components/overview.component.html | 44 + .../transforms/components/overview.component.scss | 20 + .../components/overview.component.spec.ts | 29 + .../transforms/components/overview.component.ts | 98 ++ .../src/parts/transforms/models/TransformsGraph.ts | 27 + .../frontend/src/parts/transforms/module.ts | 23 + .../src/parts/transforms/routing.module.ts | 19 + .../src/parts/transforms/service.module.ts | 11 + .../src/parts/transforms/services/api.service.ts | 43 + .../backend-config/backend-config.service.ts | 209 ++++ .../src/services/backend-config/model/Backend.ts | 31 + .../src/services/backend-config/model/Service.ts | 26 + .../frontend/src/services/config.service.ts | 58 - .../update-notifier/update-notifier.service.ts | 57 + src/plugins/webview/frontend/src/shared.module.ts | 4 +- src/plugins/webview/header_generator.cpp | 91 -- src/plugins/webview/header_generator.h | 50 - .../webview/image-rest-api/image-rest-api.cpp | 8 +- .../webview/image-rest-api/image-rest-api.h | 3 +- src/plugins/webview/plugin-rest-api/Makefile | 20 + src/plugins/webview/plugin-rest-api/api.yaml | 179 +++ .../webview/plugin-rest-api/model/Plugin.cpp | 175 +++ src/plugins/webview/plugin-rest-api/model/Plugin.h | 230 ++++ .../plugin-rest-api/model/PluginOpRequest.cpp | 139 +++ .../plugin-rest-api/model/PluginOpRequest.h | 160 +++ .../plugin-rest-api/model/PluginOpResponse.cpp | 148 +++ .../plugin-rest-api/model/PluginOpResponse.h | 178 +++ .../webview/plugin-rest-api/plugin-rest-api.cpp | 152 +++ .../webview/plugin-rest-api/plugin-rest-api.h | 58 + src/plugins/webview/plugins_processor.cpp | 149 --- src/plugins/webview/plugins_processor.h | 49 - src/plugins/webview/startpage_processor.cpp | 88 -- src/plugins/webview/startpage_processor.h | 47 - .../{blackboard-rest-api => tf-rest-api}/Makefile | 0 src/plugins/webview/tf-rest-api/api.yaml | 59 + .../webview/tf-rest-api/model/TransformsGraph.cpp | 131 +++ .../webview/tf-rest-api/model/TransformsGraph.h | 142 +++ src/plugins/webview/tf-rest-api/tf-rest-api.cpp | 82 ++ src/plugins/webview/tf-rest-api/tf-rest-api.h | 53 + src/plugins/webview/tf_processor.cpp | 106 -- src/plugins/webview/tf_processor.h | 56 - src/plugins/webview/webview_plugin.cpp | 16 +- src/plugins/webview/webview_thread.cpp | 69 +-- src/plugins/webview/webview_thread.h | 33 +- 183 files changed, 5649 insertions(+), 3941 deletions(-) _Diff for modified files_: diff --cc src/plugins/webview/webview_plugin.cpp index 72020e0,81d072a..94715ca --- a/src/plugins/webview/webview_plugin.cpp +++ b/src/plugins/webview/webview_plugin.cpp @@@ -52,10 -56,15 +56,16 @@@ WebviewPlugin::WebviewPlugin(Configurat thread_list.push_back(new WebviewThread(enable_thread_pool)); #ifdef HAVE_REST_APIS thread_list.push_back(new BlackboardRestApi()); - #ifdef HAVE_JPEG + thread_list.push_back(new BackendInfoRestApi()); + thread_list.push_back(new PluginRestApi()); + # ifdef HAVE_JPEG thread_list.push_back(new ImageRestApi()); + # endif + # ifdef HAVE_TF + thread_list.push_back(new TransformsRestApi()); + # endif #endif +#endif } -- Fawkes Robotics Framework http://www.fawkesrobotics.org _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
