view model

michasacuer · Nov 4, 2019 · 73c760c · 73c760c
1 parent 391cf47
commit 73c760c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/WPF/Thinning.UI/ViewModels/MainWindowViewModel.cs b/WPF/Thinning.UI/ViewModels/MainWindowViewModel.cs
@@ -5,6 +5,7 @@
     using Caliburn.Micro;
     using Thinning.UI.Helpers;
     using Thinning.UI.Helpers.Interfaces;
+    using Thinning.UI.Views;
 
     public class MainWindowViewModel : Conductor<IScreen>.Collection.AllActive
     {
@@ -31,10 +32,24 @@ public MainWindowViewModel(IMainWindowViewModelHelper helper)
 
         public string ImageInfo { get; set; }
 
-        public int SelectedIterationsCount { get; set; }
+        public int SelectedIterationsCount { get; set; } = 10;
 
         public List<int> IterationsList { get; set; } = new List<int>(new int[] { 10, 20, 30, 40, 50, 70, 80 });
 
+        public List<int> ZoomPicker { get; set; } = new List<int>(new int[] { 2, 3, 4, 5 });
+
+        private int selectedZoomPicker = 2;
+
+        public int SelectedZoomPicker
+        {
+            get => selectedZoomPicker;
+            set
+            {
+                selectedZoomPicker = value;
+                ViewBoxTracking.ZoomFactor = value;
+            }
+        }
+
         public void LoadImage() => this.helper.LoadImage();
 
         public async void RunAlgorithms() => this.helper.RunAlgorithms();

diff --git a/WPF/Thinning.UI/Views/MainWindowView.xaml b/WPF/Thinning.UI/Views/MainWindowView.xaml
@@ -59,7 +59,7 @@
             <TextBlock 
                 Margin="10"
                 FontSize="14"
-                Text="Iterations:"
+                Text="Iterations:                                    Zoom:"
                 VerticalAlignment="Center"
                 HorizontalAlignment="Left" 
                 Style="{DynamicResource MaterialDesignTitleTextBlock}">
@@ -72,6 +72,15 @@
             Width="50" 
             FontSize="14" 
             Grid.Row="1" 
+            Margin="-120, 0, 0, -240">
+        </ComboBox>
+
+        <ComboBox 
+            x:Name="ZoomPicker"
+            SelectedValue="{Binding Path=SelectedZoomPicker, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+            Width="50" 
+            FontSize="14" 
+            Grid.Row="1" 
             Margin="270, 0, 0, -240">
         </ComboBox>
 

diff --git a/WPF/Thinning.UI/Views/ViewBoxTracking.cs b/WPF/Thinning.UI/Views/ViewBoxTracking.cs
@@ -13,7 +13,7 @@ public static class ViewBoxTracking
 
         public static UIElement GetSource(TileBrush brush) => (UIElement)brush.GetValue(SourceProperty);
 
-        private const int ZoomFactor = 3;
+        public static int ZoomFactor = 3;
 
         private static void SourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs ea)
         {