From bb271f68eac231ef718feee641f998daa036e50f Mon Sep 17 00:00:00 2001
From: Michael Czechowski <mail@dailysh.it>
Date: Thu, 24 May 2018 00:12:57 +0200
Subject: [PATCH] fix(appComponent): enhanced default form values

---
 src/app/app.component.html             | 31 ++++++++++++++++----------
 src/app/components/graphs.component.ts |  2 +-
 src/app/forms/config.form.ts           |  1 +
 src/environments/environment.prod.ts   |  8 +++----
 src/environments/environment.ts        |  6 ++---
 5 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 59a0d03..3c79957 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -13,7 +13,7 @@
 <aside class="col-sm-4 col-lg-3 col-xl-3">
   <form [formGroup]="configForm" (ngSubmit)="updateGraphs()" novalidate>
     <div class="pb-5">
-      <h5>Seitenverhältnis</h5>
+      <h5>Grundfläche</h5>
       <hr>
       <div class="form-group">
         <label class="form-control-label">
@@ -29,14 +29,20 @@
       </div>
       <div class="form-group">
         <label class="form-control-label">
-          Linienstärke
+          Skalierung
         </label>
-        <input type="number" class="form-control" formControlName="stroke" min="0.1" max="10" step="0.1">
+        <input type="number" class="form-control" formControlName="scale" min="0" max="1" step="0.01">
       </div>
     </div>
     <div class="pb-5">
-      <h5>Vektoren</h5>
+      <h5>Vektorfläche</h5>
       <hr>
+      <div class="form-group">
+        <label class="form-control-label">
+          Skalierung
+        </label>
+        <input type="number" class="form-control" formControlName="overlap">
+      </div>
       <ng-container formGroupName="vectors">
         <div class="form-group">
           <label class="form-control-label">
@@ -60,30 +66,31 @@
             <option value="1.5">Links</option>
           </select>
         </div>
+
         <div class="form-group">
           <label class="form-control-label">
-            Vektordehnung
+            Dehnung
           </label>
           <input type="number" class="form-control" formControlName="range" min="0" max="1" step="0.1">
         </div>
       </ng-container>
     </div>
-    <h5 class="mt-2">Ausdehnung</h5>
+    <h5 class="mt-2">Graph</h5>
     <!-- <hr>
     <small>Anzahl der Schwingungen mittels Knotenpunkten bestimmen und die Skalierung auf der Leinwand einstellen.</small> -->
     <hr>
-    <div class="form-group">
-      <label class="form-control-label">
-        Skalierung
-      </label>
-      <input type="number" class="form-control" formControlName="scale" min="0" max="1" step="0.01">
-    </div>
     <div class="form-group mb-4">
       <label class="form-control-label">
         Knotenpunkte
       </label>
       <input type="number" class="form-control" formControlName="nodes" min="1" max="10">
     </div>
+    <div class="form-group">
+      <label class="form-control-label">
+        Linienstärke
+      </label>
+      <input type="number" class="form-control" formControlName="stroke" min="0.1" max="10" step="0.1">
+    </div>
     <div class="dropdown-divider mb-4"></div>
     <button type="submit" class="btn btn-lg btn-primary btn-block" [disabled]="configForm.invalid">Aktualisieren</button>
     <div class="dropdown-divider"></div>
diff --git a/src/app/components/graphs.component.ts b/src/app/components/graphs.component.ts
index d129e23..fd33f5e 100644
--- a/src/app/components/graphs.component.ts
+++ b/src/app/components/graphs.component.ts
@@ -142,7 +142,7 @@ export class GraphsComponent implements AfterViewInit, OnChanges {
   }
 
   private get randomPoint() {
-    const overlap = env.guilloche.overlap;
+    const overlap = this.config.overlap;
     const x = {
       min: this.matrix.center.x - this.matrix.width * overlap,
       max: this.matrix.center.x + this.matrix.width * overlap
diff --git a/src/app/forms/config.form.ts b/src/app/forms/config.form.ts
index 438a93d..df8b5b5 100644
--- a/src/app/forms/config.form.ts
+++ b/src/app/forms/config.form.ts
@@ -31,4 +31,5 @@ export let ConfigForm: FormGroup = fb.group({
     Validators.min(0.1),
     Validators.max(10)
   ])),
+  overlap: fb.control('', Validators.min(0.1)),
 });
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 701e2f1..fd4d97d 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -4,8 +4,7 @@ export const environment = {
     colors: {
       start: '#f16363',
       end: '#5eb1bd'
-    },
-    overlap: 3
+    }
   },
   controls: {
     wheelStep: 0.01
@@ -18,8 +17,9 @@ export const environment = {
       end: 0,
       range: 0.3
     },
-    nodes: 3,
+    nodes: 2,
     stroke: 1,
-    scale: 0.3
+    scale: 0.3,
+    overlap: 3
   }
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index aa38d2f..987092b 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -8,8 +8,7 @@ export const environment = {
     colors: {
       start: '#cc0045',
       end: '#0067cc'
-    },
-    overlap: 1.4
+    }
   },
   controls: {
     wheelStep: 0.01
@@ -24,7 +23,8 @@ export const environment = {
     },
     nodes: 3,
     stroke: 1,
-    scale: 0.1
+    scale: 0.1,
+    overlap: 1.4
   }
 };