Merge pull request #318 from Dessia-tech/dev

v0.19.0

Author: Tanguylo

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.19.0]
+### Fixes
+- Multiplot Drawing
+
 ## [0.18.0]
 ### Add
 - Draw to replace PrimitiveGroups

cypress/e2e/histogram.cy.ts

@@ -1,7 +1,7 @@
 import { parseHTML } from '../support/parseHTML';
 import histogramData from '../data_src/histogram.data.json';
 import { Frame, Histogram } from '../../src/subplots';
-import { Vertex, newPoint2D } from '../../src/utils';
+import { Vertex } from '../../src/utils';
 
 const FEATURE_NAME = "histogram"
 
@@ -13,18 +13,14 @@ function initRubberBand(frame: Frame) {
   frame.draw();
 }
 
-before(() => {
-  parseHTML(FEATURE_NAME, histogramData)
-})
+before(() => parseHTML(FEATURE_NAME, histogramData));
 
 describe('HISTOGRAM CANVAS', function () {
-  const describeTitle = this.title + ' -- '
-  beforeEach(() => {
-    cy.visit("cypress/html_files/" + FEATURE_NAME + ".html");
-  })
+  const describeTitle = this.title + ' -- ';
+  beforeEach(() => cy.visit("cypress/html_files/" + FEATURE_NAME + ".html"));
 
   it("should draw canvas", function () {
-    cy.compareSnapshot(describeTitle + this.test.title, 0.05);
+    cy.compareSnapshot(describeTitle + this.test.title, 0.06);
   })
 
   it("should select with rubber band", function () {
@@ -43,7 +39,7 @@ describe('HISTOGRAM CANVAS', function () {
   it("should project mouse", function () {
     cy.window().then(win => {
       const histogram = win.eval('plot_data') as Histogram;
-      [canvasMouse, frameMouse, mouseCoords] = histogram.projectMouse({"offsetX": 291, "offsetY": 601} as MouseEvent);
+      [canvasMouse, frameMouse, mouseCoords] = histogram.projectMouse({"offsetX": 286, "offsetY": 622} as MouseEvent);
       expect(frameMouse.x).to.closeTo(3737, 10);
     })
   })
@@ -55,12 +51,12 @@ describe('HISTOGRAM CANVAS', function () {
 
       histogram.mouseMove(canvasMouse, frameMouse, mouseCoords);
       [canvasDown, frameDown, clickedObject] = histogram.mouseDown(canvasMouse, frameMouse, mouseCoords);
-      clickedObject.mouseMove(histogram.context_show, mouseCoords.add(new Vertex(200, 200)));
+      clickedObject.mouseMove(histogram.context, mouseCoords.add(new Vertex(200, 200)));
       histogram.draw()
       const selectedBars = histogram.bars.reduce((sum, current) => sum + (current.isSelected ? 1 : 0), 0);
 
-      expect(histogram.axes[0].rubberBand.minValue).to.closeTo(4311, 10);
-      expect(histogram.axes[0].rubberBand.maxValue).to.closeTo(10211, 10);
+      expect(histogram.axes[0].rubberBand.minValue).to.closeTo(4291, 10);
+      expect(histogram.axes[0].rubberBand.maxValue).to.closeTo(10191, 10);
       expect(selectedBars).to.equal(5);
     })
   })

cypress/e2e/multiplot.cy.ts

@@ -1,5 +1,4 @@
 import { parseHTML } from '../support/parseHTML';
-import { MultiplePlots } from '../../src/multiplots';
 import multiplotData from '../data_src/multiplot.data.json';
 import primitiveGroupContainerData from '../data_src/primitivegroupcontainer.data.json';
 
@@ -24,62 +23,35 @@ describe('MULTIPLOT CANVAS', function () {
   it("should draw canvas", function () {
     cy.compareSnapshot(describeTitle + this.test.title, 0.05);
   })
+  //TODO: Removed because methods are removed because they don't seem useful to me but kept to remember they were tested
+  // it("should remove primitive group from container in multiplot", function () {
+  //   cy.window().then((win) => {
+  //     win.eval('plot_data').remove_all_primitive_groups_from_container(6);
+  //     cy.compareSnapshot(describeTitle + this.test.title, 0.05);
+  //   })
+  // })
 
-  it("should remove primitive group from container in multiplot", function () {
-    cy.window().then((win) => {
-      win.eval('plot_data').remove_all_primitive_groups_from_container(6);
-      cy.compareSnapshot(describeTitle + this.test.title, 0.05);
-    })
-  })
-
-  it("should add primitive group container in multiplot", function () {
-    cy.window().its('plot_data').then((plot_data) => {
-      plot_data.add_primitive_group_container(primitiveGroupContainerData, [], null)
-      cy.wrap('plot_data').as('plot_data')
-      cy.compareSnapshot(describeTitle + this.test.title, 0.05);
-    })
-  })
+  // it("should add primitive group container in multiplot", function () {
+  //   cy.window().its('plot_data').then((plot_data) => {
+  //     plot_data.add_primitive_group_container(primitiveGroupContainerData, [], null)
+  //     cy.wrap('plot_data').as('plot_data')
+  //     cy.compareSnapshot(describeTitle + this.test.title, 0.05);
+  //   })
+  // })
 
-  it("should reorder all plots in canvas", function () {
-    cy.window().then((win) => {
-      let plot_data = win.eval('plot_data')
-      plot_data.add_primitive_group_container(primitiveGroupContainerData, [], null)
-      plot_data.click_on_view_action()
-      plot_data.click_on_view_action()
-      cy.compareSnapshot(describeTitle + this.test.title, 0.05);
-    })
-  })
+  // it("should reorder all plots in canvas", function () {
+  //   cy.window().then((win) => {
+  //     let plot_data = win.eval('plot_data')
+  //     plot_data.add_primitive_group_container(primitiveGroupContainerData, [], null)
+  //     plot_data.click_on_view_action()
+  //     plot_data.click_on_view_action()
+  //     cy.compareSnapshot(describeTitle + this.test.title, 0.05);
+  //   })
+  // })
 
   it("should draw a canvas with text of empty data", function () {
     parseHTML("emptyMultiplot", {})
     cy.visit("cypress/html_files/emptyMultiplot.html");
     cy.compareSnapshot(describeTitle + this.test.title, 0.05);
   })
-
-  // describe('MULTIPLOT FRONTEND INTERFACE', () => {
-  //   it("should return a list of 10 points", () => {
-  //     cy.window().then((win) => {
-  //       let plot_data = win.eval('plot_data')
-
-  //     })
-  //   })
-  //   it("should return a list of 10 points", () => {
-  //     cy.window().then((win) => {
-  //       let plot_data = win.eval('plot_data')
-
-  //     })
-  //   })
-  //   it("should return a list of 10 points", () => {
-  //     cy.window().then((win) => {
-  //       let plot_data = win.eval('plot_data')
-
-  //     })
-  //   })
-  //   it("should return a list of 10 points", () => {
-  //     cy.window().then((win) => {
-  //       let plot_data = win.eval('plot_data')
-
-  //     })
-  //   })
-  // })
 })

cypress/e2e/plotscatter.cy.ts

@@ -14,6 +14,6 @@ describe('PLOT SCATTER CANVAS', function () {
   })
 
   it("should draw canvas", function () {
-    cy.compareSnapshot(describeTitle + this.test.title, 0.05);
+    cy.compareSnapshot(describeTitle + this.test.title, 0.1);
   })
 })

cypress/e2e/scattermatrix.cy.ts

@@ -14,6 +14,6 @@ describe('PLOT SCATTER MATRIX CANVAS', function () {
   })
 
   it("should draw canvas", function () {
-    cy.compareSnapshot(describeTitle + this.test.title, 0.05);
+    cy.compareSnapshot(describeTitle + this.test.title, 0.07);
   })
 })

cypress/e2e/simpleshapes.cy.ts

@@ -40,10 +40,14 @@ describe('SIMPLE SHAPES CANVAS', function () {
     })
   })
 
-  it("should be hovered near line", function () {
+  it("should hover line even if mouse is not exactly on line", function () {
     cy.window().then((win) => {
       const draw = win.eval('plot_data');
-      const [canvasMouse, frameMouse, mouseCoords] = draw.projectMouse({"offsetX": 804, "offsetY": 204} as MouseEvent);
+      let [canvasMouse, frameMouse, mouseCoords] = draw.projectMouse({"offsetX": 814, "offsetY": 196} as MouseEvent);
+      draw.mouseMove(canvasMouse, frameMouse, mouseCoords);
+      expect(draw.relativeObjects.shapes[23].isHovered).to.be.true;
+
+      [canvasMouse, frameMouse, mouseCoords] = draw.projectMouse({"offsetX": 822, "offsetY": 196} as MouseEvent);
       draw.mouseMove(canvasMouse, frameMouse, mouseCoords);
       expect(draw.relativeObjects.shapes[23].isHovered).to.be.true;
     })