adding flat coordinates when creating circles

Author: biharck

src/api.js

@@ -61,10 +61,17 @@ function _geometry2Scoord3d(geometry, pyramid) {
     });
     return new Polyline(coordinates);
   } else if (type === 'Circle') {
-    let center = _geometryCoordinates2scoord3dCoordinates(geometry.getCenter(), pyramid);
-    // FIXME: radius also needs to be rescaled
-    let radius = geometry.getRadius();
-    return new Circle(center, radius);
+    // chunking the Flat Coordinates into two arrays within 3 elements each
+    let coordinates = geometry.getFlatCoordinates().reduce((all,one,i) => {
+      const ch = Math.floor(i/2)
+      all[ch] = [].concat((all[ch]||[]),one)
+      return all
+    }, [])
+    coordinates = coordinates.map(c => {
+      c.push(0)
+      return _geometryCoordinates2scoord3dCoordinates(c, pyramid)
+    })
+    return new Circle(coordinates);    
   } else {
     // TODO: Combine multiple points into MULTIPOINT.
     console.error(`unknown geometry type "${type}"`)
@@ -88,9 +95,15 @@ function _scoord3d2Geometry(scoord3d, pyramid) {
     });
     return new PolygonGeometry([coordinates]);
   } else if (type === 'CIRCLE') {
-    let center = _scoord3dCoordinates2geometryCoordinates(data[0], pyramid);
-    let radius = data[1];
-    return new CircleGeometry(center, radius);
+    let coordinates = data.map(d => {
+      return _scoord3dCoordinates2geometryCoordinates(d, pyramid);
+    })
+    // to flat coordinates
+    coordinates = [...coordinates[0].slice(0,2), ...coordinates[1].slice(0,2)]
+
+    // flat coordinates in combination with opt_layout and no opt_radius are also accepted
+    // and internaly it calculates the Radius
+    return new CircleGeometry(coordinates, null, "XY");
   } else {
     console.error(`unsupported graphic type "${type}"`)
   }

src/scoord3d.js

@@ -135,19 +135,15 @@ class Polygon extends Scoord3D {
 
 class Circle extends Scoord3D {
 
-  constructor(centerCoordinates, radius) {
+  constructor(coordinates) {
     super()
-    if (!Array.isArray(centerCoordinates)) {
+    if (!Array.isArray(coordinates)) {
       throw new Error('coordinates of Circle must be an array')
     }
-    if (centerCoordinates.length !== 3) {
-      throw new Error('center coordinates of Circle must be an array of length 3')
-    }
-    if (radius === undefined) {
-      throw new Error('radius has to be defined')
+    if(coordinates.find(c => c.length !== 3)!== undefined){
+      throw new Error('coordinates of Circle must be a list or size two with points of length 3')
     }
-    this[_centerCoordinates] = centerCoordinates
-    this[_radius] = radius
+    this[_coordinates] = coordinates
   }
 
   get graphicData() {
@@ -156,9 +152,7 @@ class Circle extends Scoord3D {
      * The first point is the central pixel.
      * The second point is a pixel on the perimeter of the circle.
      */
-    return [
-      this[_centerCoordinates],
-      [this[_centerCoordinates][0], this[_centerCoordinates][1] + this[_radius], 1]]
+    return this[_coordinates]
   }
 
   get graphicType() {

test/api.spec.js

@@ -11,7 +11,7 @@ describe('dicomMicroscopyViewer.api.VLWholeSlideMicroscopyImageViewer', ()=> {
 
     let viewer;
     const properties = {};
-    const circle = new dicomMicroscopyViewer.scoord3d.Circle([1000, 1000, 1], 100);
+    const circle = new dicomMicroscopyViewer.scoord3d.Circle([[8.1036, -9.3211, 1], [8.4463, -9.3211, 1]]);
     const point = new dicomMicroscopyViewer.scoord3d.Point([9.0467, -8.7631, 1]);
     const box = new dicomMicroscopyViewer.scoord3d.Polyline([
         [8.8824, -8.8684, 1],
@@ -77,10 +77,8 @@ describe('dicomMicroscopyViewer.api.VLWholeSlideMicroscopyImageViewer', ()=> {
     it('should create a Circle ROI and return it back successfuly', () => {
         const roi = new dicomMicroscopyViewer.roi.ROI({scoord3d : circle, properties});
         viewer.addROI(roi);
-        console.log('####')
-        console.log(viewer.getROI(0).scoord3d.graphicData[0])
-        console.log('####')
         assert.deepEqual(viewer.getROI(0).scoord3d.graphicData[0], circle.graphicData[0]);
+        assert.deepEqual(viewer.getROI(0).scoord3d.graphicData[1], circle.graphicData[1]);
     })
 
     it('should create a Point ROI and return it back successfuly', () => {