improve annotations; allow annotation to be drawn by px

Author: junedchhipa

src/modules/annotations/Helpers.js

@@ -187,6 +187,10 @@ export default class Helpers {
       }
     }
 
+    if (typeof y === 'string' && y.indexOf('px') > -1) {
+      yP = parseFloat(y)
+    }
+
     return yP
   }
 
@@ -232,6 +236,22 @@ export default class Helpers {
       x1 = w.globals.gridWidth
     }
 
+    if (
+      type === 'x1' &&
+      typeof anno.x === 'string' &&
+      anno.x.indexOf('px') > -1
+    ) {
+      x1 = parseFloat(anno.x)
+    }
+
+    if (
+      type === 'x2' &&
+      typeof anno.x2 === 'string' &&
+      anno.x2.indexOf('px') > -1
+    ) {
+      x2 = parseFloat(anno.x2)
+    }
+
     return type === 'x1' ? x1 : x2
   }
 

src/modules/annotations/XAxisAnnotations.js

@@ -65,12 +65,18 @@ export default class XAnnotations {
         rect.node.classList.add(anno.id)
       }
     }
-    let textY = anno.label.position === 'top' ? 4 : w.globals.gridHeight
 
     let textRects = this.annoCtx.graphics.getTextRects(
       text,
       parseFloat(anno.label.style.fontSize)
     )
+    let textY =
+      anno.label.position === 'top'
+        ? 4
+        : anno.label.position === 'center'
+        ? w.globals.gridHeight / 2 +
+          (anno.label.orientation === 'vertical' ? textRects.width / 2 : 0)
+        : w.globals.gridHeight
 
     let elText = this.annoCtx.graphics.drawText({
       x: x1 + anno.label.offsetX,

src/modules/annotations/YAxisAnnotations.js

@@ -61,7 +61,12 @@ export default class YAnnotations {
         rect.node.classList.add(anno.id)
       }
     }
-    let textX = anno.label.position === 'right' ? w.globals.gridWidth : 0
+    let textX =
+      anno.label.position === 'right'
+        ? w.globals.gridWidth
+        : anno.label.position === 'center'
+        ? w.globals.gridWidth / 2
+        : 0
 
     let elText = this.annoCtx.graphics.drawText({
       x: textX + anno.label.offsetX,