From ebf65dfbc50894fb1564949eeba4e27a248360c2 Mon Sep 17 00:00:00 2001
From: Michael Czechowski <mail@dailysh.it>
Date: Wed, 16 May 2018 13:13:53 +0200
Subject: [PATCH] added full automatisation

---
 src/app/app.component.ts           |  2 +-
 src/app/canvas/canvas.directive.ts | 61 ++++++++++++++++++++----------
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 54cfb08..22a5a55 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -28,7 +28,7 @@ export class AppComponent {
       stroke: {
         width: 2
       },
-      spread: 40,
+      spread: 80,
       showGrid: true
     };
   }
diff --git a/src/app/canvas/canvas.directive.ts b/src/app/canvas/canvas.directive.ts
index 411cd97..503de41 100644
--- a/src/app/canvas/canvas.directive.ts
+++ b/src/app/canvas/canvas.directive.ts
@@ -95,19 +95,20 @@ export class CanvasDirective implements OnInit, OnChanges {
         .attr('r', point.color ? 20 : 10)
         .attr('cx', point.x)
         .attr('cy', point.y)
-        .attr('fill', point.color ? point.color : 'lightgray')
-        .attr('stroke-width', !point.color ? 2 : 0)
-        .attr('stroke', !point.color ? 'gray' : '')
-        .style('cursor', 'pointer')
-        .call(Drag.drag()
-          .on('drag', function() {
-            Selection.select(this)
-              .attr('cx', Selection.event.x)
-              .attr('cy', Selection.event.y);
-          })
-          .on('end', () => {
-            this.drawLine(this.getExpandedPoints);
-          }));
+        .attr('fill', () => {
+          if (!this.param.showGrid) {
+            return 'none';
+          }
+          return point.color ? point.color : 'lightgray';
+        })
+        .attr('stroke-width', () => {
+          if (!this.param.showGrid) {
+            return 0;
+          }
+          return !point.color ? 2 : 0;
+        })
+        .attr('stroke', !point.color && !this.param.showGrid ? 'gray' : 'none')
+        .style('cursor', 'pointer');
     });
   }
 
@@ -184,23 +185,41 @@ export class CanvasDirective implements OnInit, OnChanges {
     for (let i = 0; i < this.param.spread; i++) {
       spreadPoints.push({
         x: radius * Math.cos(2 * i * Math.PI / this.param.spread) + closestCenter.x,
-        y: radius * Math.sin(2 * i * Math.PI / this.param.spread) + closestCenter.y
+        y: radius * Math.sin(2 * i * Math.PI / this.param.spread) + closestCenter.y,
       });
     }
 
-    spreadPoints.forEach(point => {
-      group.append('circle')
-        .attr('cx', point.x)
-        .attr('cy', point.y)
-        .attr('r', 10)
-        .attr('fill', 'gainsboro');
+    console.warn(spreadPoints);
+
+    spreadPoints.sort((a, b) => {
+      return this.Δ(a, pointMiddle) - this.Δ(b, pointMiddle);
     });
 
+    console.log(spreadPoints);
+
+    spreadPoints.some((point, index) => {
+      if (this.param.showGrid) {
+        group.append('circle')
+          .attr('cx', point.x)
+          .attr('cy', point.y)
+          .attr('r', 4)
+          .attr('fill', 'gray');
+      }
+
+      points[indexMiddle] = point;
+
+      this.drawLine(points);
+
+      return index === 20;
+    });
+
+    // console.log();
+
     group.lower();
   }
 
   private getClosestCenter(point: Point) {
-      if (this.Δ(point, this.config.start) > this.Δ(point, this.config.end)) {
+      if (this.Δ(point, this.config.start) < this.Δ(point, this.config.end)) {
         return this.config.start;
       } else {
         return this.config.end;