Revert c2b93c1. Allow mix IsXValueIndexed settings per axis.

Author: kirsan31

src/System.Windows.Forms.DataVisualization/DataManager/DataManager.cs

@@ -29,16 +29,6 @@ internal sealed class DataManager : ChartElement, IServiceProvider, IDisposable
     // Service container reference
     internal IServiceContainer serviceContainer;
 
-    /// <summary>
-    /// Indicates if at least one series is indexed (in this case we tread that all series are indexed). null if not checked yet.
-    /// </summary>
-    internal bool? indexedSeries;
-
-    /// <summary>
-    /// Indicates if all series has all X values set to 0. null if not checked yet.
-    /// </summary>
-    internal bool? xValuesZeros;
-
     #endregion
 
     #region Constructors and initialization
@@ -102,12 +92,13 @@ private void ChartPicture_BeforePaint(object sender, ChartPaintEventArgs e)
     {
         // Prepare series for drawing
         int markerIndex = 1;
-        indexedSeries = null;
-        xValuesZeros = null;
-
         for (int index = 0; index < this.Series.Count; index++)
         {
             Series series = this.Series[index];
+
+            // Reset series "X values are zeros" flag
+            series.xValuesZeros = null;
+
             // Set series colors from palette
             IChartType chartType = e.CommonElements.ChartTypeRegistry.GetChartType(series.ChartTypeName);
             bool paletteColorsInPoints = chartType.ApplyPaletteColorsToPoints;

src/System.Windows.Forms.DataVisualization/DataManager/DataSeries.cs

@@ -249,6 +249,9 @@ public class Series : DataPointCustomProperties, IDisposable
     // Indicates that there is no custom axis labels in data points or series
     internal bool noLabelsInPoints = true;
 
+    // Indicates if series has all X values set to 0
+    internal bool? xValuesZeros;
+
 
     // fake data points for selector service in design time.
     // note: in design time fake points are generated 

src/System.Windows.Forms.DataVisualization/General/ChartAreaAxes.cs

@@ -1414,25 +1414,26 @@ internal void SetData(bool initializeAxes, bool checkIndexedAligned)
                 }
             }
 
+            // Now we allow IsXValueIndexed flag for some (not for all) series.
             // Check that all primary X axis series are aligned if use the IsXValueIndexed flag
-            if (checkIndexedAligned)
-            {
-                for (int axisIndex = 0; axisIndex <= 1; axisIndex++)
-                {
-                    List<string> seriesArray = this.GetXAxesSeries((axisIndex == 0) ? AxisType.Primary : AxisType.Secondary, string.Empty);
-                    if (seriesArray.Count > 0 && seriesArray.Any(sn => Common.DataManager.Series[sn].IsXValueIndexed))
-                    {
-                        try
-                        {
-                            Common.DataManipulator.CheckXValuesAlignment(Common.DataManipulator.ConvertToSeriesArray(seriesArray, false));
-                        }
-                        catch (Exception e)
-                        {
-                            throw new ArgumentException(SR.ExceptionAxisSeriesNotAligned + e.Message);
-                        }
-                    }
-                }
-            }
+            //if (checkIndexedAligned)
+            //{
+            //    for (int axisIndex = 0; axisIndex <= 1; axisIndex++)
+            //    {
+            //        List<string> seriesArray = this.GetXAxesSeries((axisIndex == 0) ? AxisType.Primary : AxisType.Secondary, string.Empty);
+            //        if (seriesArray.Count > 0 && seriesArray.Any(sn => Common.DataManager.Series[sn].IsXValueIndexed))
+            //        {
+            //            try
+            //            {
+            //                Common.DataManipulator.CheckXValuesAlignment(Common.DataManipulator.ConvertToSeriesArray(seriesArray, false));
+            //            }
+            //            catch (Exception e)
+            //            {
+            //                throw new ArgumentException(SR.ExceptionAxisSeriesNotAligned + e.Message);
+            //            }
+            //        }
+            //    }
+            //}
 
             if (initializeAxes)
             {

src/System.Windows.Forms.DataVisualization/General/ChartElement.cs

@@ -777,23 +777,15 @@ internal static double GetIntervalSize(
     /// <returns>True if any series is indexed.</returns>
     internal static bool IndexedSeries(CommonElements common, List<string> series)
     {
-        if (common.DataManager.indexedSeries is not null)
-            return common.DataManager.indexedSeries.Value;
-
         // Data series loop
         foreach (string ser in series)
         {
             Series localSeries = common.DataManager.Series[ser];
             // Check series indexed flag
             if (localSeries.IsXValueIndexed)
-            {
-                // If flag set in at least one series - all series are indexed
-                common.DataManager.indexedSeries = true;
-                return true;
-            }
+                return true; // If flag set in at least one series - all series are indexed
         }
 
-        common.DataManager.indexedSeries = false;
         return false;
     }
 
@@ -803,13 +795,22 @@ internal static bool IndexedSeries(CommonElements common, List<string> series)
     /// <param name="series">Data series to check.</param>
     private static bool SeriesXValuesZeros(Series series)
     {
+        // Check if X value zeros check was already done
+        if (series.xValuesZeros is not null)
+            return series.xValuesZeros.Value;
+
         // Data point loop
         foreach (DataPoint point in series.Points)
         {
             if (point.XValue != 0.0)
+            {
+                // If any data point has value different than 0 return false
+                series.xValuesZeros = false;
                 return false;
+            }
         }
 
+        series.xValuesZeros = true;
         return true;
     }
 
@@ -821,21 +822,14 @@ private static bool SeriesXValuesZeros(Series series)
     /// <returns>True if all data points have value 0.</returns>
     internal static bool SeriesXValuesZeros(CommonElements common, List<string> series)
     {
-        if (common.DataManager.xValuesZeros is not null)
-            return common.DataManager.xValuesZeros.Value;
-
         // Data series loop
         foreach (string ser in series)
         {
             // Check one series X values
             if (!SeriesXValuesZeros(common.DataManager.Series[ser]))
-            {
-                common.DataManager.xValuesZeros = false;
                 return false;
-            }
         }
 
-        common.DataManager.xValuesZeros = true;
         return true;
     }