Make circles blue.

Remove draw time radius assignment. Honor creation radius.
Creation radius set to 10.
Create circle by selecting a single point.

Author: Angelina1984

dist/pdf-annotate.js

@@ -0,0 +1,77 @@
+import PDFJSAnnotate from '../PDFJSAnnotate';
+import config from '../config';
+import { appendChild } from '../render/appendChild';
+import {
+  findSVGAtPoint,
+  getMetadata,
+  convertToSvgPoint
+} from './utils';
+
+let _enabled = false;
+let _type;
+
+/**
+ * Handle document.mouseup event
+ *
+ * @param {Event} e The DOM event to handle
+ */
+function handleDocumentMouseup(e) {
+  let svg = findSVGAtPoint(e.clientX, e.clientY);
+  if (!svg) {
+    return;
+  }
+  let rect = svg.getBoundingClientRect();
+  saveCircle(svg, _type, {
+    x: e.clientX - rect.left,
+    y: e.clientY - rect.top
+  }, "0000FF");
+}
+
+/**
+ * Save a circle annotation
+ *
+ * @param {String} type The type of circle (circle, emptycircle, fillcircle)
+ * @param {Object} pt The point to use for annotation
+ * @param {String} color The color of the rects
+ */
+function saveCircle(svg, type, pt, color) {
+  // Initialize the annotation
+  let svg_pt = convertToSvgPoint([ pt.x, pt.y ], svg)
+  let annotation = {
+    type,
+    color,
+    cx: svg_pt[0],
+    cy: svg_pt[1],
+    r: 10
+  };
+
+  let { documentId, pageNumber } = getMetadata(svg);
+
+  // Add the annotation
+  PDFJSAnnotate.getStoreAdapter().addAnnotation(documentId, pageNumber, annotation)
+    .then((annotation) => {
+      appendChild(svg, annotation);
+    });
+}
+
+/**
+ * Enable circle behavior
+ */
+export function enableCircle(type) {
+  _type = type;
+  
+  if (_enabled) { return; }
+
+  _enabled = true;
+  document.addEventListener('mouseup', handleDocumentMouseup);
+}
+
+/**
+ * Disable circle behavior
+ */
+export function disableCircle() {
+  if (!_enabled) { return; }
+
+  _enabled = false;
+  document.removeEventListener('mouseup', handleDocumentMouseup);
+}

dist/pdf-annotate.js.map

@@ -4,6 +4,7 @@ import { disablePen, enablePen, setPen } from './pen';
 import { disableArrow, enableArrow, setArrow } from './arrow';
 import { disablePoint, enablePoint } from './point';
 import { disableRect, enableRect } from './rect';
+import { disableCircle, enableCircle } from './circle';
 import { disableText, enableText, setText } from './text';
 import { createPage, renderPage } from './page';
 
@@ -13,6 +14,7 @@ export default {
   disablePen, enablePen, setPen,
   disablePoint, enablePoint,
   disableRect, enableRect,
+  disableCircle, enableCircle,
   disableArrow, enableArrow,
   disableText, enableText, setText,
   createPage, renderPage

dist/pdf-annotate.min.js

@@ -44,7 +44,7 @@ function getSelectionRects() {
  */
 function handleDocumentMousedown(e) {
   let svg;
-  if ((_type !== 'area' && _type !== 'circle' && _type !== 'fillcircle' && _type !== 'emptycircle')|| !(svg = findSVGAtPoint(e.clientX, e.clientY))) {
+  if (_type !== 'area' || !(svg = findSVGAtPoint(e.clientX, e.clientY))) {
     return;
   }
 
@@ -89,7 +89,7 @@ function handleDocumentMousemove(e) {
  */
 function handleDocumentMouseup(e) {
   let rects;
-  if ((_type !== 'area' && _type !== 'circle'&& _type !== 'fillcircle'&& _type !== 'emptycircle') && (rects = getSelectionRects())) {
+  if (_type !== 'area' && (rects = getSelectionRects())) {
     let svg = findSVGAtPoint(rects[0].left, rects[0].top);
     saveRect(_type, [...rects].map((r) => {
       return {
@@ -99,7 +99,7 @@ function handleDocumentMouseup(e) {
         height: r.height
       };
     }));
-  } else if ((_type === 'area' || _type === 'circle'|| _type === 'fillcircle'|| _type === 'emptycircle') && overlay) {
+  } else if (_type === 'area' && overlay) {
     let svg = overlay.parentNode.querySelector(config.annotationSvgQuery());
     let rect = svg.getBoundingClientRect();
     saveRect(_type, [{
@@ -144,7 +144,6 @@ function handleDocumentKeyup(e) {
  */
 function saveRect(type, rects, color) {
   let svg = findSVGAtPoint(rects[0].left, rects[0].top);
-  let node;
   let annotation;
 
   if (!svg) {
@@ -196,15 +195,6 @@ function saveRect(type, rects, color) {
     annotation.height = rect.height;
   }
 
-   if (type === 'circle'||type === 'emptycircle'||type === 'fillcircle') {
-    let rect = annotation.rectangles[0];
-    delete annotation.rectangles;
-    annotation.cx = rect.x + rect.width / 2;
-    annotation.cy = rect.y + rect.height / 2;
-    annotation.r = rect.width;    // ignored right now
-    annotation.r = rect.height;   // ignored right now
-  }
-
   let { documentId, pageNumber } = getMetadata(svg);
 
   // Add the annotation