Renamed RingSegment to CircleSegment

XamlBrewer · Nov 6, 2018 · 62d0fe2 · 62d0fe2
1 parent 19f9937
commit 62d0fe2
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 46 deletions.
diff --git a/Assets/ArcSegment.png b/Assets/ArcSegment.png
diff --git a/Assets/CircleSegment.png b/Assets/CircleSegment.png
diff --git a/Assets/Composition.png b/Assets/Composition.png
diff --git a/Assets/Gallery.png b/Assets/Gallery.png
diff --git a/Assets/RingSegment.png b/Assets/RingSegment.png
diff --git a/...Uwp.ArcPathSample/Controls/RingSegment.cs → ...p.ArcPathSample/Controls/CircleSegment.cs b/...Uwp.ArcPathSample/Controls/RingSegment.cs → ...p.ArcPathSample/Controls/CircleSegment.cs
@@ -7,25 +7,25 @@
 
 namespace XamlBrewer.Uwp.Controls
 {
-    public class RingSegment : CompositionPathHost
+    public class CircleSegment : CompositionPathHost
     {
         public static readonly DependencyProperty CenterPointXProperty =
-            DependencyProperty.Register(nameof(CenterPointX), typeof(double), typeof(RingSegment), new PropertyMetadata(0d, Render));
+            DependencyProperty.Register(nameof(CenterPointX), typeof(double), typeof(CircleSegment), new PropertyMetadata(0d, Render));
 
         public static readonly DependencyProperty CenterPointYProperty =
-            DependencyProperty.Register(nameof(CenterPointY), typeof(double), typeof(RingSegment), new PropertyMetadata(0d, Render));
+            DependencyProperty.Register(nameof(CenterPointY), typeof(double), typeof(CircleSegment), new PropertyMetadata(0d, Render));
 
         public static readonly DependencyProperty RadiusProperty =
-            DependencyProperty.Register(nameof(Radius), typeof(double), typeof(RingSegment), new PropertyMetadata(0d, Render));
+            DependencyProperty.Register(nameof(Radius), typeof(double), typeof(CircleSegment), new PropertyMetadata(0d, Render));
 
         public static readonly DependencyProperty StartAngleProperty =
-            DependencyProperty.Register(nameof(StartAngle), typeof(double), typeof(RingSegment), new PropertyMetadata(0d, Render));
+            DependencyProperty.Register(nameof(StartAngle), typeof(double), typeof(CircleSegment), new PropertyMetadata(0d, Render));
 
         public static readonly DependencyProperty SweepAngleProperty =
-            DependencyProperty.Register(nameof(SweepAngle), typeof(double), typeof(RingSegment), new PropertyMetadata(0d, Render));
+            DependencyProperty.Register(nameof(SweepAngle), typeof(double), typeof(CircleSegment), new PropertyMetadata(0d, Render));
 
         public static readonly DependencyProperty IsPieProperty =
-            DependencyProperty.Register(nameof(IsPie), typeof(bool), typeof(RingSegment), new PropertyMetadata(false, Render));
+            DependencyProperty.Register(nameof(IsPie), typeof(bool), typeof(CircleSegment), new PropertyMetadata(false, Render));
 
         private const double Degrees2Radians = Math.PI / 180;
 
@@ -65,23 +65,23 @@ public bool IsPie
             set { SetValue(IsPieProperty, value); }
         }
 
-        public RingSegment()
+        public CircleSegment()
         {
             this.InitializeComponent();
 
-            Loaded += RingSegment_Loaded;
-            Unloaded += RingSegment_Unloaded;
+            Loaded += CircleSegment_Loaded;
+            Unloaded += CircleSegment_Unloaded;
         }
 
-        private void RingSegment_Loaded(object sender, RoutedEventArgs e)
+        private void CircleSegment_Loaded(object sender, RoutedEventArgs e)
         {
             Render(this, null);
         }
 
-        private void RingSegment_Unloaded(object sender, RoutedEventArgs e)
+        private void CircleSegment_Unloaded(object sender, RoutedEventArgs e)
         {
-            Loaded -= RingSegment_Loaded;
-            Unloaded -= RingSegment_Unloaded;
+            Loaded -= CircleSegment_Loaded;
+            Unloaded -= CircleSegment_Unloaded;
         }
 
         protected override void Render()

diff --git a/XamlBrewer.Uwp.ArcPathSample/Controls/CompositionPathHost.xaml.cs b/XamlBrewer.Uwp.ArcPathSample/Controls/CompositionPathHost.xaml.cs
@@ -7,25 +7,25 @@ namespace XamlBrewer.Uwp.Controls
     public abstract partial class CompositionPathHost : UserControl
     {
         public static readonly DependencyProperty StartPointXProperty =
-            DependencyProperty.Register(nameof(StartPointX), typeof(double), typeof(RingSegment), new PropertyMetadata(0d, new PropertyChangedCallback(Render)));
+            DependencyProperty.Register(nameof(StartPointX), typeof(double), typeof(CompositionPathHost), new PropertyMetadata(0d, new PropertyChangedCallback(Render)));
 
         public static readonly DependencyProperty StartPointYProperty =
-            DependencyProperty.Register(nameof(StartPointY), typeof(double), typeof(RingSegment), new PropertyMetadata(0d, Render));
+            DependencyProperty.Register(nameof(StartPointY), typeof(double), typeof(CompositionPathHost), new PropertyMetadata(0d, Render));
 
         public static readonly DependencyProperty StrokeThicknessProperty =
-            DependencyProperty.Register(nameof(StrokeThickness), typeof(double), typeof(RingSegment), new PropertyMetadata(1.0, Render));
+            DependencyProperty.Register(nameof(StrokeThickness), typeof(double), typeof(CompositionPathHost), new PropertyMetadata(1.0, Render));
 
         public static readonly DependencyProperty StrokeProperty =
-            DependencyProperty.Register(nameof(Stroke), typeof(Color), typeof(RingSegment), new PropertyMetadata((Color)Application.Current.Resources["SystemAccentColor"], Render));
+            DependencyProperty.Register(nameof(Stroke), typeof(Color), typeof(CompositionPathHost), new PropertyMetadata((Color)Application.Current.Resources["SystemAccentColor"], Render));
 
         public static readonly DependencyProperty FillProperty =
-            DependencyProperty.Register(nameof(Fill), typeof(Color), typeof(RingSegment), new PropertyMetadata(Colors.Transparent, Render));
+            DependencyProperty.Register(nameof(Fill), typeof(Color), typeof(CompositionPathHost), new PropertyMetadata(Colors.Transparent, Render));
 
         public static readonly DependencyProperty IsClosedProperty =
-            DependencyProperty.Register(nameof(IsClosed), typeof(bool), typeof(RingSegment), new PropertyMetadata(false, Render));
+            DependencyProperty.Register(nameof(IsClosed), typeof(bool), typeof(CompositionPathHost), new PropertyMetadata(false, Render));
 
         public static readonly DependencyProperty IsStrokeRoundedProperty =
-            DependencyProperty.Register(nameof(IsStrokeRounded), typeof(bool), typeof(RingSegment), new PropertyMetadata(false, Render));
+            DependencyProperty.Register(nameof(IsStrokeRounded), typeof(bool), typeof(CompositionPathHost), new PropertyMetadata(false, Render));
 
         public double StartPointX
         {

diff --git a/XamlBrewer.Uwp.ArcPathSample/ViewModels/ShellViewModel.cs b/XamlBrewer.Uwp.ArcPathSample/ViewModels/ShellViewModel.cs
@@ -11,7 +11,7 @@ public ShellViewModel()
             Menu.Add(new MenuItem() { Glyph = Icon.GetIcon("HomeIcon"), Text = "Home", NavigationDestination = typeof(HomePage) });
             Menu.Add(new MenuItem() { Glyph = Icon.GetIcon("TopLayerIcon"), Text = "XAML", NavigationDestination = typeof(ArcSegmentPage) });
             Menu.Add(new MenuItem() { Glyph = Icon.GetIcon("MiddleLayerIcon"), Text = "Composition", NavigationDestination = typeof(Win2DPage) });
-            Menu.Add(new MenuItem() { Glyph = Icon.GetIcon("DonutIcon"), Text = "Ring Segment", NavigationDestination = typeof(CircleSegmentPage) });
+            Menu.Add(new MenuItem() { Glyph = Icon.GetIcon("DonutIcon"), Text = "Circle Segment", NavigationDestination = typeof(CircleSegmentPage) });
             Menu.Add(new MenuItem() { Glyph = Icon.GetIcon("PacmanIcon"), Text = "Gallery", NavigationDestination = typeof(GalleryPage) });
             Menu.Add(new MenuItem() { Glyph = Icon.GetIcon("SquaresIcon"), Text = "Squares", NavigationDestination = typeof(SquaresPage) });
             SecondMenu.Add(new MenuItem() { Glyph = Icon.GetIcon("InfoIcon"), Text = "About", NavigationDestination = typeof(AboutPage) });

diff --git a/XamlBrewer.Uwp.ArcPathSample/Views/CircleSegmentPage.xaml b/XamlBrewer.Uwp.ArcPathSample/Views/CircleSegmentPage.xaml
@@ -24,7 +24,7 @@
                    Margin="6 0 0 0"
                    TextLineBounds="TrimToCapHeight"
                    FontFamily="Segoe UI">
-                <Run Text="Ring Segment Control" />
+                <Run Text="Circle Segment Control" />
         </TextBlock>
         <Path Data="{StaticResource DonutIcon}"
               Fill="{StaticResource PageTitleBrush}"
@@ -61,7 +61,7 @@
                 <Grid Background="{StaticResource LighteningBrush}"
                       Height="400"
                       Width="400">
-                    <controls:RingSegment x:Name="RingSegment"
+                    <controls:CircleSegment x:Name="CircleSegment"
                                           Radius="100"
                                           IsPie="True"
                                           CenterPointX="200"
@@ -74,38 +74,38 @@
                 <StackPanel VerticalAlignment="Top"
                             Grid.Column="1">
                     <Slider Header="Centerpoint X"
-                            Value="{Binding CenterPointX, ElementName=RingSegment, Mode=TwoWay}"
+                            Value="{Binding CenterPointX, ElementName=CircleSegment, Mode=TwoWay}"
                             Maximum="400" />
                     <Slider Header="Radius"
-                            Value="{Binding Radius, ElementName=RingSegment, Mode=TwoWay}"
+                            Value="{Binding Radius, ElementName=CircleSegment, Mode=TwoWay}"
                             Maximum="200"
                             FontFamily="Segoe UI" />
                     <Slider Header="Start angle"
-                            Value="{Binding StartAngle, ElementName=RingSegment, Mode=TwoWay}"
+                            Value="{Binding StartAngle, ElementName=CircleSegment, Mode=TwoWay}"
                             Maximum="360" />
                     <ToggleSwitch Header="Closed"
-                                  IsOn="{Binding IsClosed, ElementName=RingSegment, Mode=TwoWay}"
+                                  IsOn="{Binding IsClosed, ElementName=CircleSegment, Mode=TwoWay}"
                                   OnContent="Yes"
                                   OffContent="No" />
                     <ToggleSwitch Header="Rounded Stroke"
-                                  IsOn="{Binding IsStrokeRounded, ElementName=RingSegment, Mode=TwoWay}"
+                                  IsOn="{Binding IsStrokeRounded, ElementName=CircleSegment, Mode=TwoWay}"
                                   OnContent="Yes"
                                   OffContent="No" />
                 </StackPanel>
                 <StackPanel VerticalAlignment="Top"
                             Grid.Column="2">
                     <Slider Header="Centerpoint Y"
-                            Value="{Binding CenterPointY, ElementName=RingSegment, Mode=TwoWay}"
+                            Value="{Binding CenterPointY, ElementName=CircleSegment, Mode=TwoWay}"
                             Maximum="400" />
                     <Slider Header="Stroke Thickness"
-                            Value="{Binding StrokeThickness, ElementName=RingSegment, Mode=TwoWay}"
+                            Value="{Binding StrokeThickness, ElementName=CircleSegment, Mode=TwoWay}"
                             Maximum="40"
                             StepFrequency=".5" />
                     <Slider Header="Sweep angle"
-                            Value="{Binding SweepAngle, ElementName=RingSegment, Mode=TwoWay}"
+                            Value="{Binding SweepAngle, ElementName=CircleSegment, Mode=TwoWay}"
                             Maximum="360" />
                     <ToggleSwitch Header="Pie"
-                                  IsOn="{Binding IsPie, ElementName=RingSegment, Mode=TwoWay}"
+                                  IsOn="{Binding IsPie, ElementName=CircleSegment, Mode=TwoWay}"
                                   OnContent="Yes"
                                   OffContent="No" />
                 </StackPanel>

diff --git a/XamlBrewer.Uwp.ArcPathSample/Views/GalleryPage.xaml b/XamlBrewer.Uwp.ArcPathSample/Views/GalleryPage.xaml
@@ -68,28 +68,28 @@
                                HorizontalTextAlignment="Center">Pie Chart</TextBlock>
                 </Grid>
                 <Grid Grid.Row="1">
-                    <controls:RingSegment Radius="100"
+                    <controls:CircleSegment Radius="100"
                                           IsPie="True"
                                           CenterPointX="150"
                                           CenterPointY="150"
                                           StartAngle="-45"
                                           SweepAngle="90"
                                           Fill="Maroon" />
-                    <controls:RingSegment Radius="100"
+                    <controls:CircleSegment Radius="100"
                                           IsPie="True"
                                           CenterPointX="130"
                                           CenterPointY="150"
                                           StartAngle="45"
                                           SweepAngle="270"
                                           Fill="Silver" />
-                    <controls:RingSegment Radius="100"
+                    <controls:CircleSegment Radius="100"
                                           IsPie="True"
                                           CenterPointX="130"
                                           CenterPointY="150"
                                           StartAngle="135"
                                           SweepAngle="90"
                                           Fill="Black" />
-                    <controls:RingSegment Radius="100"
+                    <controls:CircleSegment Radius="100"
                                           IsPie="True"
                                           CenterPointX="130"
                                           CenterPointY="150"
@@ -105,14 +105,14 @@
                 </Grid>
                 <Grid Grid.Row="1"
                       Grid.Column="1">
-                    <controls:RingSegment Radius="100"
+                    <controls:CircleSegment Radius="100"
                                           CenterPointX="150"
                                           CenterPointY="150"
                                           StrokeThickness="30"
                                           IsStrokeRounded="True"
                                           StartAngle="135"
                                           SweepAngle="270" />
-                    <controls:RingSegment Radius="100"
+                    <controls:CircleSegment Radius="100"
                                           CenterPointX="150"
                                           CenterPointY="150"
                                           StrokeThickness="28"
@@ -129,35 +129,35 @@
                 </Grid>
                 <Grid Grid.Row="1"
                       Grid.Column="2">
-                    <controls:RingSegment Radius="70"
+                    <controls:CircleSegment Radius="70"
                                           CenterPointX="150"
                                           CenterPointY="150"
                                           Stroke="Maroon"
                                           Fill="Maroon"
                                           StrokeThickness="90"
                                           StartAngle="0"
                                           SweepAngle="120" />
-                    <controls:RingSegment Radius="100"
+                    <controls:CircleSegment Radius="100"
                                           CenterPointX="150"
                                           CenterPointY="150"
                                           StrokeThickness="30"
                                           StartAngle="120"
                                           SweepAngle="120" />
-                    <controls:RingSegment Radius="100"
+                    <controls:CircleSegment Radius="100"
                                           CenterPointX="150"
                                           CenterPointY="150"
                                           StrokeThickness="30"
                                           Stroke="RoyalBlue"
                                           StartAngle="240"
                                           SweepAngle="120" />
-                    <controls:RingSegment Radius="70"
+                    <controls:CircleSegment Radius="70"
                                           CenterPointX="150"
                                           CenterPointY="150"
                                           StrokeThickness="30"
                                           Stroke="Silver"
                                           StartAngle="120"
                                           SweepAngle="180" />
-                    <controls:RingSegment Radius="70"
+                    <controls:CircleSegment Radius="70"
                                           CenterPointX="150"
                                           CenterPointY="150"
                                           StrokeThickness="30"

diff --git a/XamlBrewer.Uwp.ArcPathSample/Views/SquaresPage.xaml.cs b/XamlBrewer.Uwp.ArcPathSample/Views/SquaresPage.xaml.cs
@@ -19,7 +19,7 @@ private void SquareOfSquaresPage_Loaded(object sender, Windows.UI.Xaml.RoutedEve
             var random = new Random((int)DateTime.Now.Ticks);
             foreach (var square in Squares.Squares)
             {
-                var segment = new RingSegment()
+                var segment = new CircleSegment()
                 {
                     Height = square.ActualHeight,
                     Width = square.ActualWidth,

diff --git a/XamlBrewer.Uwp.ArcPathSample/XamlBrewer.Uwp.ArcPathSample.csproj b/XamlBrewer.Uwp.ArcPathSample/XamlBrewer.Uwp.ArcPathSample.csproj
@@ -101,7 +101,7 @@
     <Compile Include="Controls\EllipticalArc.xaml.cs">
       <DependentUpon>EllipticalArc.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\RingSegment.cs" />
+    <Compile Include="Controls\CircleSegment.cs" />
     <Compile Include="Controls\UIElementExtensions.cs" />
     <Compile Include="Mvvm\BindableBase.cs" />
     <Compile Include="Mvvm\DelegateCommand.cs" />