From 998c8a04c6bba64c7213ad2e4b81dabbcb40b00c Mon Sep 17 00:00:00 2001
From: Michael Czechowski <mail@dailysh.it>
Date: Fri, 3 Aug 2018 15:19:53 +0200
Subject: [PATCH] added line space parameter and adjusted colors

---
 src/app/app.component.html             | 12 ++++++------
 src/app/components/graphs.component.ts |  1 +
 src/app/forms/config.form.ts           |  4 ++++
 src/app/models/graph.model.ts          |  1 +
 src/app/models/param.model.ts          |  1 +
 src/environments/environment.prod.ts   |  7 ++++---
 src/environments/environment.ts        | 11 ++---------
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 8361f88..b3264d3 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -81,6 +81,12 @@
       </label>
       <input type="number" class="form-control" formControlName="stroke" min="0.1" max="10" step="0.1">
     </div>
+    <div class="form-group mb-4">
+      <label class="form-control-label">
+        Linienabstand
+      </label>
+      <input type="number" class="form-control" formControlName="space" min="0" max="10" step="0.1">
+    </div>
     <div class="form-group mb-4">
       <label class="form-control-label">
         Aufspleißen
@@ -92,11 +98,5 @@
     <div class="dropdown-divider"></div>
     <!-- <button (click)="exportSvg()" class="btn btn-secondary btn-block" [disabled]="configForm.invalid">Download</button> -->
   </form>
-  <!-- <div class="form-group mt-4 text-center">
-    <div class="custom-control custom-checkbox">
-      <input type="checkbox" class="custom-control-input" id="scrollOnWheel" [value]="scrollOnWheel">
-      <label class="custom-control-label" for="scrollOnWheel">Beim Scrollen Skalieren</label>
-    </div>
-  </div> -->
 </aside>
 
diff --git a/src/app/components/graphs.component.ts b/src/app/components/graphs.component.ts
index 15c370a..d827b3a 100644
--- a/src/app/components/graphs.component.ts
+++ b/src/app/components/graphs.component.ts
@@ -98,6 +98,7 @@ export class GraphsComponent implements AfterViewInit, OnChanges {
         direction: this.config.vectors[to],
         color: env.guilloche.colors[to]
       },
+      space: this.config.space,
       stroke: this.config.stroke,
       nodes: [
         this.vectorPoint(startPoint, this.config.vectors[from]),
diff --git a/src/app/forms/config.form.ts b/src/app/forms/config.form.ts
index 4122bdb..9892703 100644
--- a/src/app/forms/config.form.ts
+++ b/src/app/forms/config.form.ts
@@ -47,6 +47,10 @@ export let ConfigForm: FormGroup = fb.group({
     Validators.min(0.1),
     Validators.max(10)
   ])),
+  space: fb.control('', Validators.compose([
+    Validators.min(0),
+    Validators.max(10)
+  ])),
   overlap: fb.control('', Validators.min(0.1)),
   spread: fb.control('', Validators.min(0)),
 });
diff --git a/src/app/models/graph.model.ts b/src/app/models/graph.model.ts
index e897d4e..18c1e7f 100644
--- a/src/app/models/graph.model.ts
+++ b/src/app/models/graph.model.ts
@@ -28,6 +28,7 @@ export interface Graph {
     direction: number; // degree between 0 and 360
     color: string; // can be set in enviroment
   };
+  space: number; // space between lines
   stroke: number; // stroke width
   nodes?: Point[]; // orientation points
 }
diff --git a/src/app/models/param.model.ts b/src/app/models/param.model.ts
index 059f202..8f9b8f1 100644
--- a/src/app/models/param.model.ts
+++ b/src/app/models/param.model.ts
@@ -25,6 +25,7 @@ export interface Param {
     y: number
   };
   spread: number;
+  space: number;
   stroke?: {
     width: number;
   };
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index ceacb37..4d61918 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -18,8 +18,8 @@ export const environment = {
   production: true,
   guilloche: {
     colors: {
-      start: '#f16363',
-      end: '#5eb1bd'
+      start: '#F8485E',
+      end: '#5CC0C7'
     }
   },
   controls: {
@@ -37,6 +37,7 @@ export const environment = {
     stroke: 1,
     scale: 0.3,
     overlap: 3,
-    spread: 4
+    spread: 4,
+    space: 6
   }
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 174f17e..bf4b0c2 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -37,14 +37,7 @@ export const environment = {
     stroke: 1,
     scale: 0.1,
     overlap: 1.4,
-    spread: 4
+    spread: 4,
+    space: 6
   }
 };
-
-/*
- * In development mode, to ignore zone related error stack frames such as
- * `zone.run`, `zoneDelegate.invokeTask` for easier debugging, you can
- * import the following file, but please comment it out in production mode
- * because it will have performance impact when throw error
- */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.