You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2020/06/08 06:07:03 UTC
[incubator-streampipes] branch dev updated (f592ce8 -> 472dad2)
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from f592ce8 Add area field to cooc information
add 8a00761 1st task "pallet"
add 963322c adding functions
add f6b2fb8 Merge branch 'dev' of https://github.com/apache/incubator-streampipes into dev
add 1c8b94b Adding arrows to ease the process of chnaging selected time interval of monitoring data
new 5bae25f Merge branch 'El-Sherif-dev' into newfeature
new 9b33775 Change arrows to select time range
new 6823724 Change time range selector
add 5340b9d Added description icon for image labeling
add be6c168 Adding new app
new e99a0ac Merge branch 'dev' of https://github.com/El-Sherif/incubator-streampipes into newfeature
new 472dad2 Merge branch 'dev' into newfeature
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ui/angular.json | 26 +-
ui/package.json | 15 +-
ui/polyfills.ts | 63 ++
.../app/app-overview/app-overview.component.html | 2 +
ui/src/app/app-overview/app-overview.component.ts | 5 +
.../image-labeling/image-labeling.component.html | 8 +
.../image-labeling/image-labeling.component.ts | 5 +-
.../widget/dashboard-widget.component.html | 6 +
.../renderer-config.ts} | 8 +-
.../widgets/renderer/renderer.component.css | 0
.../widgets/renderer/renderer.component.html | 1 +
.../widgets/renderer/renderer.component.spec.ts | 25 +
.../widgets/renderer/renderer.component.ts | 285 +++++
.../widgets/renderer/renderer_functions.ts | 65 ++
ui/src/app/dashboard/dashboard.module.ts | 2 +
ui/src/app/dashboard/registry/widget-registry.ts | 4 +-
.../dashboard/sdk/schema-requirements-builder.ts | 2 +-
.../time-selector/timeRangeSelector.component.html | 11 +-
.../time-selector/timeRangeSelector.component.ts | 23 +-
.../line-chart/line-chart-widget.component.html | 5 +-
.../line-chart/line-chart-widget.component.ts | 30 +-
ui/src/assets/OrbitControls.js | 1115 ++++++++++++++++++++
ui/src/assets/PackWidget.js | 560 ++++++++++
ui/src/assets/render.js | 169 +++
ui/src/assets/three.min.js | 938 ++++++++++++++++
ui/src/assets/threex.domevents.js | 474 +++++++++
ui/tsconfig.spec.json | 18 +
27 files changed, 3843 insertions(+), 22 deletions(-)
create mode 100644 ui/polyfills.ts
copy ui/src/app/dashboard/components/widgets/{number/number-config.ts => renderer/renderer-config.ts} (83%)
create mode 100644 ui/src/app/dashboard/components/widgets/renderer/renderer.component.css
create mode 100644 ui/src/app/dashboard/components/widgets/renderer/renderer.component.html
create mode 100644 ui/src/app/dashboard/components/widgets/renderer/renderer.component.spec.ts
create mode 100644 ui/src/app/dashboard/components/widgets/renderer/renderer.component.ts
create mode 100644 ui/src/app/dashboard/components/widgets/renderer/renderer_functions.ts
create mode 100755 ui/src/assets/OrbitControls.js
create mode 100755 ui/src/assets/PackWidget.js
create mode 100755 ui/src/assets/render.js
create mode 100755 ui/src/assets/three.min.js
create mode 100755 ui/src/assets/threex.domevents.js
create mode 100644 ui/tsconfig.spec.json
[incubator-streampipes] 02/05: Change arrows to select time range
Posted by ze...@apache.org.
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 9b33775741fba12307b80cfcdf31beb0fe784c82
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Fri May 29 09:59:54 2020 +0200
Change arrows to select time range
---
.../time-selector/timeRangeSelector.component.html | 15 ++++---
.../time-selector/timeRangeSelector.component.ts | 48 +++++++---------------
.../line-chart/line-chart-widget.component.html | 2 +-
3 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.html b/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.html
index 63dc4af..5e75fec 100644
--- a/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.html
+++ b/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.html
@@ -17,7 +17,10 @@
-->
<div flex layout-fill layout="row" layout-align="start center" style="padding-top: 5px;">
- <Button (click)="decreaseStart()"><</Button>
+<!-- <Button (click)="decreaseTime()"><</Button>-->
+ <button mat-icon-button class="icon" style="margin-right: -15px">
+ <mat-icon style="font-size: 30px;height: 30px; width: 30px; padding-top: 3px" (click)="decreaseTime()">navigate_before</mat-icon>
+ </button>
<mat-form-field appearance="outline" class="start-date">
<mat-label>Start</mat-label>
<input matInput
@@ -27,9 +30,6 @@
(dateTimeChange)="changeCustomDateRange()">
<owl-date-time #dt1></owl-date-time>
</mat-form-field>
- <Button (click)="increaseStart()">></Button>
-
- <Button (click)="decreaseEnd()"><</Button>
<mat-form-field appearance="outline" class="end-date">
<mat-label>End</mat-label>
<input matInput
@@ -39,8 +39,11 @@
(dateTimeChange)="changeCustomDateRange()">
<owl-date-time #dt2></owl-date-time>
</mat-form-field>
- <Button (click)="increaseEnd()">></Button>
-
+ <button mat-icon-button class="icon" style="margin-left: -15px" color="primary">
+ <mat-icon style="font-size: 30px;height: 30px; width: 30px; padding-top: 3px" (click)="increaseTime()">navigate_next</mat-icon>
+ </button>
+<!-- <Button (click)="increaseTime()">></Button>-->
+<!-- -->
<button mat-raised-button
*ngFor="let item of possibleTimeButtons"
[color]="selectedTimeButton.value === item.value ? 'primary' : ''"
diff --git a/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.ts b/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.ts
index 3c2c931..657f03f 100644
--- a/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.ts
+++ b/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.ts
@@ -54,43 +54,25 @@ export class TimeRangeSelectorComponent implements OnInit {
reloadData() {
this.dateRangeEmitter.emit(this.dateRange);
}
- increaseStart(){
-
- if(this.selectedTimeButton.offset == -1){
- this.dateRange = new DateRange(new Date(this.dateRange.startDate.getTime() + 5*60000 ),this.dateRange.endDate);
- }
- else{
- this.dateRange = new DateRange(new Date(this.dateRange.startDate.getTime() + this.selectedTimeButton.offset*60000 ),this.dateRange.endDate);
- }
- this.reloadData();
- }
- decreaseStart(){
- if(this.selectedTimeButton.offset == -1){
- this.dateRange = new DateRange(new Date(this.dateRange.startDate.getTime() - 5*60000 ),this.dateRange.endDate);
- }
- else{
- this.dateRange = new DateRange(new Date(this.dateRange.startDate.getTime() - this.selectedTimeButton.offset*60000 ),this.dateRange.endDate);
- }
- this.reloadData();
+
+ increaseTime() {
+ this.changeTimeByInterval((a, b) => a + b);
}
- increaseEnd(){
- if(this.selectedTimeButton.offset == -1){
- this.dateRange = new DateRange(this.dateRange.startDate,new Date(this.dateRange.endDate.getTime() + 5*60000 ));
- }
- else{
- this.dateRange = new DateRange(this.dateRange.startDate,new Date(this.dateRange.endDate.getTime() + this.selectedTimeButton.offset*60000 ));
- }
- this.reloadData();
+
+ decreaseTime() {
+ this.changeTimeByInterval((a, b) => a - b);
}
- decreaseEnd(){
- if(this.selectedTimeButton.offset == -1){
- this.dateRange = new DateRange(this.dateRange.startDate,new Date(this.dateRange.endDate.getTime() - 5*60000 ));
- }
- else{
- this.dateRange = new DateRange(this.dateRange.startDate,new Date(this.dateRange.endDate.getTime() - this.selectedTimeButton.offset*60000 ));
- }
+
+ private changeTimeByInterval(func) {
+ const difference = this.dateRange.endDate.getTime() - this.dateRange.startDate.getTime();
+ const newStartTime = new Date(func(this.dateRange.startDate.getTime(), difference));
+ const newEndTime = new Date(func(this.dateRange.endDate.getTime(), difference));
+
+ this.dateRange = new DateRange(newStartTime, newEndTime);
+ this.selectedTimeButton = this.possibleTimeButtons[this.possibleTimeButtons.length - 1];
this.reloadData();
}
+
changeCustomDateRange() {
this.selectedTimeButton = this.possibleTimeButtons[this.possibleTimeButtons.length - 1];
this.dateRange = new DateRange(this.dateRange.startDate, this.dateRange.endDate)
diff --git a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html
index 12574fc..fcddbb6 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html
+++ b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html
@@ -40,7 +40,7 @@
<!-- Chart -->
<plotly-plot fxFlex
- *ngIf="data !== undefined"
+ *ngIf="data !== undefined && !showNoDataInDateRange"
flex
[data]="data"
[layout]="graph.layout"
[incubator-streampipes] 01/05: Merge branch 'El-Sherif-dev' into
newfeature
Posted by ze...@apache.org.
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 5bae25f01f4bc37e50ea976b3935763b21c945b1
Merge: 574b0a5 1c8b94b
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Fri May 29 09:12:01 2020 +0200
Merge branch 'El-Sherif-dev' into newfeature
ui/angular.json | 26 +-
ui/polyfills.ts | 63 ++
.../widget/dashboard-widget.component.html | 6 +
.../components/widgets/renderer/renderer-config.ts | 43 +
.../widgets/renderer/renderer.component.css | 0
.../widgets/renderer/renderer.component.html | 1 +
.../widgets/renderer/renderer.component.spec.ts | 25 +
.../widgets/renderer/renderer.component.ts | 283 +++++
.../widgets/renderer/renderer_functions.ts | 65 ++
ui/src/app/dashboard/dashboard.module.ts | 2 +
ui/src/app/dashboard/registry/widget-registry.ts | 4 +-
.../dashboard/sdk/schema-requirements-builder.ts | 2 +-
.../time-selector/timeRangeSelector.component.html | 8 +-
.../time-selector/timeRangeSelector.component.ts | 38 +-
ui/src/assets/OrbitControls.js | 1115 ++++++++++++++++++++
ui/src/assets/PackWidget.js | 560 ++++++++++
ui/src/assets/render.js | 169 +++
ui/src/assets/three.min.js | 938 ++++++++++++++++
ui/src/assets/threex.domevents.js | 474 +++++++++
ui/tsconfig.spec.json | 18 +
20 files changed, 3834 insertions(+), 6 deletions(-)
[incubator-streampipes] 04/05: Merge branch 'dev' of
https://github.com/El-Sherif/incubator-streampipes into newfeature
Posted by ze...@apache.org.
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 e99a0ac7710189e87c61242b8d356742eb8afd06
Merge: 6823724 be6c168
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Mon Jun 8 07:52:51 2020 +0200
Merge branch 'dev' of https://github.com/El-Sherif/incubator-streampipes into newfeature
ui/package.json | 15 ++++++++-------
ui/src/app/app-overview/app-overview.component.html | 2 ++
ui/src/app/app-overview/app-overview.component.ts | 5 +++++
.../image/image-labeling/image-labeling.component.html | 8 ++++++++
.../image/image-labeling/image-labeling.component.ts | 5 ++---
5 files changed, 25 insertions(+), 10 deletions(-)
[incubator-streampipes] 03/05: Change time range selector
Posted by ze...@apache.org.
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 6823724bb63b698bc900159db71eacd38ecdd8a8
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Mon Jun 1 08:33:16 2020 +0200
Change time range selector
---
.../widgets/renderer/renderer.component.ts | 4 ++-
.../time-selector/timeRangeSelector.component.ts | 5 +++-
.../line-chart/line-chart-widget.component.html | 3 +++
.../line-chart/line-chart-widget.component.ts | 30 +++++++++++++++++++++-
4 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/ui/src/app/dashboard/components/widgets/renderer/renderer.component.ts b/ui/src/app/dashboard/components/widgets/renderer/renderer.component.ts
index 0aa8407..f187485 100644
--- a/ui/src/app/dashboard/components/widgets/renderer/renderer.component.ts
+++ b/ui/src/app/dashboard/components/widgets/renderer/renderer.component.ts
@@ -260,8 +260,10 @@ export class RendererComponent implements OnInit {
"height": 27,
"width": 40
},
- "type": "KLT"
+ "type": "Cardboard"
}
+
+ // TODO uncomment next line
data = add_item(data,item)
var boxes = convert(data);
diff --git a/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.ts b/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.ts
index 657f03f..f488fd1 100644
--- a/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.ts
+++ b/ui/src/app/data-explorer-v2/components/time-selector/timeRangeSelector.component.ts
@@ -75,7 +75,10 @@ export class TimeRangeSelectorComponent implements OnInit {
changeCustomDateRange() {
this.selectedTimeButton = this.possibleTimeButtons[this.possibleTimeButtons.length - 1];
- this.dateRange = new DateRange(this.dateRange.startDate, this.dateRange.endDate)
+ const newStartTime = new Date(this.dateRange.startDate.getTime());
+ const newEndTime = new Date(this.dateRange.endDate.getTime());
+
+ this.dateRange = new DateRange(newStartTime, newEndTime);
this.reloadData();
}
diff --git a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html
index fcddbb6..7eba186 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html
+++ b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.html
@@ -23,6 +23,9 @@
<button mat-icon-button matTooltip="Download data" class="icon" (click)="downloadDataAsFile()" color="white">
<i class="material-icons">get_app</i>
</button>
+ <button mat-button mat-icon-button color="white" (click)="changeResolution()">
+ <i class="material-icons">autorenew</i>
+ </button>
<button mat-button mat-icon-button color="white" (click)="removeWidget()">
<i class="material-icons">clear</i>
</button>
diff --git a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts
index e433508..1032e05 100644
--- a/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts
+++ b/ui/src/app/data-explorer-v2/components/widgets/line-chart/line-chart-widget.component.ts
@@ -121,7 +121,7 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
}
};
-
+
ngOnInit(): void {
this.availableColumns = this.getNumericProperty(this.dataExplorerWidget.dataLakeMeasure.eventSchema);
@@ -133,6 +133,34 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
this.updateData();
}
+ changeResolution() {
+ console.log('Change Resolution');
+
+ this.setShownComponents(false, false, true);
+ this.dataLakeRestService.getData(
+ this.dataExplorerWidget.dataLakeMeasure.measureName, this.viewDateRange.startDate.getTime(), this.viewDateRange.endDate.getTime()
+ , 's', 1)
+ .subscribe((res: DataResult) => {
+
+ if (res.total === 0) {
+ this.setShownComponents(true, false, false);
+ } else {
+ res.measureName = this.dataExplorerWidget.dataLakeMeasure.measureName;
+ const tmp = this.transformData(res, this.xKey);
+ this.data = this.displayData(tmp, this.yKeys);
+ this.data['measureName'] = tmp.measureName;
+ this.data['labels'] = tmp.labels;
+
+ if (this.data['labels'] !== undefined && this.data['labels'].length > 0) {
+ this.addInitialColouredShapesToGraph();
+ }
+
+ this.setShownComponents(false, true, false);
+ }
+
+ }
+ );
+ }
updateData() {
[incubator-streampipes] 05/05: Merge branch 'dev' into newfeature
Posted by ze...@apache.org.
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 472dad27809270be6162e04b47c02c075fb41988
Merge: e99a0ac f592ce8
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Mon Jun 8 07:53:29 2020 +0200
Merge branch 'dev' into newfeature
.../connect/container/master/management/SourcesManagement.java | 8 +-------
ui/src/app/core-services/datalake/datalake-rest.service.ts | 1 +
ui/src/app/core-ui/image/services/CocoFormat.service.ts | 1 +
ui/src/app/data-explorer-v2/data-explorer-v2.module.ts | 9 ---------
4 files changed, 3 insertions(+), 16 deletions(-)