From 49b28848bcf2f68f1ab8f2b5f5e35a5c0af77d96 Mon Sep 17 00:00:00 2001
From: Fisch <interfisch@gmx.net>
Date: Mon, 10 Jun 2019 22:24:43 +0200
Subject: [PATCH] change value constrain

---
 hoverbrettvisualizer/Visualization.pde | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/hoverbrettvisualizer/Visualization.pde b/hoverbrettvisualizer/Visualization.pde
index 1eb39a1..315a204 100644
--- a/hoverbrettvisualizer/Visualization.pde
+++ b/hoverbrettvisualizer/Visualization.pde
@@ -33,7 +33,8 @@ abstract class Visualization
   
   public abstract void drawVis();
   public void setValue(float pv){
-    this.value=constrain(pv,valueMin,valueMax);
+    //this.value=constrain(pv,valueMin,valueMax);
+    this.value=pv;
     if (this.showMinMax){
       if (Float.isNaN(this.valueMinRecord) || this.value<this.valueMinRecord){
         this.valueMinRecord=this.value;        
@@ -45,7 +46,8 @@ abstract class Visualization
   }
   
   public void setValue2(float pv){
-    this.value2=constrain(pv,valueMin,valueMax);
+    //this.value2=constrain(pv,valueMin,valueMax);
+    this.value2=pv;
     if (this.showMinMax){
       if (Float.isNaN(this.value2MinRecord) || this.value2<this.value2MinRecord){
         this.value2MinRecord=this.value2;        
@@ -57,23 +59,23 @@ abstract class Visualization
   }
   
   public float getValueNormalized() {
-    return (this.value-this.valueMin)/(this.valueMax-this.valueMin);
+    return (constrain(this.value,this.valueMin,this.valueMax)-this.valueMin)/(this.valueMax-this.valueMin);
   }
   public float getValueMinNormalized() {
-    return (this.valueMinRecord-this.valueMin)/(this.valueMax-this.valueMin);
+    return (constrain(this.valueMinRecord,this.valueMin,this.valueMax)-this.valueMin)/(this.valueMax-this.valueMin);
   }
   public float getValueMaxNormalized() {
-    return (this.valueMaxRecord-this.valueMin)/(this.valueMax-this.valueMin);
+    return (constrain(this.valueMaxRecord,this.valueMin,this.valueMax)-this.valueMin)/(this.valueMax-this.valueMin);
   }
   
   public float getValue2Normalized() {
-    return (this.value2-this.value2Min)/(this.value2Max-this.value2Min);
+    return (constrain(this.value2,this.valueMin,this.valueMax)-this.value2Min)/(this.value2Max-this.value2Min);
   }
   public float getValue2MinNormalized() {
-    return (this.value2MinRecord-this.value2Min)/(this.value2Max-this.value2Min);
+    return (constrain(this.value2MinRecord,this.valueMin,this.valueMax)-this.value2Min)/(this.value2Max-this.value2Min);
   }
   public float getValue2MaxNormalized() {
-    return (this.value2MaxRecord-this.value2Min)/(this.value2Max-this.value2Min);
+    return (constrain(this.value2MaxRecord,this.valueMin,this.valueMax)-this.value2Min)/(this.value2Max-this.value2Min);
   }
   
   public void setShowMinMax(boolean pshowMinMax){
@@ -278,8 +280,9 @@ public class Direction extends Visualization {
     ellipse(super.posOrigin.x, super.posOrigin.y, this.size,this.size);
     
     stroke(super.cmain);
-    float angle=map(super.value,super.valueMin,super.valueMax,0,2*PI)+this.angleoffset;
-    float _vecsize=this.size*( (super.value2-super.value2Min)/(super.value2Max-super.value2Min));
+    float angle=map(super.getValueNormalized(),0,1,0,2*PI)+this.angleoffset;
+    //float _vecsize=this.size*( (super.value2-super.value2Min)/(super.value2Max-super.value2Min));
+    float _vecsize=this.size*super.getValue2Normalized();
     line(super.posOrigin.x,super.posOrigin.y,super.posOrigin.x+cos(angle)*_vecsize,super.posOrigin.y-sin(angle)*_vecsize);
     
     line(super.posOrigin.x+cos(angle-0.1)*_vecsize*0.9,super.posOrigin.y-sin(angle-0.1)*_vecsize*0.9,super.posOrigin.x+cos(angle)*_vecsize,super.posOrigin.y-sin(angle)*_vecsize); //arrow
@@ -387,4 +390,4 @@ public class GraphRoll extends Visualization {
     text(super.title, super.posOrigin.x, super.posOrigin.y+super.textsize*1.5);
   }
 }
-  
+  
\ No newline at end of file