From 22c72ddee0f557cb9695719687c07ca087075451 Mon Sep 17 00:00:00 2001
From: Markus Zytek <markus.zytek@gmail.com>
Date: Wed, 17 Dec 2014 15:27:28 +0000
Subject: [PATCH]

---
 .../Common/ItemClickCommand.cs                |  6 +-
 .../Common/SelectionChangedCommand.cs         |  6 +-
 .../View/GroupedImagesPage.xaml               |  7 ++-
 .../View/NetworkDetailPage.xaml               |  2 +-
 .../View/NetworkRecognizePage.xaml            |  2 +
 .../ViewModel/CreateNetworkPageViewModel.cs   |  2 +-
 .../ViewModel/GroupedImagesPageViewModel.cs   | 16 ++++-
 .../ViewModel/GroupedNetworksPageViewModel.cs |  6 +-
 .../ViewModel/NetworkDetailPageViewModel.cs   | 11 ++++
 .../ViewModel/NetworkRecognizeViewModel.cs    | 60 ++++++++++++-------
 10 files changed, 79 insertions(+), 39 deletions(-)

diff --git a/NumberRecognizer/NumberRecognizer.App/Common/ItemClickCommand.cs b/NumberRecognizer/NumberRecognizer.App/Common/ItemClickCommand.cs
index 06a93ac..dddfb3f 100644
--- a/NumberRecognizer/NumberRecognizer.App/Common/ItemClickCommand.cs
+++ b/NumberRecognizer/NumberRecognizer.App/Common/ItemClickCommand.cs
@@ -17,14 +17,14 @@ namespace NumberRecognizer.App.Common
     public static class ItemClickCommand
     {
         /// <summary>
-        /// The command property
+        /// The command property.
         /// </summary>
         public static readonly DependencyProperty CommandProperty = DependencyProperty.RegisterAttached("Command", typeof(ICommand), typeof(ItemClickCommand), new PropertyMetadata(null, OnCommandPropertyChanged));
 
         /// <summary>
         /// Sets the command.
         /// </summary>
-        /// <param name="d">The d.</param>
+        /// <param name="d">The dependent.</param>
         /// <param name="value">The value.</param>
         public static void SetCommand(DependencyObject d, ICommand value)
         {
@@ -44,7 +44,7 @@ public static ICommand GetCommand(DependencyObject d)
         /// <summary>
         /// Called when [command property changed].
         /// </summary>
-        /// <param name="d">The d.</param>
+        /// <param name="d">The dependent.</param>
         /// <param name="e">The <see cref="DependencyPropertyChangedEventArgs"/> instance containing the event data.</param>
         private static void OnCommandPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
diff --git a/NumberRecognizer/NumberRecognizer.App/Common/SelectionChangedCommand.cs b/NumberRecognizer/NumberRecognizer.App/Common/SelectionChangedCommand.cs
index b8c0c9a..3d3c1cc 100644
--- a/NumberRecognizer/NumberRecognizer.App/Common/SelectionChangedCommand.cs
+++ b/NumberRecognizer/NumberRecognizer.App/Common/SelectionChangedCommand.cs
@@ -22,14 +22,14 @@ namespace NumberRecognizer.App.Common
     public static class SelectionChangedCommand
     {
         /// <summary>
-        /// The command property
+        /// The command property.
         /// </summary>
         public static readonly DependencyProperty CommandProperty = DependencyProperty.RegisterAttached("Command", typeof(ICommand), typeof(SelectionChangedCommand), new PropertyMetadata(null, OnCommandPropertyChanged));
 
         /// <summary>
         /// Sets the command.
         /// </summary>
-        /// <param name="d">The d.</param>
+        /// <param name="d">The dependent.</param>
         /// <param name="value">The value.</param>
         public static void SetCommand(DependencyObject d, ICommand value)
         {
@@ -49,7 +49,7 @@ public static ICommand GetCommand(DependencyObject d)
         /// <summary>
         /// Called when [command property changed].
         /// </summary>
-        /// <param name="d">The d.</param>
+        /// <param name="d">The dependent.</param>
         /// <param name="e">The <see cref="DependencyPropertyChangedEventArgs"/> instance containing the event data.</param>
         private static void OnCommandPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
diff --git a/NumberRecognizer/NumberRecognizer.App/View/GroupedImagesPage.xaml b/NumberRecognizer/NumberRecognizer.App/View/GroupedImagesPage.xaml
index af7bbf6..bbfed90 100644
--- a/NumberRecognizer/NumberRecognizer.App/View/GroupedImagesPage.xaml
+++ b/NumberRecognizer/NumberRecognizer.App/View/GroupedImagesPage.xaml
@@ -24,7 +24,7 @@
             Source="{Binding ImageGroups}"
             IsSourceGrouped="true"
             ItemsPath="Images"/>
-        
+
     </Page.Resources>
 
     <!--
@@ -106,8 +106,9 @@
                 <TextBlock x:Name="pageSubtitle" Text="- Training Images" Style="{StaticResource CustomSecondaryHeaderTextBlockStyle}" />
             </StackPanel>
             <AppBarButton Grid.Column="2" Command="{Binding UploadCommand}"  HorizontalAlignment="Center"
-                          VerticalAlignment="Center" Icon="Accept" Label="Create Network">
-            </AppBarButton>
+                          VerticalAlignment="Center" Icon="Accept" Label="Create Network"/>
+            <ProgressRing Grid.Column="2" IsActive="{Binding IsLoading}"  HorizontalAlignment="Center"
+                          VerticalAlignment="Center" Width="100" Height="100" Foreground="Orange"/>
         </Grid>
     </Grid>
     <Page.BottomAppBar>
diff --git a/NumberRecognizer/NumberRecognizer.App/View/NetworkDetailPage.xaml b/NumberRecognizer/NumberRecognizer.App/View/NetworkDetailPage.xaml
index d10bf3d..00be152 100644
--- a/NumberRecognizer/NumberRecognizer.App/View/NetworkDetailPage.xaml
+++ b/NumberRecognizer/NumberRecognizer.App/View/NetworkDetailPage.xaml
@@ -33,7 +33,7 @@
             <RowDefinition Height="140"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-
+        <ProgressRing IsActive="{Binding IsLoading}" Foreground="Orange" Grid.RowSpan="2" Height="100" Width="100"/>
         <!--
             TODO: Content should be placed within the following grid 
                   to show details for the current item
diff --git a/NumberRecognizer/NumberRecognizer.App/View/NetworkRecognizePage.xaml b/NumberRecognizer/NumberRecognizer.App/View/NetworkRecognizePage.xaml
index c942a5c..3e8af2f 100644
--- a/NumberRecognizer/NumberRecognizer.App/View/NetworkRecognizePage.xaml
+++ b/NumberRecognizer/NumberRecognizer.App/View/NetworkRecognizePage.xaml
@@ -63,6 +63,8 @@
                               Padding="0" Margin="0" Height="110" Label="Reset Canvas"/>
                 <AppBarButton Command="{Binding RecognizeNumber}" Grid.Column="2" Grid.Row="1" Grid.RowSpan="2" Icon="Globe" 
                               Padding="0" Margin="0" Height="110" Label="Recognize Number"/>
+                <ProgressRing IsActive="{Binding IsLoading}" Foreground="Orange" Grid.Column="2" Grid.Row="1" Grid.RowSpan="2"  
+                              Padding="0" Margin="0" Height="110" VerticalAlignment="Top" Width="100"/>
                 <TextBlock Grid.Row="3" Grid.Column="0" Text="Recognized Number" Style="{StaticResource CustomTextBlockStyle}" VerticalAlignment="Center"/>
                 <TextBox Text="{Binding Result.Number}" IsEnabled="False" FontSize="50" Grid.Column="0" Grid.Row="4" TextAlignment="Center" CharacterSpacing="500"/>
                 <!--<StackPanel Grid.Row="5" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center">
diff --git a/NumberRecognizer/NumberRecognizer.App/ViewModel/CreateNetworkPageViewModel.cs b/NumberRecognizer/NumberRecognizer.App/ViewModel/CreateNetworkPageViewModel.cs
index c4c209c..13a577b 100644
--- a/NumberRecognizer/NumberRecognizer.App/ViewModel/CreateNetworkPageViewModel.cs
+++ b/NumberRecognizer/NumberRecognizer.App/ViewModel/CreateNetworkPageViewModel.cs
@@ -15,6 +15,7 @@ namespace NumberRecognizer.App.ViewModel
     using System.Windows.Input;
     using GalaSoft.MvvmLight;
     using GalaSoft.MvvmLight.Command;
+    using Mutzl.MvvmLight;
     using NumberRecognition.Labeling;
     using NumberRecognizer.App.Control;
     using NumberRecognizer.App.DataModel;
@@ -24,7 +25,6 @@ namespace NumberRecognizer.App.ViewModel
     using PropertyChanged;
     using Windows.System.UserProfile;
     using Windows.UI.Xaml.Media.Imaging;
-    using Mutzl.MvvmLight;
 
     /// <summary>
     /// Create Network Page ViewModel.
diff --git a/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedImagesPageViewModel.cs b/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedImagesPageViewModel.cs
index bb805ff..59c0d45 100644
--- a/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedImagesPageViewModel.cs
+++ b/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedImagesPageViewModel.cs
@@ -70,6 +70,14 @@ public bool IsImageSelected
             }
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is loading.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if this instance is loading; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsLoading { get; set; }
+
         /// <summary>
         /// Gets or sets the name of the network.
         /// </summary>
@@ -146,8 +154,8 @@ public LocalTrainingImage SelectedImage
         /// </summary>
         private void InitializeCommands()
         {
-            this.UploadCommand = new DependentRelayCommand(this.CreateNetwork, () => this.ImageGroups.Count == 10, this, () => this);
-            this.DeleteImageCommand = new DependentRelayCommand(this.DeleteImage, () => this.SelectedImage != null, this, () => this);
+            this.UploadCommand = new DependentRelayCommand(this.CreateNetwork, () => this.ImageGroups.Count == 10 && this.IsLoading == false, this, () => this.ImageGroups, () => this.IsLoading);
+            this.DeleteImageCommand = new DependentRelayCommand(this.DeleteImage, () => this.SelectedImage != null && this.IsLoading == false, this, () => this.selectedImage, () => this.IsLoading);
         }
 
         /// <summary>
@@ -174,6 +182,7 @@ private void GroupImages()
         /// </summary>
         private async void CreateNetwork()
         {
+            this.IsLoading = true;
             ObservableCollection<TrainingImage> trainingImages = new ObservableCollection<TrainingImage>();
 
             foreach (LocalTrainingImage trainingImageRT in this.Images)
@@ -193,6 +202,7 @@ private async void CreateNetwork()
                 Debug.WriteLine(ex.Message);
             }
 
+            this.IsLoading = false;
             App.RootFrame.Navigate(typeof(GroupedNetworksPage));
         }
 
@@ -201,9 +211,11 @@ private async void CreateNetwork()
         /// </summary>
         private void DeleteImage()
         {
+            this.IsLoading = true;
             this.Images.Remove(this.SelectedImage);
             this.selectedImage = null;
             this.GroupImages();
+            this.IsLoading = false;
         }
     }
 }
diff --git a/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedNetworksPageViewModel.cs b/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedNetworksPageViewModel.cs
index 68126e2..d823ef5 100644
--- a/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedNetworksPageViewModel.cs
+++ b/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedNetworksPageViewModel.cs
@@ -33,7 +33,7 @@ namespace NumberRecognizer.App.ViewModel
     public class GroupedNetworksPageViewModel : ViewModelBase
     {
         /// <summary>
-        /// The is synchronize enabled
+        /// The is synchronize enabled.
         /// </summary>
         private static bool isSyncEnabled = false;
 
@@ -216,8 +216,8 @@ private void InitializeDispatcherTimer()
         /// <summary>
         /// Dispatchers the timer_ tick.
         /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="e">The e.</param>
+        /// <param name="sender">The sender parameter.</param>
+        /// <param name="e">The event parameter.</param>
         private async void DispatcherTimer_Tick(object sender, object e)
         {
             if (isSyncEnabled && !this.IsLoading)
diff --git a/NumberRecognizer/NumberRecognizer.App/ViewModel/NetworkDetailPageViewModel.cs b/NumberRecognizer/NumberRecognizer.App/ViewModel/NetworkDetailPageViewModel.cs
index 70f248a..2b83657 100644
--- a/NumberRecognizer/NumberRecognizer.App/ViewModel/NetworkDetailPageViewModel.cs
+++ b/NumberRecognizer/NumberRecognizer.App/ViewModel/NetworkDetailPageViewModel.cs
@@ -44,6 +44,14 @@ public NetworkDetailPageViewModel(NetworkInfo network)
         /// </value>
         public NetworkInfo Network { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is loading.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if this instance is loading; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsLoading { get; set; }
+
         /// <summary>
         /// Gets or sets the chart fitness trend.
         /// </summary>
@@ -91,6 +99,7 @@ private async Task<NetworkInfo> LoadNetworkDetails()
         /// </summary>
         private async void InitializeProperties()
         {
+            this.IsLoading = true;
             this.Network = await this.LoadNetworkDetails();
 
             if (this.Network.Calculated && this.Network.FinalPoolFitnessLog != null)
@@ -115,6 +124,8 @@ private async void InitializeProperties()
                     this.MultiplePoolFitnessTrends.Add(list);
                 }
             }
+
+            this.IsLoading = false;
         }
     }
 }
diff --git a/NumberRecognizer/NumberRecognizer.App/ViewModel/NetworkRecognizeViewModel.cs b/NumberRecognizer/NumberRecognizer.App/ViewModel/NetworkRecognizeViewModel.cs
index 45cefb1..4469116 100644
--- a/NumberRecognizer/NumberRecognizer.App/ViewModel/NetworkRecognizeViewModel.cs
+++ b/NumberRecognizer/NumberRecognizer.App/ViewModel/NetworkRecognizeViewModel.cs
@@ -14,6 +14,7 @@ namespace NumberRecognizer.App.ViewModel
     using System.Linq;
     using System.Windows.Input;
     using GalaSoft.MvvmLight;
+    using Mutzl.MvvmLight;
     using NumberRecognition.Labeling;
     using NumberRecognizer.App.Control;
     using NumberRecognizer.App.Help;
@@ -62,6 +63,14 @@ public NetworkRecognizeViewModel(NetworkInfo networkInfo)
         /// </value>
         public NumberRecognitionResult Result { get; private set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is loading.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if this instance is loading; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsLoading { get; set; }
+
         /// <summary>
         /// Gets or sets the recognize number.
         /// </summary>
@@ -107,7 +116,7 @@ public NetworkRecognizeViewModel(NetworkInfo networkInfo)
         /// </summary>
         private void InitializeCommands()
         {
-            this.RecognizeNumber = new RelayCommand(this.ExecuteRecognizeNumber);
+            this.RecognizeNumber = new DependentRelayCommand(this.ExecuteRecognizeNumber, () => this.IsLoading == false, this, () => this.IsLoading);
             this.ClearResult = new RelayCommand(this.ClearPage);
             this.ResetInkCanvasCommand = new RelayCommand(this.ResetInkCanvas);
         }
@@ -132,39 +141,44 @@ private async void ExecuteRecognizeNumber()
             {
                 return;
             }
+            else
+            {
+                this.IsLoading = true;
+                this.RecognitionImages = new ObservableCollection<RecognitionImage>();
 
-            this.RecognitionImages = new ObservableCollection<RecognitionImage>();
+                await LabelingHelperRT.ConnectedComponentLabelingForInkCanvasRT(this.InkCanvas);
+                foreach (ConnectedComponent component in this.InkCanvas.Labeling.ConnectedComponents.OrderBy(p => p.MinBoundingRect.Left).ToList())
+                {
+                    try
+                    {
+                        RecognitionImage recognitionImage = new RecognitionImage
+                        {
+                            Height = (int)ImageHelperRT.ImageHeight,
+                            Width = (int)ImageHelperRT.ImageWidth
+                        };
+                        recognitionImage.TransformFrom2DArrayToImageData(component.ScaledPixels);
+
+                        this.RecognitionImages.Add(recognitionImage);
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine(ex.Message);
+                    }
+                }
 
-            await LabelingHelperRT.ConnectedComponentLabelingForInkCanvasRT(this.InkCanvas);
-            foreach (ConnectedComponent component in this.InkCanvas.Labeling.ConnectedComponents.OrderBy(p => p.MinBoundingRect.Left).ToList())
-            {
                 try
                 {
-                    RecognitionImage recognitionImage = new RecognitionImage
-                    {
-                        Height = (int)ImageHelperRT.ImageHeight,
-                        Width = (int)ImageHelperRT.ImageWidth
-                    };
-                    recognitionImage.TransformFrom2DArrayToImageData(component.ScaledPixels);
+                    NumberRecognizerServiceClient serviceProxy = new NumberRecognizerServiceClient();
+                    this.Result = await serviceProxy.RecognizePhoneNumberAsync(this.Network.NetworkId, this.RecognitionImages);
 
-                    this.RecognitionImages.Add(recognitionImage);
+                    this.CreateChartData();
                 }
                 catch (Exception ex)
                 {
                     Debug.WriteLine(ex.Message);
                 }
-            }
 
-            try
-            {
-                NumberRecognizerServiceClient serviceProxy = new NumberRecognizerServiceClient();
-                this.Result = await serviceProxy.RecognizePhoneNumberAsync(this.Network.NetworkId, this.RecognitionImages);
-
-                this.CreateChartData();
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine(ex.Message);
+                this.IsLoading = false;
             }
         }