Skip to content

Commit dd5d301

Browse files
TanguyloTanguylo
authored
Merge pull request #374 from Dessia-tech/fix/html
Fix/html
2 parents 791b32b + 4bf37ab commit dd5d301

26 files changed

+685
-288
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Fix
1010
- Fix bug on tooltip origin when mouse leaving while hovering a shape
1111
- Remove unused code
12+
- Fix html for prettier to work
1213
- Remove name from add plot feature
1314

1415
## [0.22.2]

‎cypress/e2e/visualRegressions.cy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ FIGURES_DATA.forEach(figureData => {
7777
it("should hover line even if mouse is not exactly on line", function () {
7878
cy.window().then((win) => {
7979
const draw = win.eval('plot_data');
80-
let [canvasMouse, frameMouse, mouseCoords] = draw.projectMouse({"offsetX": 814, "offsetY": 196} as MouseEvent);
80+
let [canvasMouse, frameMouse, mouseCoords] = draw.projectMouse({"offsetX": 809, "offsetY": 196} as MouseEvent);
8181
draw.mouseMove(canvasMouse, frameMouse, mouseCoords);
8282
expect(draw.relativeObjects.shapes[23].isHovered).to.be.true;
8383

84-
[canvasMouse, frameMouse, mouseCoords] = draw.projectMouse({"offsetX": 822, "offsetY": 196} as MouseEvent);
84+
[canvasMouse, frameMouse, mouseCoords] = draw.projectMouse({"offsetX": 816, "offsetY": 196} as MouseEvent);
8585
draw.mouseMove(canvasMouse, frameMouse, mouseCoords);
8686
expect(draw.relativeObjects.shapes[23].isHovered).to.be.true;
8787
});

‎cypress/snapshots/base/visualRegressions.cy.ts/GRAPH2D -- should draw a nice horizontal parallel plot-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/GRAPH2D -- should draw canvas-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/HISTOGRAM -- should draw canvas-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/MULTIPLOT -- should draw a canvas with text of empty data-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/MULTIPLOT -- should draw canvas-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/PARALLELPLOT -- should draw a nice horizontal parallel plot-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/PARALLELPLOT -- should draw canvas-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/PLOTSCATTER -- should draw canvas-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/PRIMITIVEGROUPCONTAINER -- should draw canvas-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/SCATTERMATRIX -- should draw canvas-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/SIMPLESHAPES -- should draw canvas-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/SIMPLESHAPES -- should draw tooltip on line-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/snapshots/base/visualRegressions.cy.ts/TEXTSCALING -- should draw canvas-base.png

Lines changed: 2 additions & 2 deletions
Loading

‎cypress/templates/emptyMultiplot.template.html

Lines changed: 71 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,83 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<style>
4-
.slider {
5-
-webkit-appearance: none;
6-
height: 10px;
7-
background: #d3d3d3;
8-
outline: none;
9-
opacity: 0.7;
10-
-webkit-transition: .2s;
11-
transition: opacity .2s;
12-
}
13-
14-
.slider:hover {
15-
opacity: 1;
16-
}
17-
18-
.slider::-moz-range-thumb {
19-
width: 25px;
20-
height: 10px;
21-
background: #04AA6D;
22-
cursor: pointer;
23-
}
4+
.slider {
5+
-webkit-appearance: none;
6+
height: 10px;
7+
background: #d3d3d3;
8+
outline: none;
9+
opacity: 0.7;
10+
-webkit-transition: .2s;
11+
transition: opacity .2s;
12+
}
13+
14+
.slider:hover {
15+
opacity: 1;
16+
}
17+
18+
.slider::-moz-range-thumb {
19+
width: 25px;
20+
height: 10px;
21+
background: #04AA6D;
22+
cursor: pointer;
23+
}
24+
25+
#buttons {
26+
display: flex;
27+
column-gap: 3rem;
28+
row-gap: 0.5em;
29+
flex-wrap: wrap;
30+
margin-bottom: 0.5rem;
31+
margin-top: 1rem;
32+
margin: 0 auto;
33+
}
34+
35+
#sub_button {
36+
display: flex;
37+
gap: 0.5rem;
38+
flex-wrap: wrap;
39+
}
2440
</style>
2541
<head>
2642
<script src=$core_path></script>
2743
</head>
2844
<div id="buttons">
29-
<button name="mergeON" value="OK" type="button" onclick="plot_data.switchMerge()"> Switch Point Merge </button> &nbsp;&nbsp;
30-
<button name="Zoom" value="OK" type="button" onclick="plot_data.switchZoom()"> Zoom Box </button>
31-
<button name="Zoom+" value="OK" type="button" onclick="plot_data.zoomIn()"> Zoom+ </button>
32-
<button name="Zoom-" value="OK" type="button" onclick="plot_data.zoomOut()"> Zoom- </button> &nbsp;&nbsp;
33-
Cluster:&nbsp; <input type="range" class="slider" min="0" max="2500" value="1250" onclick="plot_data.simpleCluster(value / 10000)"></input>
34-
<button name="resetClusters" value="OK" type="button" onclick="plot_data.resetClusters()"> Reset clusters </button> &nbsp;&nbsp;
35-
<button name="resetView" value="OK" type="button" onclick="plot_data.resetView()"> Reset view </button>
36-
<button name="showPoints" value="OK" type="button" onclick="plot_data.togglePoints()"> Show points </button>
37-
<button name="switchOrientation" value="OK" type="button" onclick="plot_data.switchOrientation()"> Change Disposition </button>
38-
<button name="toogleAxes" value="OK" type="button" onclick="plot_data.htmlToggleAxes()"> Show / Hide Axes </button>
39-
<hr style="border-top: 2px;">
45+
<div id="sub_button">
46+
<button name="mergeON" value="OK" type="button"
47+
onclick="plot_data.switchMerge()"> Switch Point Merge </button>
48+
</div>
49+
<div id="sub_button">
50+
<button name="Zoom" value="OK" type="button"
51+
onclick="plot_data.switchZoom()"> Zoom Box </button>
52+
<button name="Zoom+" value="OK" type="button" onclick="plot_data.zoomIn()"> Zoom+ </button>
53+
<button name="Zoom-" value="OK" type="button" onclick="plot_data.zoomOut()"> Zoom- </button>
54+
</div>
55+
<div id="sub_button">
56+
Cluster: <input type="range" class="slider" min="0" max="2500" value="1250"
57+
onclick="plot_data.simpleCluster(value / 10000)"/>
58+
<button name="resetClusters" value="OK" type="button"
59+
onclick="plot_data.resetClusters()"> Reset clusters </button>
60+
</div>
61+
<div id="sub_button">
62+
<button name="resetView" value="OK" type="button"
63+
onclick="plot_data.resetView()"> Reset view </button>
64+
<button name="showPoints" value="OK" type="button"
65+
onclick="plot_data.togglePoints()"> Show points </button>
66+
<button name="switchOrientation" value="OK" type="button"
67+
onclick="plot_data.switchOrientation()"> Change Disposition </button>
68+
<button name="toogleAxes" value="OK" type="button"
69+
onclick="plot_data.htmlToggleAxes()"> Show / Hide Axes </button>
70+
<button name="logScale" value="OK" type="button"
71+
onclick="plot_data.switchLogScale()"> Log Scale</button>
72+
</div>
73+
74+
<div id="sub_button">
75+
<button name="resize" value="OK" type="button" onclick="plot_data.switchResize()"> Resize Figures </button>
76+
<button name="resizeMP" value="OK" type="button"
77+
onclick="plot_data.resize(...PlotData.computeCanvasSize('#buttons'))"> Resize Multiplot </button>
78+
</div>
4079
</div>
80+
<hr style="border-top: 2px;"/>
4181
<div id="app">
4282
<canvas id="$canvas_id" width="$width" height="$height" style="border: 1px solid black;"></canvas>
4383

‎cypress/templates/graph2d.template.html

Lines changed: 63 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,77 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<style>
4-
.slider {
5-
-webkit-appearance: none;
6-
height: 10px;
7-
background: #d3d3d3;
8-
outline: none;
9-
opacity: 0.7;
10-
-webkit-transition: .2s;
11-
transition: opacity .2s;
12-
}
4+
.slider {
5+
-webkit-appearance: none;
6+
height: 10px;
7+
background: #d3d3d3;
8+
outline: none;
9+
opacity: 0.7;
10+
-webkit-transition: .2s;
11+
transition: opacity .2s;
12+
}
1313

14-
.slider:hover {
15-
opacity: 1;
16-
}
14+
.slider:hover {
15+
opacity: 1;
16+
}
1717

18-
.slider::-moz-range-thumb {
19-
width: 25px;
20-
height: 10px;
21-
background: #04AA6D;
22-
cursor: pointer;
23-
}
18+
.slider::-moz-range-thumb {
19+
width: 25px;
20+
height: 10px;
21+
background: #04AA6D;
22+
cursor: pointer;
23+
}
24+
25+
#buttons {
26+
display: flex;
27+
column-gap: 3rem;
28+
row-gap: 0.5em;
29+
flex-wrap: wrap;
30+
margin-bottom: 0.5rem;
31+
margin-top: 1rem;
32+
margin: 0 auto;
33+
}
34+
35+
#sub_button {
36+
display: flex;
37+
gap: 0.5rem;
38+
flex-wrap: wrap;
39+
}
2440
</style>
2541
<head>
2642
<script src=$core_path></script>
2743
</head>
2844
<div id="buttons">
29-
<button name="mergeON" value="OK" type="button" onclick="plot_data.switchMerge()"> Switch Point Merge </button> &nbsp;&nbsp;
30-
<button name="Zoom" value="OK" type="button" onclick="plot_data.switchZoom()"> Zoom Box </button>
31-
<button name="Zoom+" value="OK" type="button" onclick="plot_data.zoomIn()"> Zoom+ </button>
32-
<button name="Zoom-" value="OK" type="button" onclick="plot_data.zoomOut()"> Zoom- </button> &nbsp;&nbsp;
33-
Cluster:&nbsp; <input type="range" class="slider" min="0" max="2500" value="1250" onclick="plot_data.simpleCluster(value / 10000)"></input>
34-
<button name="resetClusters" value="OK" type="button" onclick="plot_data.resetClusters()"> Reset clusters </button> &nbsp;&nbsp;
35-
<button name="resetView" value="OK" type="button" onclick="plot_data.resetView()"> Reset view </button>
36-
<button name="showPoints" value="OK" type="button" onclick="plot_data.togglePoints()"> Show points </button>
37-
<button name="switchOrientation" value="OK" type="button" onclick="plot_data.switchOrientation()"> Change Disposition </button>
38-
<button name="toogleAxes" value="OK" type="button" onclick="plot_data.htmlToggleAxes()"> Show / Hide Axes </button>
39-
<hr style="border-top: 2px;">
45+
<div id="sub_button">
46+
<button name="mergeON" value="OK" type="button"
47+
onclick="plot_data.switchMerge()"> Switch Point Merge </button>
48+
</div>
49+
<div id="sub_button">
50+
<button name="Zoom" value="OK" type="button"
51+
onclick="plot_data.switchZoom()"> Zoom Box </button>
52+
<button name="Zoom+" value="OK" type="button" onclick="plot_data.zoomIn()"> Zoom+ </button>
53+
<button name="Zoom-" value="OK" type="button" onclick="plot_data.zoomOut()"> Zoom- </button>
54+
</div>
55+
<div id="sub_button">
56+
Cluster: <input type="range" class="slider" min="0" max="2500" value="1250"
57+
onclick="plot_data.simpleCluster(value / 10000)"/>
58+
<button name="resetClusters" value="OK" type="button"
59+
onclick="plot_data.resetClusters()"> Reset clusters </button>
60+
</div>
61+
<div id="sub_button">
62+
<button name="resetView" value="OK" type="button"
63+
onclick="plot_data.resetView()"> Reset view </button>
64+
<button name="showPoints" value="OK" type="button"
65+
onclick="plot_data.togglePoints()"> Show points </button>
66+
<button name="switchOrientation" value="OK" type="button"
67+
onclick="plot_data.switchOrientation()"> Change Disposition </button>
68+
<button name="toogleAxes" value="OK" type="button"
69+
onclick="plot_data.htmlToggleAxes()"> Show / Hide Axes </button>
70+
<button name="logScale" value="OK" type="button"
71+
onclick="plot_data.switchLogScale()"> Log Scale</button>
72+
</div>
4073
</div>
74+
<hr style="border-top: 2px;"/>
4175
<div id="app">
4276
<canvas id="$canvas_id" width="$width" height="$height" style="border: 1px solid black;"></canvas>
4377

0 commit comments

Comments
 (0)