Merge pull request #343 from Dessia-tech/dev

v0.22.0

Author: Tanguylo

CHANGELOG.md

@@ -5,6 +5,17 @@ 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.22.0]
+### Add
+- Integer axes only show integer ticks
+- Handle date as continuous value on axes
+- Allow to log scale axes
+
+### Fix
+- Add reference_path to all Primitive / Elementary drawing Objects
+- Remove data attr from class Arc in Python
+- Light improvement of class Arc in Python
+
 ## [0.21.0]
 ### Add
 - Tests of typescript app

code_pylint.py

@@ -35,7 +35,7 @@
                      'trailing-whitespace': 11,
                      'empty-docstring': 7,
                      'missing-module-docstring': 4,
-                     'too-many-arguments': 19,
+                     'too-many-arguments': 20,
                      'too-few-public-methods': 5,
                      'unnecessary-comprehension': 5,
                      'no-value-for-parameter': 2,

cypress/e2e/axes.cy.ts

@@ -1,3 +1,4 @@
+import { isIntegerArray } from "../../instrumented/functions";
 import { Vertex } from "../../instrumented/baseShape";
 import { Rect } from "../../instrumented/primitives";
 import { Axis, ParallelAxis } from "../../instrumented/axes";
@@ -30,7 +31,7 @@ describe('Axis', function() {
     const ticks = [-1, 0, 1, 2]
     expect(axis.ticks).to.deep.equal(ticks);
     expect(axis.isDiscrete, `isDiscrete`).to.be.true;
-});
+  });
 
   it('should be well created with empty vector features', function() {
     const axis = new Axis([], boundingBox, origin, end, name, initScale, nTicks);
@@ -40,8 +41,19 @@ describe('Axis', function() {
   });
 
   it('should be well created without only one feature', function() {
-    const axis = new Axis([1], boundingBox, origin, end, name, initScale, nTicks);
-    expect(axis.ticks.length, `length ticks`).to.equal(7);
+    const axis = new Axis([1.2], boundingBox, origin, end, name, initScale, nTicks);
+    expect(axis.ticks.length, `length ticks`).to.equal(5);
+  });
+
+  it('should be only show integer ticks', function() {
+    const axis = new Axis(vector, boundingBox, origin, end, name, initScale, nTicks);
+    expect(isIntegerArray(axis.ticks), `integer ticks`).to.be.true;
+    axis.updateScale(new Vertex(20, 20), new Vertex(2, 0.5), new Vertex());
+    expect(isIntegerArray(axis.ticks), `integer ticks`).to.be.true;
+    axis.updateScale(new Vertex(20, 20), new Vertex(-2, -0.5), new Vertex());
+    expect(isIntegerArray(axis.ticks), `integer ticks`).to.be.true;
+    axis.updateScale(new Vertex(20, 20), new Vertex(10, 0.5), new Vertex());
+    expect(isIntegerArray(axis.ticks), `integer ticks`).to.be.true;
   });
 
   it("should scale axis with another one", function() {
@@ -75,6 +87,13 @@ describe('Axis', function() {
     expect(axis.maxValue, "maxValue").to.be.closeTo(8.7, 0.05);
   });
 
+  it("should scale axis in a logarithmic way", function() {
+    const axis = new Axis(vector, boundingBox, origin, end, name, initScale, nTicks);
+    expect(vector.map(element => Math.floor(axis.relativeToAbsolute(element))), "projected values").to.deep.equal([4, 27, 50, 72, 95]);
+    axis.switchLogScale(vector);
+    expect(vector.map(element => Math.floor(axis.relativeToAbsolute(element))), "projected log values").to.deep.equal([-19, -12, -8, -5, -3]);
+  });
+
   it('should update axis with translation and style', function() {
     const axis = new Axis(vector, boundingBox, origin, end, name, initScale, nTicks);
     const viewPoint = new Vertex(0, 0);
@@ -112,7 +131,43 @@ describe('Axis', function() {
 
     numericStringVector.forEach((value, index) => expect(stringAxis.labels[value], `string value ${index}`).to.equal(stringVector[index]));
     numericNumberVector.forEach((value, index) => expect(value, `number value ${index}`).to.equal(numberVector[index]));
-  })
+  });
+
+  it("should be drawn with date labels", function() {
+    const timeZoneOffSet = new Date().getTimezoneOffset() * 60;
+    const dateVector = [
+      new Date((123456789 + timeZoneOffSet) * 1000),
+      new Date((234242524 + timeZoneOffSet) * 1000),
+      new Date((326472910 + timeZoneOffSet) * 1000),
+      new Date((564927592 + timeZoneOffSet) * 1000),
+      new Date((675829471 + timeZoneOffSet) * 1000)
+    ];
+    const dateAxis = new Axis(dateVector, boundingBox, origin, end, name, initScale, nTicks);
+    const controlLabels = timeZoneOffSet == 0 ?
+      [
+        "07/03/1973 - 09:46:40",
+        "02/05/1976 - 19:33:20",
+        "05/07/1979 - 05:20:00",
+        "07/09/1982 - 15:06:40",
+        "03/11/1985 - 00:53:20",
+        "05/01/1989 - 10:40:00",
+        "07/03/1992 - 20:26:40"
+      ]
+      :
+      [
+        "07/03/1973 - 10:46:40",
+        "02/05/1976 - 21:33:20",
+        "05/07/1979 - 07:20:00",
+        "07/09/1982 - 17:06:40",
+        "03/11/1985 - 01:53:20",
+        "05/01/1989 - 11:40:00",
+        "07/03/1992 - 21:26:40"
+      ];
+    const controlTicks = [100000000000, 200000000000, 300000000000, 400000000000, 500000000000, 600000000000, 700000000000];
+    expect(dateAxis.labels, "labels").to.deep.equal(controlLabels);
+    expect(dateAxis.ticks, "labels").to.deep.equal(controlTicks);
+
+  });
 });
 
 describe("RubberBand", function() {

cypress/e2e/figures.cy.ts

@@ -138,7 +138,7 @@ describe("Frame", function() {
     const data = {
         "name": "",
         "elements": [
-            { "name": "", "values": { "x": 0, "y": 1 }, "x": 0, "y": 1 },
+            { "name": "", "values": { "x": 0.1, "y": 1.1 }, "x": 0.1, "y": 1.1 },
             { "name": "", "values": { "x": 1, "y": 2 }, "x": 1, "y": 2 },
             { "name": "", "values": { "x": 2, "y": 3 }, "x": 2, "y": 3 }
         ]
@@ -148,8 +148,8 @@ describe("Frame", function() {
         const frame = new Frame(data, canvas.width, canvas.height, 0, 0, canvasID, false);
         expect(frame.xFeature, "xFeature").to.be.equal("x");
         expect(frame.yFeature, "yFeature").to.be.equal("y");
-        expect(frame.axes[0].ticks[0], "axes[0].ticks[0]").to.be.equal(0);
-        expect(frame.axes[0].ticks[4], "axes[0].ticks[4]").to.be.equal(0.8);
+        expect(frame.axes[0].ticks[0], "axes[0].ticks[0]").to.be.equal(0.2);
+        expect(frame.axes[0].ticks[4], "axes[0].ticks[4]").to.be.equal(1);
     });
 
     it("should be built with empty attribute_names", function() {
@@ -158,7 +158,7 @@ describe("Frame", function() {
         expect(frame.xFeature, "xFeature").to.be.equal("indices");
         expect(frame.yFeature, "yFeature").to.be.equal("x");
         expect(frame.axes[0].ticks[0], "axes[0].ticks[0]").to.be.equal(0);
-        expect(frame.axes[0].ticks[4], "axes[0].ticks[4]").to.be.equal(0.8);
+        expect(frame.axes[0].ticks[2], "axes[0].ticks[2]").to.be.equal(2);
     });
 
     it("should change axis feature", function() {