Fix xy anisotropy combining in gui

4 files changed, 41 insertions, 28 deletions

diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs
index de01468..802ce4b 100644
--- a/grapher/Models/AccelGUIFactory.cs
+++ b/grapher/Models/AccelGUIFactory.cs
@@ -305,7 +305,8 @@ namespace grapher.Models
                 domainLabel,
                 new ActiveValueLabelXY(
                     new ActiveValueLabel(domainActiveValueX, direcionalityActiveValueTitle),
-                    new ActiveValueLabel(domainActiveValueY, direcionalityActiveValueTitle)));
+                    new ActiveValueLabel(domainActiveValueY, direcionalityActiveValueTitle)),
+                false);
 
             var range = new OptionXY(
                 rangeBoxX,
@@ -316,7 +317,8 @@ namespace grapher.Models
                 rangeLabel,
                 new ActiveValueLabelXY(
                     new ActiveValueLabel(rangeActiveValueX, direcionalityActiveValueTitle),
-                    new ActiveValueLabel(rangeActiveValueY, direcionalityActiveValueTitle)));
+                    new ActiveValueLabel(rangeActiveValueY, direcionalityActiveValueTitle)),
+                false);
 
             var capOptionsX = new CapOptions(
                 velocityGainCapToolStripMenuItem,
diff --git a/grapher/Models/Fields/FieldXY.cs b/grapher/Models/Fields/FieldXY.cs
index a7db922..3396907 100644
--- a/grapher/Models/Fields/FieldXY.cs
+++ b/grapher/Models/Fields/FieldXY.cs
@@ -7,13 +7,14 @@ namespace grapher
     {
         #region Constructors
 
-        public FieldXY(TextBox xBox, TextBox yBox, CheckBox lockCheckBox, Form containingForm, double defaultData)
+        public FieldXY(TextBox xBox, TextBox yBox, CheckBox lockCheckBox, Form containingForm, double defaultData, bool allowCombined = true)
         {
             XField = new Field(xBox, containingForm, defaultData);
             YField = new Field(yBox, containingForm, defaultData);
             YField.FormatString = Constants.ShortenedFormatString;
             LockCheckBox = lockCheckBox;
             LockCheckBox.CheckedChanged += new System.EventHandler(CheckChanged);
+            AllowCombined = allowCombined;
 
             XField.Box.Width = (YField.Box.Left + YField.Box.Width - XField.Box.Left - Constants.DefaultFieldSeparation) / 2;
             YField.Box.Width = XField.Box.Width;
@@ -24,7 +25,7 @@ namespace grapher
             YField.Box.Left = XField.Box.Left + XField.Box.Width + Constants.DefaultFieldSeparation;
 
             CombinedWidth = DefaultWidthX + DefaultWidthY + YField.Box.Left - (XField.Box.Left + DefaultWidthX);
-            SetCombined();
+            Startup();
         }
 
         #endregion Constructors
@@ -116,6 +117,7 @@ namespace grapher
 
         private int DefaultWidthY { get; }
 
+        private bool AllowCombined { get; }
 
         #endregion Properties
 
@@ -147,6 +149,20 @@ namespace grapher
             }
         }
 
+        private void Startup()
+        {
+            if (AllowCombined)
+            {
+                SetCombined();
+            }
+            else
+            {
+                SetSeparate();
+                LockCheckBox.Hide();
+                LockCheckBox.Enabled = false;
+            }
+        }
+
         private void CheckChanged(object sender, EventArgs e)
         {
             if (LockCheckBox.CheckState == CheckState.Checked)
@@ -161,11 +177,14 @@ namespace grapher
 
         public void SetCombined()
         {
-            Combined = true;
-            YField.SetToUnavailable();
-            YField.Hide();
-            XField.Box.Width = CombinedWidth;
-            XField.FormatString = Constants.DefaultFieldFormatString;
+            if (AllowCombined)
+            {
+                Combined = true;
+                YField.SetToUnavailable();
+                YField.Hide();
+                XField.Box.Width = CombinedWidth;
+                XField.FormatString = Constants.DefaultFieldFormatString;
+            }
         }
 
         public void SetSeparate()
diff --git a/grapher/Models/Options/Directionality/DirectionalityOptions.cs b/grapher/Models/Options/Directionality/DirectionalityOptions.cs
index 9485877..d9a67cd 100644
--- a/grapher/Models/Options/Directionality/DirectionalityOptions.cs
+++ b/grapher/Models/Options/Directionality/DirectionalityOptions.cs
@@ -34,17 +34,8 @@ namespace grapher.Models.Options.Directionality
             WholeCheckBox = wholeCheckBox;
             ByComponentCheckBox = byComponentCheckBox;
 
-            Domain.Fields.LockCheckBox.Checked = false;
-            Range.Fields.LockCheckBox.Checked = false;
-            Domain.Fields.LockCheckBox.Enabled = false;
-            Range.Fields.LockCheckBox.Enabled = false;
-            Domain.Fields.LockCheckBox.Hide();
-            Range.Fields.LockCheckBox.Hide();
-            Domain.Fields.SetSeparate();
-            Range.Fields.SetSeparate();
-
-            ContainingPanel.Paint += panel_Paint;
-            DirectionalityLabel.Click += title_click;
+            ContainingPanel.Paint += Panel_Paint;
+            DirectionalityLabel.Click += Title_click;
             ContainingPanel.Top = top;
             DirectionalityLabel.Left = Constants.DirectionalityTitlePad;
             DirectionalityLabel.Top = Constants.DirectionalityTitlePad;
@@ -164,8 +155,6 @@ namespace grapher.Models.Options.Directionality
                 LpNorm.Show();
                 Domain.Show();
                 Range.Show();
-                Domain.Fields.LockCheckBox.Hide();
-                Range.Fields.LockCheckBox.Hide();
                 WholeCheckBox.Show();
                 ByComponentCheckBox.Show();
                 DirectionalityLabel.Text = Constants.DirectionalityTitleOpen;
@@ -200,7 +189,7 @@ namespace grapher.Models.Options.Directionality
             ContainingPanel.Invalidate();
         }
 
-        private void panel_Paint(object sender, PaintEventArgs e)
+        private void Panel_Paint(object sender, PaintEventArgs e)
         {
             Color col = Color.DarkGray;
             ButtonBorderStyle bbs = ButtonBorderStyle.Dashed;
@@ -208,7 +197,7 @@ namespace grapher.Models.Options.Directionality
             ControlPaint.DrawBorder(e.Graphics, this.ContainingPanel.ClientRectangle, col, thickness, bbs, col, thickness, bbs, col, thickness, bbs, col, thickness, bbs);
         }
 
-        private void title_click(object sender, EventArgs e)
+        private void Title_click(object sender, EventArgs e)
         {
             if (IsHidden)
             {
diff --git a/grapher/Models/Options/OptionXY.cs b/grapher/Models/Options/OptionXY.cs
index 911d26b..8efd5b7 100644
--- a/grapher/Models/Options/OptionXY.cs
+++ b/grapher/Models/Options/OptionXY.cs
@@ -22,8 +22,9 @@ namespace grapher
             Form containingForm,
             double defaultData,
             Label label,
-            ActiveValueLabelXY activeValueLabels)
-            : this(new FieldXY(xBox, yBox, lockCheckBox, containingForm, defaultData), label, activeValueLabels)
+            ActiveValueLabelXY activeValueLabels,
+            bool allowCombined = true)
+            : this(new FieldXY(xBox, yBox, lockCheckBox, containingForm, defaultData, allowCombined), label, activeValueLabels)
         {
         }
 
@@ -35,7 +36,8 @@ namespace grapher
             double defaultData,
             Label label,
             ActiveValueLabelXY activeValueLabels,
-            string startingName):
+            string startingName,
+            bool allowCombined = true):
             this(
                 xBox,
                 yBox,
@@ -43,7 +45,8 @@ namespace grapher
                 containingForm,
                 defaultData,
                 label,
-                activeValueLabels)
+                activeValueLabels,
+                allowCombined)
         {
             SetName(startingName);
         }