You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by eb...@apache.org on 2020/05/18 11:49:12 UTC
[incubator-streampipes] 03/04: Merged branches
This is an automated email from the ASF dual-hosted git repository.
ebi pushed a commit to branch STREAMPIPES-79
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit de6d6ca2c4fec3c48b2ccd47a27867f8737a7393
Merge: e67c3cb 44fe481
Author: Daniel Ebi <eb...@fzi.de>
AuthorDate: Mon May 18 09:38:49 2020 +0200
Merged branches
.../connect/adapter/format/image/ImageParser.java | 10 +-
.../rest/impl/datalake/DataLakeManagementV3.java | 2 +-
.../streampipes/sdk/helpers/EpProperties.java | 15 +++
.../app-image-labeling.component.css} | 8 +-
.../app-image-labeling.component.html | 35 ++++++
.../app-image-labeling.component.ts | 54 ++++++++
.../app-image-labeling.module.ts} | 32 ++++-
.../app/app-overview/app-overview.component.html | 2 +
ui/src/app/app-overview/app-overview.component.ts | 21 ++--
ui/src/app/app-overview/app-overview.module.ts | 26 ++--
.../datalake/datalake-rest.service.ts | 4 +-
ui/src/app/core-ui/core-ui.module.ts | 2 +
.../image-annotations.component.html | 12 +-
.../components/image-bar/image-bar.component.css | 1 +
.../image-container/image-container.component.css | 3 +-
.../image-container/image-container.component.ts | 34 ++++--
.../image-categorize.component.html | 2 +-
.../image-labeling/image-labeling.component.html | 24 ++--
.../image-labeling/image-labeling.component.ts | 136 +++++++++++----------
.../image/image-viewer/image-viewer.component.html | 2 +-
.../image/services/BrushLabeling.service.ts | 50 ++++----
.../core-ui/image/services/LabelingMode.service.ts | 79 ++++++++++++
.../image/services/PolygonLabeling.service.ts | 85 +++++++------
.../image/services/ReactLabeling.service.ts | 65 ++++++----
24 files changed, 491 insertions(+), 213 deletions(-)