Ver 1.1.1

Ver 1.1.1

Author: C0ntrolDev

IntervalGraph.sln

@@ -3,16 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.6.33815.320
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntervalGraph", "IntervalGraph\IntervalGraph.csproj", "{567F3256-F5DC-4266-A4A1-BF943040F581}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntervalGraph", "IntervalGraph\IntervalGraph.csproj", "{567F3256-F5DC-4266-A4A1-BF943040F581}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{567F3256-F5DC-4266-A4A1-BF943040F581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{567F3256-F5DC-4266-A4A1-BF943040F581}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{567F3256-F5DC-4266-A4A1-BF943040F581}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{567F3256-F5DC-4266-A4A1-BF943040F581}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{567F3256-F5DC-4266-A4A1-BF943040F581}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{567F3256-F5DC-4266-A4A1-BF943040F581}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

IntervalGraph/Components/IntAxis.cs

@@ -118,6 +118,22 @@ public Brush TextColorBrush
 
         #endregion
 
+        #region FontFamilyProperty
+
+        public static readonly DependencyProperty FontFamilyProperty = DependencyProperty.Register(
+            nameof(FontFamily),
+            typeof(FontFamily),
+            typeof(IntAxis),
+            new PropertyMetadata(default(FontFamily)));
+
+        public FontFamily FontFamily
+        {
+            get => (FontFamily)GetValue(FontFamilyProperty);
+            set => SetValue(FontFamilyProperty, value);
+        }
+
+        #endregion
+
         #region TextFormatProperty
 
         public static readonly DependencyProperty TextFormatProperty = DependencyProperty.Register(
@@ -140,7 +156,7 @@ public string TextFormat
             nameof(FontSize),
             typeof(double?),
             typeof(IntAxis),
-            new PropertyMetadata(null));
+            new PropertyMetadata(null, UpdateTextFontSize));
 
         public double? FontSize
         {
@@ -225,15 +241,14 @@ public double MaxZoom
 
         #endregion
 
-
-
         #endregion
 
 
         #region DrawedFontSize
 
         private double _drawedFontSize;
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public double DrawedFontSize
         {
             get => _drawedFontSize;
@@ -244,6 +259,7 @@ public double DrawedFontSize
 
         #region TextContainerHeight
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public GridLength TextContainerHeight
         {
             get

IntervalGraph/Components/IntervalGraph.xaml

@@ -10,20 +10,27 @@
              xmlns:c="clr-namespace:IntervalGraph.Infrastructure.Conveters.Converters"
              xmlns:graph="clr-namespace:IntervalGraph.Models.Graph"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800"
-             Background="White">
+             d:DesignHeight="450" d:DesignWidth="800">
+
+    <UserControl.Resources>
+        <Style x:Key="DefaultScrollViewerStyle" TargetType="ScrollViewer"/>
+    </UserControl.Resources>
 
     <Grid DataContext="{Binding RelativeSource={RelativeSource AncestorType=local:IntervalGraph, Mode=FindAncestor}}">
 
         <ScrollViewer HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                       VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Visible"
                       DataContext="{Binding RelativeSource={RelativeSource AncestorType=local:IntervalGraph, Mode=FindAncestor}}"
-                      BorderThickness="0">
+                      BorderThickness="0"
+                      Style="{Binding ScrollViewerStyle, TargetNullValue={StaticResource DefaultScrollViewerStyle}}"
+                      PreviewMouseWheel="OnMouseWheel">
 
             <i:Interaction.Behaviors>
                 <b:BindableActualSizeBehavior ActualWidth="{Binding GraphWidth, Mode=OneWayToSource}"/>
             </i:Interaction.Behaviors>
 
+            
+
             <Grid Width="{Binding ZoomedGraphWidth}" Background="Transparent">
 
                 <Grid.RowDefinitions>
@@ -111,7 +118,7 @@
                             <DataTemplate>
                                 <Path Stroke="{Binding StrokeBrush}" StrokeThickness="{Binding StrokeThickness}" StrokeDashArray="{Binding StrokeDashArray}" Fill="{Binding FillBrush}">
                                     <Path.Data>
-                                        <MultiBinding Converter="{cm:GraphIntervalToGeometry}">
+                                        <MultiBinding Converter="{cm:GraphIntervalToGeometryConverter}">
                                             <Binding/>
                                             <Binding RelativeSource="{RelativeSource AncestorType=local:IntervalGraph, Mode=FindAncestor}" 
                                                      Path="ColumnWidth"/>
@@ -169,10 +176,12 @@
                                       VerticalAlignment="Center">
 
                                     <Path.Data>
-                                        <MultiBinding Converter="{cm:GraphIntervalToAxisCircle}">
+                                        <MultiBinding Converter="{cm:GraphIntervalToAxisCircleConverter}">
                                             <Binding/>
                                             <Binding RelativeSource="{RelativeSource AncestorType=local:IntervalGraph, Mode=FindAncestor}" 
                                                      Path="ColumnWidth"/>
+                                            <Binding RelativeSource="{RelativeSource AncestorType=local:IntervalGraph, Mode=FindAncestor}" 
+                                                     Path="DrawedMinValue"/>
                                             <Binding RelativeSource="{RelativeSource AncestorType=local:IntervalGraph, Mode=FindAncestor}" 
                                                      Path="IntAxis.CirclesRadius"/>
                                         </MultiBinding>
@@ -205,6 +214,7 @@
                                     <Canvas>
 
                                         <TextBlock FontSize="{Binding RelativeSource={RelativeSource AncestorType=local:IntervalGraph, Mode=FindAncestor}, Path=IntAxis.DrawedFontSize}"
+                                                   FontFamily="{Binding RelativeSource={RelativeSource AncestorType=local:IntervalGraph, Mode=FindAncestor}, Path=IntAxis.FontFamily}"
                                                    Foreground="{Binding RelativeSource={RelativeSource AncestorType=local:IntervalGraph, Mode=FindAncestor}, Path=IntAxis.TextColorBrush}">
 
                                             <TextBlock.Text>