remove model from Series.Render()

tibel · tibel · commit 0172c119e6bf · 2015-05-16T08:56:45.000+02:00
diff --git a/Source/Examples/ExampleLibrary/CustomSeries/ErrorSeries.cs b/Source/Examples/ExampleLibrary/CustomSeries/ErrorSeries.cs
@@ -62,8 +62,7 @@ public List<ErrorItem> Points
         /// Renders the series on the specified render context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             var points = this.Points;
             if (points.Count == 0)
diff --git a/Source/Examples/ExampleLibrary/CustomSeries/FlagSeries.cs b/Source/Examples/ExampleLibrary/CustomSeries/FlagSeries.cs
@@ -122,15 +122,14 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the series on the specified render context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.XAxis == null)
             {
                 return;
             }
 
-            this.symbolPosition = model.PlotArea.Bottom;
+            this.symbolPosition = this.PlotModel.PlotArea.Bottom;
             this.symbolSize = rc.MeasureText(this.Symbol, this.ActualFont, this.ActualFontSize);
             foreach (var v in this.Values)
             {
diff --git a/Source/Examples/ExampleLibrary/CustomSeries/LineSegmentSeries.cs b/Source/Examples/ExampleLibrary/CustomSeries/LineSegmentSeries.cs
@@ -45,8 +45,7 @@ public LineSegmentSeries()
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (Points.Count == 0)
             {
diff --git a/Source/Examples/ExampleLibrary/CustomSeries/MatrixSeries.cs b/Source/Examples/ExampleLibrary/CustomSeries/MatrixSeries.cs
@@ -134,8 +134,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the series on the specified render context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.Matrix == null)
             {
diff --git a/Source/Examples/ExampleLibrary/CustomSeries/PolarHeatMapSeries.cs b/Source/Examples/ExampleLibrary/CustomSeries/PolarHeatMapSeries.cs
@@ -102,8 +102,7 @@ public PolarHeatMapSeries()
         /// Renders the series on the specified render context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.Data == null)
             {
@@ -113,11 +112,11 @@ public override void Render(IRenderContext rc, PlotModel model)
 
             if (this.ImageSize > 0)
             {
-                this.RenderFixed(rc, model);
+                this.RenderFixed(rc, this.PlotModel);
             }
             else
             {
-                this.RenderDynamic(rc, model);
+                this.RenderDynamic(rc, this.PlotModel);
             }
         }
 
diff --git a/Source/Examples/ExampleLibrary/Discussions/DiscussionExamples.cs b/Source/Examples/ExampleLibrary/Discussions/DiscussionExamples.cs
@@ -345,7 +345,7 @@ public OxyColor ActualColor
                 }
             }
 
-            public override void Render(IRenderContext rc, PlotModel model)
+            public override void Render(IRenderContext rc)
             {
                 // transform to screen coordinates
                 var p0 = this.Transform(this.StartPoint);
diff --git a/Source/Examples/ExampleLibrary/Misc/MiscExamples.cs b/Source/Examples/ExampleLibrary/Misc/MiscExamples.cs
@@ -2229,8 +2229,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
             /// Renders the series on the specified render context.
             /// </summary>
             /// <param name="rc">The rendering context.</param>
-            /// <param name="model">The model.</param>
-            public override void Render(IRenderContext rc, PlotModel model)
+            public override void Render(IRenderContext rc)
             {
                 var p0 = this.Transform(this.XAxis.ActualMinimum, this.YAxis.ActualMinimum);
                 var p1 = this.Transform(this.XAxis.ActualMaximum, this.YAxis.ActualMaximum);
diff --git a/Source/OxyPlot/PlotModel/PlotModel.Rendering.cs b/Source/OxyPlot/PlotModel/PlotModel.Rendering.cs
@@ -415,7 +415,7 @@ private void RenderSeries(IRenderContext rc)
             foreach (var s in this.Series.Where(s => s.IsVisible))
             {
                 rc.SetToolTip(s.ToolTip);
-                s.Render(rc, this);
+                s.Render(rc);
             }
 
             rc.SetToolTip(null);
diff --git a/Source/OxyPlot/Series/AreaSeries.cs b/Source/OxyPlot/Series/AreaSeries.cs
@@ -173,8 +173,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             var actualPoints = this.ActualPoints;
             var actualPoints2 = this.ActualPoints2;
diff --git a/Source/OxyPlot/Series/BarSeries/BarSeriesBase.cs b/Source/OxyPlot/Series/BarSeries/BarSeriesBase.cs
@@ -181,8 +181,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             this.ActualBarRectangles = new List<OxyRect>();
 
diff --git a/Source/OxyPlot/Series/BarSeries/IntervalBarSeries.cs b/Source/OxyPlot/Series/BarSeries/IntervalBarSeries.cs
@@ -214,8 +214,7 @@ public virtual bool IsValidPoint(double v, Axis yaxis)
         /// Renders the Series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             this.ActualBarRectangles = new List<OxyRect>();
 
diff --git a/Source/OxyPlot/Series/BarSeries/RectangleBarSeries.cs b/Source/OxyPlot/Series/BarSeries/RectangleBarSeries.cs
@@ -144,8 +144,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.Items.Count == 0)
             {
diff --git a/Source/OxyPlot/Series/BarSeries/TornadoBarSeries.cs b/Source/OxyPlot/Series/BarSeries/TornadoBarSeries.cs
@@ -231,8 +231,7 @@ public virtual bool IsValidPoint(double v, Axis yaxis)
         /// Renders the Series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             this.ActualMinimumBarRectangles = new List<OxyRect>();
             this.ActualMaximumBarRectangles = new List<OxyRect>();
diff --git a/Source/OxyPlot/Series/BoxPlotSeries.cs b/Source/OxyPlot/Series/BoxPlotSeries.cs
@@ -295,8 +295,7 @@ public virtual bool IsValidPoint(BoxPlotItem item, Axis xaxis, Axis yaxis)
         /// Renders the series on the specified render context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.ActualItems.Count == 0)
             {
diff --git a/Source/OxyPlot/Series/ContourSeries.cs b/Source/OxyPlot/Series/ContourSeries.cs
@@ -254,8 +254,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.contours == null)
             {
diff --git a/Source/OxyPlot/Series/FinancialSeries/CandleStickAndVolumeSeries.cs b/Source/OxyPlot/Series/FinancialSeries/CandleStickAndVolumeSeries.cs
@@ -226,9 +226,8 @@ public int FindByX(double x, int startingIndex = -1)
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
         // ReSharper disable once FunctionComplexityOverflow
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.data == null || this.data.Count == 0)
             {
diff --git a/Source/OxyPlot/Series/FinancialSeries/CandleStickSeries.cs b/Source/OxyPlot/Series/FinancialSeries/CandleStickSeries.cs
@@ -100,8 +100,7 @@ public int FindByX(double x, int startIndex = -1)
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             var nitems = this.Items.Count;
             var items = this.Items;
diff --git a/Source/OxyPlot/Series/FinancialSeries/HighLowSeries.cs b/Source/OxyPlot/Series/FinancialSeries/HighLowSeries.cs
@@ -224,8 +224,7 @@ public virtual bool IsValidItem(HighLowItem pt, Axis xaxis, Axis yaxis)
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.items.Count == 0)
             {
diff --git a/Source/OxyPlot/Series/FinancialSeries/OldCandleStickSeries.cs b/Source/OxyPlot/Series/FinancialSeries/OldCandleStickSeries.cs
@@ -73,8 +73,7 @@ public OxyColor ActualIncreasingFill
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.Items.Count == 0)
             {
diff --git a/Source/OxyPlot/Series/FinancialSeries/VolumeSeries.cs b/Source/OxyPlot/Series/FinancialSeries/VolumeSeries.cs
@@ -192,8 +192,7 @@ public int FindByX(double x, int startingIndex = -1)
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.data == null || this.data.Count == 0)
             {
diff --git a/Source/OxyPlot/Series/HeatMapSeries.cs b/Source/OxyPlot/Series/HeatMapSeries.cs
@@ -175,8 +175,7 @@ public void Invalidate()
         /// Renders the series on the specified render context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.Data == null)
             {
diff --git a/Source/OxyPlot/Series/LineSeries.cs b/Source/OxyPlot/Series/LineSeries.cs
@@ -319,8 +319,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             var actualPoints = this.ActualPoints;
             if (actualPoints == null || actualPoints.Count == 0)
diff --git a/Source/OxyPlot/Series/PieSeries.cs b/Source/OxyPlot/Series/PieSeries.cs
@@ -249,8 +249,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the series on the specified render context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             this.slicePoints.Clear();
 
@@ -266,14 +265,14 @@ public override void Render(IRenderContext rc, PlotModel model)
             }
 
             // todo: reduce available size due to the labels
-            double radius = Math.Min(model.PlotArea.Width, model.PlotArea.Height) / 2;
+            double radius = Math.Min(this.PlotModel.PlotArea.Width, this.PlotModel.PlotArea.Height) / 2;
 
             double outerRadius = radius * (this.Diameter - this.ExplodedDistance);
             double innerRadius = radius * this.InnerDiameter;
 
             double angle = this.StartAngle;
             var midPoint = new ScreenPoint(
-                (model.PlotArea.Left + model.PlotArea.Right) * 0.5, (model.PlotArea.Top + model.PlotArea.Bottom) * 0.5);
+                (this.PlotModel.PlotArea.Left + this.PlotModel.PlotArea.Right) * 0.5, (this.PlotModel.PlotArea.Top + this.PlotModel.PlotArea.Bottom) * 0.5);
 
             foreach (var slice in this.slices)
             {
diff --git a/Source/OxyPlot/Series/ScatterErrorSeries.cs b/Source/OxyPlot/Series/ScatterErrorSeries.cs
@@ -83,12 +83,9 @@ public ScatterErrorSeries()
         /// <param name="rc">
         /// The rendering context.
         /// </param>
-        /// <param name="model">
-        /// The owner plot model.
-        /// </param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
-            base.Render(rc, model);
+            base.Render(rc);
 
             var clippingRectangle = this.GetClippingRect();
 
diff --git a/Source/OxyPlot/Series/ScatterSeries{T}.cs b/Source/OxyPlot/Series/ScatterSeries{T}.cs
@@ -313,8 +313,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             var actualPoints = this.ActualPointsList;
             int n = actualPoints.Count;
diff --git a/Source/OxyPlot/Series/Series.cs b/Source/OxyPlot/Series/Series.cs
@@ -74,8 +74,7 @@ public virtual TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpol
         /// Renders the series on the specified render context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The model.</param>
-        public abstract void Render(IRenderContext rc, PlotModel model);
+        public abstract void Render(IRenderContext rc);
 
         /// <summary>
         /// Renders the legend symbol on the specified render context.
diff --git a/Source/OxyPlot/Series/StairStepSeries.cs b/Source/OxyPlot/Series/StairStepSeries.cs
@@ -138,8 +138,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the LineSeries on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.ActualPoints.Count == 0)
             {
diff --git a/Source/OxyPlot/Series/StemSeries.cs b/Source/OxyPlot/Series/StemSeries.cs
@@ -107,8 +107,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the LineSeries on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             if (this.ActualPoints.Count == 0)
             {
diff --git a/Source/OxyPlot/Series/TwoColorAreaSeries.cs b/Source/OxyPlot/Series/TwoColorAreaSeries.cs
@@ -120,8 +120,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
         /// Renders the series on the specified rendering context.
         /// </summary>
         /// <param name="rc">The rendering context.</param>
-        /// <param name="model">The owner plot model.</param>
-        public override void Render(IRenderContext rc, PlotModel model)
+        public override void Render(IRenderContext rc)
         {
             var actualPoints = this.ActualPoints;
             var actualPoints2 = this.points2;

Original file line number	Diff line number	Diff line change
`@@ -122,15 +122,14 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo`
`122`	`122`	`/// Renders the series on the specified render context.`
`123`	`123`	`/// </summary>`
`124`	`124`	`/// <param name="rc">The rendering context.</param>`
`125`		`- /// <param name="model">The model.</param>`
`126`		`- public override void Render(IRenderContext rc, PlotModel model)`
	`125`	`+ public override void Render(IRenderContext rc)`
`127`	`126`	`{`
`128`	`127`	`if (this.XAxis == null)`
`129`	`128`	`{`
`130`	`129`	`return;`
`131`	`130`	`}`
`132`	`131`
`133`		`- this.symbolPosition = model.PlotArea.Bottom;`
	`132`	`+ this.symbolPosition = this.PlotModel.PlotArea.Bottom;`
`134`	`133`	`this.symbolSize = rc.MeasureText(this.Symbol, this.ActualFont, this.ActualFontSize);`
`135`	`134`	`foreach (var v in this.Values)`
`136`	`135`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ public LineSegmentSeries()`
`45`	`45`	`/// Renders the series on the specified rendering context.`
`46`	`46`	`/// </summary>`
`47`	`47`	`/// <param name="rc">The rendering context.</param>`
`48`		`- /// <param name="model">The owner plot model.</param>`
`49`		`- public override void Render(IRenderContext rc, PlotModel model)`
	`48`	`+ public override void Render(IRenderContext rc)`
`50`	`49`	`{`
`51`	`50`	`if (Points.Count == 0)`
`52`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo`
`134`	`134`	`/// Renders the series on the specified render context.`
`135`	`135`	`/// </summary>`
`136`	`136`	`/// <param name="rc">The rendering context.</param>`
`137`		`- /// <param name="model">The model.</param>`
`138`		`- public override void Render(IRenderContext rc, PlotModel model)`
	`137`	`+ public override void Render(IRenderContext rc)`
`139`	`138`	`{`
`140`	`139`	`if (this.Matrix == null)`
`141`	`140`	`{`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,7 @@ public PolarHeatMapSeries()`
`102`	`102`	`/// Renders the series on the specified render context.`
`103`	`103`	`/// </summary>`
`104`	`104`	`/// <param name="rc">The rendering context.</param>`
`105`		`- /// <param name="model">The model.</param>`
`106`		`- public override void Render(IRenderContext rc, PlotModel model)`
	`105`	`+ public override void Render(IRenderContext rc)`
`107`	`106`	`{`
`108`	`107`	`if (this.Data == null)`
`109`	`108`	`{`
`@@ -113,11 +112,11 @@ public override void Render(IRenderContext rc, PlotModel model)`
`113`	`112`
`114`	`113`	`if (this.ImageSize > 0)`
`115`	`114`	`{`
`116`		`- this.RenderFixed(rc, model);`
	`115`	`+ this.RenderFixed(rc, this.PlotModel);`
`117`	`116`	`}`
`118`	`117`	`else`
`119`	`118`	`{`
`120`		`- this.RenderDynamic(rc, model);`
	`119`	`+ this.RenderDynamic(rc, this.PlotModel);`
`121`	`120`	`}`
`122`	`121`	`}`
`123`	`122`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ public OxyColor ActualColor`
`345`	`345`	`}`
`346`	`346`	`}`
`347`	`347`
`348`		`- public override void Render(IRenderContext rc, PlotModel model)`
	`348`	`+ public override void Render(IRenderContext rc)`
`349`	`349`	`{`
`350`	`350`	`// transform to screen coordinates`
`351`	`351`	`var p0 = this.Transform(this.StartPoint);`
Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ private void RenderSeries(IRenderContext rc)`
`415`	`415`	`foreach (var s in this.Series.Where(s => s.IsVisible))`
`416`	`416`	`{`
`417`	`417`	`rc.SetToolTip(s.ToolTip);`
`418`		`- s.Render(rc, this);`
	`418`	`+ s.Render(rc);`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`rc.SetToolTip(null);`
Original file line number	Diff line number	Diff line change
`@@ -181,8 +181,7 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo`
`181`	`181`	`/// Renders the series on the specified rendering context.`
`182`	`182`	`/// </summary>`
`183`	`183`	`/// <param name="rc">The rendering context.</param>`
`184`		`- /// <param name="model">The model.</param>`
`185`		`- public override void Render(IRenderContext rc, PlotModel model)`
	`184`	`+ public override void Render(IRenderContext rc)`
`186`	`185`	`{`
`187`	`186`	`this.ActualBarRectangles = new List<OxyRect>();`
`188`	`187`