Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
objorke committed Jun 5, 2014
2 parents 3ae89b7 + 8dedafe commit 78c4a7b
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions Source/OxyPlot/Series/PieSeries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ public PieSeries()
/// <value>The inner diameter.</value>
public double InnerDiameter { get; set; }

/// <summary>
/// Gets or sets InnerTextColor.
/// </summary>
public OxyColor InnerTextColor { get; set; }

/// <summary>
/// Gets or sets the inside label format.
/// </summary>
Expand Down Expand Up @@ -231,6 +236,11 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
/// <param name="model">The model.</param>
public override void Render(IRenderContext rc, PlotModel model)
{
if (this.InnerTextColor.IsUndefined())
{
this.InnerTextColor = this.ActualTextColor;
}

if (this.Slices.Count == 0)
{
return;
Expand Down Expand Up @@ -322,7 +332,7 @@ public override void Render(IRenderContext rc, PlotModel model)
tp0.X + (this.TickRadialLength * Math.Cos(midAngleRadians)),
tp0.Y + (this.TickRadialLength * Math.Sin(midAngleRadians)));
var tp2 = new ScreenPoint(tp1.X + (this.TickHorizontalLength * sign), tp1.Y);
rc.DrawLine(new[] { tp0, tp1, tp2 }, this.Stroke, this.StrokeThickness, null, OxyPenLineJoin.Bevel);
rc.DrawLine(new[] { tp0, tp1, tp2 }, this.ActualTextColor, 1, null, OxyPenLineJoin.Bevel);

// label
var labelPosition = new ScreenPoint(tp2.X + (this.TickLabelDistance * sign), tp2.Y);
Expand Down Expand Up @@ -359,7 +369,7 @@ public override void Render(IRenderContext rc, PlotModel model)
rc.DrawText(
labelPosition,
label,
this.ActualTextColor,
this.InnerTextColor,
this.ActualFont,
this.ActualFontSize,
this.ActualFontWeight,
Expand Down

0 comments on commit 78c4a7b

Please sign in to comment.