Merge pull request #108 from a1xd/1.6r2HEADv1.6.0masterdark-mode

v1.6

1 files changed, 18 insertions, 9 deletions

diff --git a/grapher/Models/Options/LUT/LUTPanelOptions.cs b/grapher/Models/Options/LUT/LUTPanelOptions.cs
index 3690c76..eedcfa8 100644
--- a/grapher/Models/Options/LUT/LUTPanelOptions.cs
+++ b/grapher/Models/Options/LUT/LUTPanelOptions.cs
@@ -111,15 +111,26 @@ namespace grapher.Models.Options.LUT
             // Nothing to do here.
         }
 
-        public void SetActiveValues(IEnumerable<Vec2<float>> activePoints, int length)
+        public void SetActiveValues(IEnumerable<float> rawData, int length, AccelMode mode)
         {
-            if (length > 0 && activePoints.First().x != 0)
+            if (mode == AccelMode.lut && length > 1 && rawData.First() != 0)
             {
-                ActiveValuesTextBox.Text = PointsToActiveValuesText(activePoints, length);
+                var pointsLen = length / 2;
+                var points = new Vec2<float>[pointsLen];
+                for (int i = 0; i < pointsLen; i++)
+                {
+                    var data_idx = i * 2;
+                    points[i] = new Vec2<float>
+                    {
+                        x = rawData.ElementAt(data_idx),
+                        y = rawData.ElementAt(data_idx + 1)
+                    };
+                }
+                ActiveValuesTextBox.Text = PointsToActiveValuesText(points, pointsLen);
 
                 if (string.IsNullOrWhiteSpace(PointsTextBox.Text))
                 {
-                    PointsTextBox.Text = PointsToEntryTextBoxText(activePoints, length);
+                    PointsTextBox.Text = PointsToEntryTextBoxText(points, pointsLen);
                 }
             }
             else
@@ -135,14 +146,12 @@ namespace grapher.Models.Options.LUT
 
         private static (Vec2<float>[], int length) UserTextToPoints(string userText)
         {
-            const int MaxPoints = 256;
-
             if (string.IsNullOrWhiteSpace(userText))
             {
                 throw new ApplicationException("Text must be entered in text box to fill Look Up Table.");
             }
 
-            Vec2<float>[] points = new Vec2<float>[MaxPoints];
+            Vec2<float>[] points = new Vec2<float>[AccelArgs.MaxLutPoints];
 
             var userTextSplit = userText.Trim().Trim(';').Split(';');
             int index = 0;
@@ -155,9 +164,9 @@ namespace grapher.Models.Options.LUT
                 throw new ApplicationException("At least 2 points required");
             }
 
-            if (pointsCount > MaxPoints)
+            if (pointsCount > AccelArgs.MaxLutPoints)
             {
-                throw new ApplicationException($"Number of points exceeds max ({MaxPoints})");
+                throw new ApplicationException($"Number of points exceeds max ({AccelArgs.MaxLutPoints})");
             }
 
             foreach(var pointEntry in userTextSplit)