This is an automated email from the ASF dual-hosted git repository. zehnder pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 440ef73ca73776ee1c606e8ff9e51d5209617d60 Merge: f97f0bb 80396a8 Author: Philipp Zehnder <[email protected]> AuthorDate: Mon Nov 9 18:02:05 2020 +0100 Merge branch 'STREAMPIPES-234' into dev .../all_pipeline_elements_jvm.xml | 1 + .idea/runConfigurations/sinks_internal_jvm.xml | 2 +- .../backend/StreamPipesResourceConfig.java | 2 + streampipes-backend/src/main/resources/shiro.ini | 7 + .../apache/streampipes/model/client/Category.java | 3 +- .../streampipes/model/labeling/Category.java | 49 ++ .../apache/streampipes/model/labeling/Label.java | 55 ++ .../manager/setup/CouchDbInstallationStep.java | 24 + .../org/apache/streampipes/rest/api/ICategory.java | 20 + .../org/apache/streampipes/rest/api/ILabel.java | 23 + .../streampipes/rest/impl/CategoryResource.java | 99 ++++ .../streampipes/rest/impl/LabelResource.java | 128 +++++ .../rest/impl/datalake/DataLakeManagementV3.java | 4 +- .../rest/impl/datalake/DataLakeResourceV3.java | 9 +- .../streampipes/storage/api/ICategoryStorage.java | 19 + .../streampipes/storage/api/ILabelStorage.java | 24 + .../streampipes/storage/api/INoSqlStorage.java | 5 + .../storage/couchdb/CouchDbStorageManager.java | 6 + .../storage/couchdb/impl/CategoryStorageImpl.java | 41 ++ .../storage/couchdb/impl/LabelStorageImpl.java | 58 ++ .../streampipes/storage/couchdb/utils/Utils.java | 12 + ui/package.json | 34 +- ui/src/app/core-model/coco/Annotation.ts | 2 + ui/src/app/core-model/coco/Category.ts | 10 +- ui/src/app/core-model/gen/streampipes-model.ts | 68 ++- .../datalake/datalake-rest.service.ts | 6 +- ui/src/app/core-ui/core-ui.module.ts | 118 ++-- .../image-annotations.component.html | 16 +- .../image-annotations.component.ts | 21 +- .../image-labels/image-labels.component.html | 39 -- .../image-labels/image-labels.component.ts | 73 --- .../image-categorize.component.html | 5 +- .../image-categorize/image-categorize.component.ts | 4 +- .../image-labeling/image-labeling.component.html | 5 +- .../image-labeling/image-labeling.component.ts | 45 +- .../image/services/BrushLabeling.service.ts | 5 +- .../core-ui/image/services/CocoFormat.service.ts | 22 +- .../image/services/PolygonLabeling.service.ts | 7 +- .../image/services/ReactLabeling.service.ts | 9 +- .../configure-labels.component.css | 0 .../configure-labels.component.html | 48 ++ .../configure-labels/configure-labels.component.ts | 102 ++++ .../label-list-item/label-list-item.component.css | 0 .../label-list-item/label-list-item.component.html | 19 + .../label-list-item/label-list-item.component.ts | 42 ++ .../select-label/select-label.component.css} | 0 .../select-label/select-label.component.html | 43 ++ .../select-label/select-label.component.ts | 81 +++ .../app/core-ui/labels/services/label.service.ts | 76 +++ .../label-selection/label-selection.component.css | 19 - .../label-selection/label-selection.component.html | 32 -- .../label-selection/label-selection.component.ts | 61 --- .../change-chartmode/change-chartmode.dialog.css | 29 - .../change-chartmode/change-chartmode.dialog.html | 26 - .../change-chartmode/change-chartmode.dialog.ts | 35 -- .../dialogs/labeling/labeling.dialog.css | 36 -- .../dialogs/labeling/labeling.dialog.html | 36 -- .../dialogs/labeling/labeling.dialog.ts | 52 -- .../labeling-tool/labeling-tool.module.ts | 90 ---- ...data-explorer-dashboard-overview.component.html | 7 +- .../data-explorer-dashboard-overview.component.ts | 7 + .../data-explorer-dashboard-widget.component.html | 2 +- .../data-explorer-dashboard-widget.component.ts | 2 + .../widgets/base/base-data-explorer-widget.ts | 14 +- .../point-selection-info.component.css | 0 .../point-selection-info.component.html | 0 .../point-selection-info.component.ts | 2 +- .../line-chart/line-chart-widget.component.css | 5 +- .../line-chart/line-chart-widget.component.html | 35 +- .../line-chart/line-chart-widget.component.ts | 596 ++++++++++----------- .../widgets/line-chart}/services/color.service.ts | 0 ui/src/app/data-explorer/data-explorer.module.ts | 96 ++-- 72 files changed, 1596 insertions(+), 1077 deletions(-)
