From fe17d04e571d180e663c7014e803ce790693f4b1 Mon Sep 17 00:00:00 2001
From: Jacob Palecki <JacobPalecki@gmail.com>
Date: Thu, 20 Aug 2020 12:51:33 -0700
Subject: Display active values

---
 grapher/Models/Options/CapOptions.cs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'grapher/Models/Options/CapOptions.cs')

diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs
index 2ee7f6b..fedda08 100644
--- a/grapher/Models/Options/CapOptions.cs
+++ b/grapher/Models/Options/CapOptions.cs
@@ -30,13 +30,13 @@ namespace grapher
             EnableSensitivityCap();
         }
 
-        ToolStripMenuItem SensitivityCapCheck { get; }
+        public ToolStripMenuItem SensitivityCapCheck { get; }
 
-        ToolStripMenuItem VelocityGainCapCheck { get; }
+        public ToolStripMenuItem VelocityGainCapCheck { get; }
 
-        OptionXY CapOption { get; }
+        public OptionXY CapOption { get; }
 
-        OptionXY WeightOption { get; }
+        public OptionXY WeightOption { get; }
 
         public double SensitivityCapX { 
             get
@@ -82,6 +82,18 @@ namespace grapher
 
         public bool IsSensitivityGain { get; private set; }
 
+        public void SetActiveValues(double gainCap, double sensCapX, double sensCapY, bool capGainEnabled)
+        {
+            if (capGainEnabled)
+            {
+                CapOption.SetActiveValues(gainCap, gainCap);
+            }
+            else
+            {
+                CapOption.SetActiveValues(sensCapX, sensCapY);
+            }
+        }
+
         void OnSensitivityCapCheckClick(object sender, EventArgs e)
         {
             if (!SensitivityCapCheck.Checked)
-- 
cgit v1.2.3


From 7dbeae9d4cf108e78072b356d832123f12e42a90 Mon Sep 17 00:00:00 2001
From: Jacob Palecki <JacobPalecki@gmail.com>
Date: Thu, 20 Aug 2020 14:22:14 -0700
Subject: Add accel type to active values and tweak color

---
 grapher/Models/Options/CapOptions.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'grapher/Models/Options/CapOptions.cs')

diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs
index fedda08..493561a 100644
--- a/grapher/Models/Options/CapOptions.cs
+++ b/grapher/Models/Options/CapOptions.cs
@@ -1,4 +1,5 @@
-using System;
+using grapher.Models.Options;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,6 +10,9 @@ namespace grapher
 {
     public class CapOptions
     {
+
+        public const string GainCapFormatString = "0.##";
+
         public CapOptions(
             ToolStripMenuItem sensitivityCapCheck,
             ToolStripMenuItem velocityGainCapCheck,
@@ -86,10 +90,14 @@ namespace grapher
         {
             if (capGainEnabled)
             {
+                CapOption.ActiveValueLabels.X.FormatString = GainCapFormatString;
+                CapOption.ActiveValueLabels.X.Prefix = "Gain";
                 CapOption.SetActiveValues(gainCap, gainCap);
             }
             else
             {
+                CapOption.ActiveValueLabels.X.FormatString = ActiveValueLabel.DefaultFormatString;
+                CapOption.ActiveValueLabels.X.Prefix = string.Empty;
                 CapOption.SetActiveValues(sensCapX, sensCapY);
             }
         }
-- 
cgit v1.2.3