Wrapped calls to GetAxis to accommodate for nulls

tersers · tersers · commit 9cf025279372 · 2017-10-23T00:02:35.000-04:00
diff --git a/Source/Examples/ExampleLibrary/CustomSeries/FlagSeries.cs b/Source/Examples/ExampleLibrary/CustomSeries/FlagSeries.cs
@@ -185,7 +185,9 @@ protected override bool AreAxesRequired()
         /// </summary>
         protected override void EnsureAxes()
         {
-            this.XAxis = this.PlotModel.GetAxis(this.XAxisKey);
+            this.XAxis = this.XAxisKey != null ?
+                         this.PlotModel.GetAxis(this.XAxisKey) :
+                         this.PlotModel.DefaultXAxis;
         }
 
         /// <summary>
diff --git a/Source/Examples/ExampleLibrary/CustomSeries/PolarHeatMapSeries.cs b/Source/Examples/ExampleLibrary/CustomSeries/PolarHeatMapSeries.cs
@@ -342,7 +342,9 @@ protected override void EnsureAxes()
         {
             base.EnsureAxes();
 
-            this.ColorAxis = this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis;
+            this.ColorAxis = this.ColorAxisKey != null ?
+                             this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis :
+                             this.PlotModel.DefaultColorAxis as IColorAxis;
         }
 
         /// <summary>
diff --git a/Source/Examples/ExampleLibrary/Misc/MiscExamples.cs b/Source/Examples/ExampleLibrary/Misc/MiscExamples.cs
@@ -2280,7 +2280,9 @@ protected virtual int Solve(double x0, double y0, int maxIterations)
             protected override void EnsureAxes()
             {
                 base.EnsureAxes();
-                this.ColorAxis = this.PlotModel.GetAxis(this.ColorAxisKey) as LinearColorAxis;
+                this.ColorAxis = this.ColorAxisKey != null ?
+                                 this.PlotModel.GetAxis(this.ColorAxisKey) as LinearColorAxis :
+                                 this.PlotModel.DefaultColorAxis as LinearColorAxis;
             }
 
             /// <summary>
diff --git a/Source/OxyPlot/Annotations/Annotation.cs b/Source/OxyPlot/Annotations/Annotation.cs
@@ -60,8 +60,13 @@ protected Annotation()
         /// </summary>
         public void EnsureAxes()
         {
-            this.XAxis = this.PlotModel.GetAxis(this.XAxisKey);
-            this.YAxis = this.PlotModel.GetAxis(this.YAxisKey);
+            this.XAxis = this.XAxisKey != null ?
+                         this.PlotModel.GetAxis(this.XAxisKey) :
+                         this.PlotModel.DefaultXAxis;
+
+            this.YAxis = this.YAxisKey != null ?
+                         this.PlotModel.GetAxis(this.YAxisKey) :
+                         this.PlotModel.DefaultYAxis;
         }
 
         /// <summary>
diff --git a/Source/OxyPlot/PlotModel/PlotModel.cs b/Source/OxyPlot/PlotModel/PlotModel.cs
@@ -1117,8 +1117,8 @@ public Axis GetAxis(string key)
         /// <param name="key">The axis key.</param>
         /// <param name="defaultAxis">The default axis.</param>
         /// <returns>defaultAxis if key is empty or does not exist; otherwise, the axis that corresponds with the key.</returns>
-         public Axis GetAxisOrDefault(string key, Axis defaultAxis)
-         {
+        public Axis GetAxisOrDefault(string key, Axis defaultAxis)
+        {
             if (key != null)
             {
                 var axis = this.Axes.FirstOrDefault(a => a.Key == key);                
diff --git a/Source/OxyPlot/Series/HeatMapSeries.cs b/Source/OxyPlot/Series/HeatMapSeries.cs
@@ -447,8 +447,9 @@ protected internal override void EnsureAxes()
         {
             base.EnsureAxes();
 
-            this.ColorAxis =
-                this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis;
+            this.ColorAxis = this.ColorAxisKey != null ?
+                             this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis :
+                             this.PlotModel.DefaultColorAxis as IColorAxis;
         }
 
         /// <summary>
@@ -759,4 +760,4 @@ private void UpdateImage()
             this.image = OxyImage.Create(buffer, ImageFormat.Png);
         }
     }
-}
+}
diff --git a/Source/OxyPlot/Series/RectangleSeries.cs b/Source/OxyPlot/Series/RectangleSeries.cs
@@ -311,7 +311,9 @@ protected internal override void EnsureAxes()
         {
             base.EnsureAxes();
 
-            this.ColorAxis = this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis;
+            this.ColorAxis = this.ColorAxisKey != null ?
+                             this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis :
+                             this.PlotModel.DefaultColorAxis as IColorAxis;
         }
 
         /// <summary>
@@ -403,4 +405,4 @@ private bool IsPointInRange(DataPoint p)
             return p.X >= this.MinX && p.X <= this.MaxX && p.Y >= this.MinY && p.Y <= this.MaxY;
         }
     }
-}
+}
diff --git a/Source/OxyPlot/Series/ScatterSeries{T}.cs b/Source/OxyPlot/Series/ScatterSeries{T}.cs
@@ -492,7 +492,9 @@ protected internal override void EnsureAxes()
         {
             base.EnsureAxes();
 
-            this.ColorAxis = this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis;
+            this.ColorAxis = this.ColorAxisKey != null ?
+                             this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis :
+                             this.PlotModel.DefaultColorAxis as IColorAxis;
         }
 
         /// <summary>
diff --git a/Source/OxyPlot/Series/XYAxisSeries.cs b/Source/OxyPlot/Series/XYAxisSeries.cs
@@ -164,8 +164,13 @@ protected internal override bool AreAxesRequired()
         /// </summary>
         protected internal override void EnsureAxes()
         {
-            this.XAxis = this.PlotModel.GetAxis(this.XAxisKey);
-            this.YAxis = this.PlotModel.GetAxis(this.YAxisKey);
+            this.XAxis = this.XAxisKey != null ?
+                         this.PlotModel.GetAxis(this.XAxisKey) :
+                         this.PlotModel.DefaultXAxis;
+
+            this.YAxis = this.YAxisKey != null ?
+                         this.PlotModel.GetAxis(this.YAxisKey) :
+                         this.PlotModel.DefaultYAxis;
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,9 @@ protected override bool AreAxesRequired()`
`185`	`185`	`/// </summary>`
`186`	`186`	`protected override void EnsureAxes()`
`187`	`187`	`{`
`188`		`- this.XAxis = this.PlotModel.GetAxis(this.XAxisKey);`
	`188`	`+ this.XAxis = this.XAxisKey != null ?`
	`189`	`+ this.PlotModel.GetAxis(this.XAxisKey) :`
	`190`	`+ this.PlotModel.DefaultXAxis;`
`189`	`191`	`}`
`190`	`192`
`191`	`193`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,9 @@ protected override void EnsureAxes()`
`342`	`342`	`{`
`343`	`343`	`base.EnsureAxes();`
`344`	`344`
`345`		`- this.ColorAxis = this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis;`
	`345`	`+ this.ColorAxis = this.ColorAxisKey != null ?`
	`346`	`+ this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis :`
	`347`	`+ this.PlotModel.DefaultColorAxis as IColorAxis;`
`346`	`348`	`}`
`347`	`349`
`348`	`350`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -2280,7 +2280,9 @@ protected virtual int Solve(double x0, double y0, int maxIterations)`
`2280`	`2280`	`protected override void EnsureAxes()`
`2281`	`2281`	`{`
`2282`	`2282`	`base.EnsureAxes();`
`2283`		`- this.ColorAxis = this.PlotModel.GetAxis(this.ColorAxisKey) as LinearColorAxis;`
	`2283`	`+ this.ColorAxis = this.ColorAxisKey != null ?`
	`2284`	`+ this.PlotModel.GetAxis(this.ColorAxisKey) as LinearColorAxis :`
	`2285`	`+ this.PlotModel.DefaultColorAxis as LinearColorAxis;`
`2284`	`2286`	`}`
`2285`	`2287`
`2286`	`2288`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -447,8 +447,9 @@ protected internal override void EnsureAxes()`
`447`	`447`	`{`
`448`	`448`	`base.EnsureAxes();`
`449`	`449`
`450`		`- this.ColorAxis =`
`451`		`- this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis;`
	`450`	`+ this.ColorAxis = this.ColorAxisKey != null ?`
	`451`	`+ this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis :`
	`452`	`+ this.PlotModel.DefaultColorAxis as IColorAxis;`
`452`	`453`	`}`
`453`	`454`
`454`	`455`	`/// <summary>`
`@@ -759,4 +760,4 @@ private void UpdateImage()`
`759`	`760`	`this.image = OxyImage.Create(buffer, ImageFormat.Png);`
`760`	`761`	`}`
`761`	`762`	`}`
`762`		`-}`
	`763`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,9 @@ protected internal override void EnsureAxes()`
`311`	`311`	`{`
`312`	`312`	`base.EnsureAxes();`
`313`	`313`
`314`		`- this.ColorAxis = this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis;`
	`314`	`+ this.ColorAxis = this.ColorAxisKey != null ?`
	`315`	`+ this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis :`
	`316`	`+ this.PlotModel.DefaultColorAxis as IColorAxis;`
`315`	`317`	`}`
`316`	`318`
`317`	`319`	`/// <summary>`
`@@ -403,4 +405,4 @@ private bool IsPointInRange(DataPoint p)`
`403`	`405`	`return p.X >= this.MinX && p.X <= this.MaxX && p.Y >= this.MinY && p.Y <= this.MaxY;`
`404`	`406`	`}`
`405`	`407`	`}`
`406`		`-}`
	`408`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,9 @@ protected internal override void EnsureAxes()`
`492`	`492`	`{`
`493`	`493`	`base.EnsureAxes();`
`494`	`494`
`495`		`- this.ColorAxis = this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis;`
	`495`	`+ this.ColorAxis = this.ColorAxisKey != null ?`
	`496`	`+ this.PlotModel.GetAxis(this.ColorAxisKey) as IColorAxis :`
	`497`	`+ this.PlotModel.DefaultColorAxis as IColorAxis;`
`496`	`498`	`}`
`497`	`499`
`498`	`500`	`/// <summary>`