Skip to content

Commit b3b552b

Browse files
camilledupontcamilledupont
committed
Merge branch 'trackingTFJS' into 'master'
Add manual tracking component See merge request pixano/pixano-elements!11
2 parents bd1f6a1 + c2b1fd1 commit b3b552b

File tree

109 files changed

+2654
-2538
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+2654
-2538
lines changed

‎demos/cuboid/my-demo.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {html, LitElement} from 'lit-element';
99
import { demoStyles,
1010
fullscreen,
1111
createPencil,
12-
swap } from '@pixano/core/lib/svg';
12+
swap } from '@pixano/core/lib/style';
1313

1414
const colormap = [
1515
0xe6194b, 0x3cb44b, 0xffe119, 0x0082c8, 0xf58230, 0x911eb4, 0x46f0f0,

‎demos/cuboid/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
},
1717
"devDependencies": {
1818
"source-map-loader": "^0.2.4",
19-
"webpack": "^4.43.0",
20-
"webpack-cli": "^3.3.11"
19+
"webpack": "4.44.2",
20+
"webpack-cli": "3.3.12"
2121
},
2222
"dependencies": {
2323
"@pixano/graphics-3d": "0.4.3",

‎demos/graph/my-demo.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { demoStyles,
1111
createPencil,
1212
pointer,
1313
zoomIn,
14-
zoomOut } from '@pixano/core/lib/svg';
14+
zoomOut } from '@pixano/core/lib/style';
1515

1616
class MyDemo extends LitElement {
1717
static get styles() {
@@ -40,11 +40,6 @@ class MyDemo extends LitElement {
4040
this.disableMultiSelection = false;
4141
this.disableTabulation = false;
4242
this.hideLabels = false;
43-
window.addEventListener('keydown', (evt) => {
44-
if (evt.key == 'Alt') {
45-
this.element.mode = this.element.mode === 'edit' ? 'create': 'edit';
46-
}
47-
});
4843
}
4944

5045
get rightPanel() {

‎demos/graph/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
},
1818
"devDependencies": {
1919
"source-map-loader": "^0.2.4",
20-
"webpack": "^4.43.0",
21-
"webpack-cli": "^3.3.11"
20+
"webpack": "4.44.2",
21+
"webpack-cli": "3.3.12"
2222
},
2323
"dependencies": {
2424
"@pixano/core": "0.4.3",

‎demos/index.html‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<!-- <script type="module" src="dist/graphics-2d.min.js"></script> -->
5+
<script type="module" src="../packages/graphics-2d/dist/graphics-2d.min.js"></script>
6+
</head>
7+
<style>
8+
body {
9+
position: absolute;
10+
margin: 0;
11+
inset: 0;
12+
}
13+
</style>
14+
<body>
15+
<pxn-rectangle image="https://i.imgur.com/BHsjThB.jpg"></pxn-rectangle>
16+
</body>
17+
</html>

‎demos/polygon-http/my-demo.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { demoStyles,
1010
fullscreen,
1111
createPencil,
1212
zoomIn,
13-
zoomOut } from '@pixano/core/lib/svg';
13+
zoomOut } from '@pixano/core/lib/style';
1414

1515
const colors = [
1616
'red', 'blue', 'green', 'purple',

‎demos/polygon-http/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"cors": "^2.8.5",
1616
"express": "^4.17.1",
1717
"source-map-loader": "^0.2.4",
18-
"webpack": "^4.43.0",
19-
"webpack-cli": "^3.3.11"
18+
"webpack": "4.44.2",
19+
"webpack-cli": "3.3.12"
2020
},
2121
"dependencies": {
2222
"@pixano/graphics-2d": "0.4.3",

‎demos/polygon/my-demo.js‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { demoStyles,
1111
createPencil,
1212
polyline,
1313
zoomIn,
14-
zoomOut } from '@pixano/core/lib/svg';
14+
zoomOut } from '@pixano/core/lib/style';
1515

1616
const colors = [
1717
'red', 'blue', 'green', 'purple',
@@ -35,11 +35,6 @@ class MyDemo extends LitElement {
3535
this.mode = 'edit'; // overwrite default mode param of element
3636
this.image = "image.jpg";
3737
this.isOpenedPolygon = true;
38-
window.addEventListener('keydown', (evt) => {
39-
if (evt.key == 'Alt') {
40-
this.element.mode = this.element.mode === 'edit' ? 'create': 'edit';
41-
}
42-
});
4338
}
4439

4540
fullScreen() {
@@ -53,8 +48,8 @@ class MyDemo extends LitElement {
5348
<div class="right-panel">
5449
<p class="icon" title="Fullscreen" style="position: absolute;" @click=${this.fullScreen}>${fullscreen}</p>
5550
<div class="icons">
56-
<p class="icon" title="Add polygon" @click=${() => {this.element.isOpenedPolygon=false; this.element.mode = 'create'}}>${createPencil}</p>
57-
<p class="icon" title="Add line" @click=${() => {this.element.isOpenedPolygon=true; this.element.mode = 'create'}}>${polyline}</p>
51+
<p class="icon" title="Add polygon" @click=${() => {this.isOpenedPolygon=false; this.element.mode = 'create'}}>${createPencil}</p>
52+
<p class="icon" title="Add line" @click=${() => {this.isOpenedPolygon=true; this.element.mode = 'create'}}>${polyline}</p>
5853
<p class="icon" title="Zoom in" @click=${() => this.element.viewControls.zoomIn()}>${zoomIn}</p>
5954
<p class="icon" title="Zoom out" @click=${() => this.element.viewControls.zoomOut()}>${zoomOut}</p>
6055
</div>
@@ -66,11 +61,12 @@ class MyDemo extends LitElement {
6661
return html`
6762
<main>
6863
<pxn-polygon image="${this.image}"
69-
isOpenedPolygon="${this.isOpenedPolygon}"
64+
?isOpenedPolygon="${this.isOpenedPolygon}"
7065
disablefullscreen
7166
@create=${this.onCreate}
72-
@update=${this.onUpdate}
73-
@selection=${this.onSelection}>
67+
@update=${(e) => console.log('update ids', e.detail)}
68+
@delete=${(e) => console.log('delete', e.detail)}
69+
@selection=${(e) => console.log('selection', e.detail)}>
7470
</pxn-polygon>
7571
${this.rightPanel}
7672
</main>`;
@@ -80,14 +76,7 @@ class MyDemo extends LitElement {
8076
const newObj = evt.detail;
8177
newObj.color = colors[Math.floor(Math.random() * colors.length)];
8278
this.element.mode = 'edit';
83-
}
84-
85-
onUpdate(evt) {
86-
console.log('update', evt.detail);
87-
}
88-
89-
onSelection(evt) {
90-
console.log('selection ids', evt.detail);
79+
console.log('create', newObj.id);
9180
}
9281

9382
get element() {

‎demos/polygon/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
},
1414
"devDependencies": {
1515
"source-map-loader": "^0.2.4",
16-
"webpack": "^4.43.0",
17-
"webpack-cli": "^3.3.11"
16+
"webpack": "4.44.2",
17+
"webpack-cli": "3.3.12"
1818
},
1919
"dependencies": {
2020
"@pixano/graphics-2d": "0.4.3",

‎demos/rectangle/my-demo.js‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { demoStyles,
1010
fullscreen,
1111
createPencil,
1212
zoomIn,
13-
zoomOut } from '@pixano/core/lib/svg';
13+
zoomOut } from '@pixano/core/lib/style';
1414

1515
const colors = [
1616
'blue', 'green', 'purple',
@@ -27,14 +27,10 @@ class MyDemo extends LitElement {
2727
image: {type: String}
2828
};
2929
}
30+
3031
constructor() {
3132
super();
3233
this.image = 'image.jpg';
33-
window.addEventListener('keydown', (evt) => {
34-
if (evt.key == 'Alt') {
35-
this.element.mode = this.element.mode === 'edit' ? 'create': 'edit';
36-
}
37-
});
3834
}
3935

4036
get rightPanel() {
@@ -62,8 +58,9 @@ class MyDemo extends LitElement {
6258
<pxn-rectangle image="${this.image}"
6359
disablefullscreen
6460
@create=${this.onCreate}
65-
@update=${this.onUpdate}
66-
@selection=${this.onSelection}>
61+
@update=${(e) => console.log('update ids', e.detail)}
62+
@delete=${(e) => console.log('delete', e.detail)}
63+
@selection=${(e) => console.log('selection', e.detail)}>
6764
</pxn-rectangle>
6865
${this.rightPanel}
6966
</main>`;
@@ -73,14 +70,7 @@ class MyDemo extends LitElement {
7370
const newObj = evt.detail;
7471
newObj.color = colors[Math.floor(Math.random() * colors.length)];
7572
this.element.mode = 'edit';
76-
}
77-
78-
onUpdate(evt) {
79-
console.log('update ids', evt.detail);
80-
}
81-
82-
onSelection(evt) {
83-
console.log('selection ids', evt.detail);
73+
console.log("create", evt.detail.id)
8474
}
8575

8676
get element() {

0 commit comments

Comments
 (0)