Added min/max for widget "plotter" as requested in #713.

Set custom:showValue to false to disable.
fesch · Aug 22, 2021 · d74ed7e · d74ed7e
1 parent 53dfd45
commit d74ed7e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/app/src/main/java/lu/fisch/canze/changelog.txt b/app/src/main/java/lu/fisch/canze/changelog.txt
@@ -1,3 +1,5 @@
+2021-08-22 [Bob] added min/max for widget "plotter". Set custom:showValue to false to disable
+2021-08-20 [Bob] moved logging to shared storage (will not work for Anrdoid 11 yet ...)
 2020-02-16 [Jeroen] Extended addressing and ZE50 test code (aplha!)
 2020-02-02 [Jeroen] Removed phases count in advanced charging. Already show in Mains Current Type
 2020-01-25 [Jeroen] Switch off CANsee chatter on USB when on master branch

diff --git a/app/src/main/java/lu/fisch/canze/widgets/Plotter.java b/app/src/main/java/lu/fisch/canze/widgets/Plotter.java
@@ -21,6 +21,9 @@
 
 package lu.fisch.canze.widgets;
 
+import android.content.res.Resources;
+import android.util.TypedValue;
+
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
@@ -37,6 +40,7 @@
 import lu.fisch.canze.activities.MainActivity;
 import lu.fisch.canze.actors.Field;
 import lu.fisch.canze.actors.Fields;
+import lu.fisch.canze.classes.TimePoint;
 import lu.fisch.canze.database.CanzeDataSource;
 import lu.fisch.canze.fragments.MainFragment;
 import lu.fisch.canze.interfaces.DrawSurfaceInterface;
@@ -261,9 +265,17 @@ public void draw(Graphics g) {
 
             double lastX = Double.NaN;
             double lastY = Double.NaN;
+            double min = Double.NaN;
+            double max = Double.NaN;
             g.setColor(Color.RED);
             for(int i=0; i<values.size(); i++)
             {
+                // calculate min / max
+                if(values.get(i)<min || min==Double.NaN)
+                    min=values.get(i);
+                if(values.get(i)>max || max==Double.NaN)
+                    max=values.get(i);
+
                 try {
                     //MainActivity.debug("Value "+i+": "+values.get(i));
                     //MainActivity.debug("Value "+i+": "+values.get(i)+" Max: "+getMax()+" Min: "+getMin()+" height: "+getHeight()+" h: "+h);
@@ -283,6 +295,26 @@ public void draw(Graphics g) {
                     /* simply ignore */
                 }
             }
+
+            // draw min & max
+            if (showValue) {
+                g.setColor(getTitleColor());
+                g.setTextSize(20);
+
+                int tx = getX() + width - 8 - spaceAlt;
+                int ty = getY();
+                int dy = g.stringHeight("Ip") + 4; // full height and undersling
+
+                String text = "min: "+min;
+                int tw = g.stringWidth(text);
+                ty += dy;
+                g.drawString(text, tx - tw, ty);
+
+                text = "max: "+max;
+                tw = g.stringWidth(text);
+                ty += dy;
+                g.drawString(text, tx - tw, ty);
+            }
         }
 
         // draw the title

diff --git a/app/src/main/res/layout/activity_battery.xml b/app/src/main/res/layout/activity_battery.xml
@@ -220,6 +220,7 @@
                 custom:text="@string/graph_ModuleTemperatures"
                 custom:titleColor="?android:attr/colorForeground"
                 custom:widget="plotter"
+                custom:showValue="false"
                 custom:intervals="{
                     '7bb.6104.32':10000,
                     '7bb.6104.56':10000,