From e220f6b5dd665200edf3746b7fe25f2811995f6b Mon Sep 17 00:00:00 2001
From: Michael Czechowski <mail@dailysh.it>
Date: Sun, 5 Aug 2018 17:04:25 +0200
Subject: [PATCH] added spaces

---
 src/app/components/graphs.component.ts    | 53 ++++++++++-------------
 src/app/directives/guilloche.directive.ts | 20 +--------
 src/environments/environment.ts           |  2 +-
 3 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/src/app/components/graphs.component.ts b/src/app/components/graphs.component.ts
index acd1dae..e5630cf 100644
--- a/src/app/components/graphs.component.ts
+++ b/src/app/components/graphs.component.ts
@@ -74,38 +74,28 @@ export class GraphsComponent implements AfterViewInit, OnChanges {
   }
 
   private updateGraphs(): void {
-    const curves = [
+    const genShiftStart = this.shiftPoint(this.matrix.start, this.config.vectors.start);
+    const genShiftEnd = this.shiftPoint(this.matrix.end, this.config.vectors.end);
+
+    const curveList = [
       {
         color: env.guilloche.colors.primary,
-        start: {
-          point: this.matrix['start'],
-          vector: this.config.vectors.start
-        },
-        end: {
-          point: this.matrix['end'],
-          vector: this.config.vectors.end
-        }
+        start: genShiftStart.next().value,
+        end: genShiftEnd.next().value
       },
       {
         color: env.guilloche.colors.secondary,
-        start: {
-          point: this.matrix['end'],
-          vector: this.config.vectors.end
-        },
-        end: {
-          point: this.matrix['start'],
-          vector: this.config.vectors.start
-        }
+        start: genShiftEnd.next().value,
+        end: genShiftStart.next().value
       }
     ];
 
-    this.graphs = [this.adjustGraph(curves[0]), this.adjustGraph(curves[1])];
+    this.graphs = curveList.map(curve => this.adjustGraph(curve));
     console.log('graphs component (updateGraphs):', this.graphs);
   }
 
   private adjustGraph(curve) {
     return Object.assign(curve, {
-      id: `start-to-end`,
       stroke: this.config.stroke,
       nodes: [
         this.genVectorPoint(curve.start.point, curve.start.vector),
@@ -186,8 +176,6 @@ export class GraphsComponent implements AfterViewInit, OnChanges {
       max: this.matrix.center.y + this.matrix.height * overlap
     };
 
-    console.log(this.matrix.center);
-
     return {
       x: Random.randomUniform(x.min, x.max)(),
       y: Random.randomUniform(y.min, y.max)()
@@ -203,20 +191,23 @@ export class GraphsComponent implements AfterViewInit, OnChanges {
     return Math.pow(Math.pow(a.x - b.x, 2) + Math.pow(a.y - b.y, 2), 0.5);
   }
 
-
-
   private *shiftPoint(point: Point, vector) {
-    const genShiftX = this.shiftNumber(this.config.space, point.x);
-    const genShiftY = this.shiftNumber(this.config.space, point.y);
+    const genShiftX = this.shiftNumber(this.config.space, vector);
+    const genShiftY = this.shiftNumber(this.config.space, vector);
 
-    return {
-      x: 0,
-      y: 0
-    };
+    while (true) {
+      yield {
+        point: {
+          x: Math.cos(Math.PI * vector) * genShiftX.next().value + point.x,
+          y: Math.sin(Math.PI * vector) * genShiftY.next().value + point.y,
+        },
+        vector: vector
+      };
+    }
   }
 
-  private *shiftNumber(num: number, space: number) {
-    let current = num;
+  private *shiftNumber(space: number, vector: number) {
+    let current = 0;
     let index = 0;
     const sign = this.flipSign();
 
diff --git a/src/app/directives/guilloche.directive.ts b/src/app/directives/guilloche.directive.ts
index ecc5c8f..8a453dc 100644
--- a/src/app/directives/guilloche.directive.ts
+++ b/src/app/directives/guilloche.directive.ts
@@ -130,28 +130,12 @@ export class GuillocheDirective implements OnChanges {
   }
 
   private showGrid() {
-    this.group.append('circle')
-      .attr('cx', this.graph.start.point.x)
-      .attr('cy', this.graph.start.point.y)
-      .attr('r', 20)
-      .attr('stroke-width', 1)
-      .attr('fill-opacity', 0)
-      .attr('stroke', this.graph.color);
-
-    this.group.append('circle')
-      .attr('cx', this.graph.end.point.x)
-      .attr('cy', this.graph.end.point.y)
-      .attr('r', 10)
-      .attr('stroke-width', 1)
-      .attr('fill-opacity', 0)
-      .attr('stroke', this.graph  .color);
-
     this.graph.nodes.forEach(point => {
       this.group.append('circle')
         .attr('cx', point.x)
         .attr('cy', point.y)
-        .attr('r', 5)
-        .attr('stroke-width', 1)
+        .attr('r', 3)
+        .attr('stroke-width', 0.1)
         .attr('fill-opacity', 0)
         .attr('stroke', 'darkgray');
     });
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b26ec34..c73ceea 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -26,6 +26,7 @@ export const environment = {
     width: 10,
     height: 16,
     scale: 0.1,
+    overlap: 0.8,
     vectors: {
       start: 1,
       end: 0,
@@ -33,7 +34,6 @@ export const environment = {
     },
     nodes: 2,
     stroke: 1,
-    overlap: 1.4,
     spread: 8,
     space: 6
   }