No commit message

hauerCodes · Dec 17, 2014 · b311230 · b311230
1 parent 3642f5b
commit b311230
Show file tree

Hide file tree

Showing 10 changed files with 120 additions and 88 deletions.
diff --git a/NumberRecognizer/NumberRecognizer.App/ViewModel/Design/DesignGroupedNetworksPageViewModel.cs b/NumberRecognizer/NumberRecognizer.App/ViewModel/Design/DesignGroupedNetworksPageViewModel.cs
@@ -98,7 +98,7 @@ public NetworkInfo SelectedLocalNetwork
         /// <summary>
         /// Initializes the properties.
         /// </summary>
-        private async void Initialize()
+        private void Initialize()
         {
             this.LoadDesignDataNetworksAsync();
         }

diff --git a/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedNetworksPageViewModel.cs b/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedNetworksPageViewModel.cs
@@ -303,7 +303,7 @@ private void InitializeCommands()
         {
             this.CreateNetworkCommand = new DependentRelayCommand(() => App.RootFrame.Navigate(typeof(CreateNetworkPage)), () => this.SelectedNetwork == null, this, () => this.SelectedNetwork);
             this.DeleteNetworkCommand = new DependentRelayCommand(this.DeleteNetwork, () => this.SelectedNetwork != null, this, () => this.SelectedNetwork);
-            this.RefreshCommand = new DependentRelayCommand(() => this.LoadNetworksAsync(), () => this.IsLoading == false && this.IsSyncEnabled == false, this, () => this.IsLoading, () => this.IsSyncEnabled);
+            this.RefreshCommand = new DependentRelayCommand(async () => await this.LoadNetworksAsync(), () => this.IsLoading == false && this.IsSyncEnabled == false, this, () => this.IsLoading, () => this.IsSyncEnabled);
             this.NetworkClicked = new RelayCommand<NetworkInfo>((item) => App.RootFrame.Navigate(typeof(NetworkRecognizePage), item), (item) => item.Status == NetworkStatusType.Ready);
             this.NetworkDetails = new DependentRelayCommand(() => App.RootFrame.Navigate(typeof(NetworkDetailPage), this.SelectedNetwork), () => this.SelectedNetwork != null && this.SelectedNetwork.Calculated, this, () => this.SelectedNetwork);
             this.ToggleSyncCommand = new RelayCommand(() => this.IsSyncEnabled = !this.IsSyncEnabled);

diff --git a/NumberRecognizer/NumberRecognizer.App/ViewModel/NetworkRecognizeViewModel.cs b/NumberRecognizer/NumberRecognizer.App/ViewModel/NetworkRecognizeViewModel.cs
@@ -1,51 +1,50 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Windows.UI.Xaml.Media.Imaging;
-using GalaSoft.MvvmLight;
-using NumberRecognizer.Cloud.Contract.Data;
-using PropertyChanged;
-using NumberRecognition.Labeling;
-using NumberRecognizer.App.Common;
-using NumberRecognizer.App.Control;
-using NumberRecognizer.App.DataModel;
-using NumberRecognizer.App.Help;
-using NumberRecognizer.App.NumberRecognizerService;
-using RelayCommand = GalaSoft.MvvmLight.Command.RelayCommand;
+//-----------------------------------------------------------------------
+// <copyright file="NetworkRecognizeViewModel.cs" company="FH Wr.Neustadt">
+//     Copyright Markus Zytek. All rights reserved.
+// </copyright>
+// <author>Markus Zytek</author>
+// <summary>Network Detail Page ViewModel.</summary>
+//-----------------------------------------------------------------------
 
 namespace NumberRecognizer.App.ViewModel
 {
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
+    using System.Windows.Input;
+    using GalaSoft.MvvmLight;
+    using NumberRecognition.Labeling;
+    using NumberRecognizer.App.Common;
+    using NumberRecognizer.App.Control;
+    using NumberRecognizer.App.DataModel;
+    using NumberRecognizer.App.Help;
+    using NumberRecognizer.App.NumberRecognizerService;
+    using NumberRecognizer.Cloud.Contract.Data;
+    using PropertyChanged;
+
+    using Windows.UI.Xaml.Media.Imaging;
+    using RelayCommand = GalaSoft.MvvmLight.Command.RelayCommand;
+
     /// <summary>
-    /// 
+    /// NetworkRecognize ViewModel.
     /// </summary>
     [ImplementPropertyChanged]
     public class NetworkRecognizeViewModel : ViewModelBase
     {
-
         /// <summary>
-        /// Initializes a new instance of the <see cref="NetworkRecognizeViewModel"/> class.
+        /// Initializes a new instance of the <see cref="NetworkRecognizeViewModel" /> class.
         /// </summary>
+        /// <param name="networkInfo">The network information.</param>
         public NetworkRecognizeViewModel(NetworkInfo networkInfo)
         {
             this.Network = networkInfo;
             this.InitializeCommands();
         }
 
-        /// <summary>
-        /// Initializes the commands.
-        /// </summary>
-        private void InitializeCommands()
-        {
-            this.RecognizeNumber = new RelayCommand(this.ExecuteRecognizeNumber);
-            this.ClearResult = new RelayCommand(this.ClearPage);
-            this.ResetInkCanvasCommand = new RelayCommand(this.ResetInkCanvas);
-        }
-
         /// <summary>
         /// Gets or sets the network identifier.
         /// </summary>
@@ -110,6 +109,16 @@ private void InitializeCommands()
         /// </value>
         public ObservableCollection<RecognitionImage> RecognitionImages { get; set; }
 
+        /// <summary>
+        /// Initializes the commands.
+        /// </summary>
+        private void InitializeCommands()
+        {
+            this.RecognizeNumber = new RelayCommand(this.ExecuteRecognizeNumber);
+            this.ClearResult = new RelayCommand(this.ClearPage);
+            this.ResetInkCanvasCommand = new RelayCommand(this.ResetInkCanvas);
+        }
+
         /// <summary>
         /// Resets the ink canvas.
         /// </summary>
@@ -126,15 +135,15 @@ private void ResetInkCanvas()
         /// </summary>
         private async void ExecuteRecognizeNumber()
         {
-            if (InkCanvas == null)
+            if (this.InkCanvas == null)
             {
                 return;
             }
 
-            RecognitionImages = new ObservableCollection<RecognitionImage>();
+            this.RecognitionImages = new ObservableCollection<RecognitionImage>();
 
-            await LabelingHelperRT.ConnectedComponentLabelingForInkCanvasRT(InkCanvas);
-            foreach (ConnectedComponent component in InkCanvas.Labeling.ConnectedComponents.OrderBy(p => p.MinBoundingRect.Left).ToList())
+            await LabelingHelperRT.ConnectedComponentLabelingForInkCanvasRT(this.InkCanvas);
+            foreach (ConnectedComponent component in this.InkCanvas.Labeling.ConnectedComponents.OrderBy(p => p.MinBoundingRect.Left).ToList())
             {
                 try
                 {
@@ -156,27 +165,24 @@ private async void ExecuteRecognizeNumber()
             try
             {
                 NumberRecognizerServiceClient serviceProxy = new NumberRecognizerServiceClient();
-                Result = await serviceProxy.RecognizePhoneNumberAsync(Network.NetworkId, RecognitionImages);
+                this.Result = await serviceProxy.RecognizePhoneNumberAsync(this.Network.NetworkId, this.RecognitionImages);
 
                 this.CreateChartData();
             }
             catch (Exception ex)
             {
                 Debug.WriteLine(ex.Message);
             }
-
         }
 
         /// <summary>
         /// Creates the chart data.
         /// </summary>
         private void CreateChartData()
         {
-            bool first = false;
-
-            ChartResult = new ObservableCollection<object>();
+            this.ChartResult = new ObservableCollection<object>();
 
-            foreach (NumberRecognitionResultItem item in Result.Items)
+            foreach (NumberRecognitionResultItem item in this.Result.Items)
             {
                 var posNumberPropabilities = new ObservableCollection<ChartPopulation>();
                 var negNumberPropabilities = new ObservableCollection<ChartPopulation>();
@@ -201,15 +207,15 @@ private void CreateChartData()
                     }
                 }
 
-                ChartResult.Add(new
+                this.ChartResult.Add(new
                 {
                     Number = item.NumericCharacter.ToString(),
                     Values = posNumberPropabilities,
                     NegValues = negNumberPropabilities
                 });
             }
 
-            RaisePropertyChanged(() => ChartResult);
+            this.RaisePropertyChanged(() => this.ChartResult);
         }
 
         /// <summary>

diff --git a/NumberRecognizer/NumberRecognizer.Cloud.Service/NumberRecognizer.Cloud.Service.csproj b/NumberRecognizer/NumberRecognizer.Cloud.Service/NumberRecognizer.Cloud.Service.csproj
@@ -114,7 +114,9 @@
       <DependentUpon>NumberRecognizerService.svc</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WebRole.cs" />
+    <Compile Include="WebRole.cs">
+      <ExcludeFromStyleCop>True</ExcludeFromStyleCop>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />

diff --git a/NumberRecognizer/NumberRecognizer.Cloud.Service/NumberRecognizerService.svc.cs b/NumberRecognizer/NumberRecognizer.Cloud.Service/NumberRecognizerService.svc.cs
@@ -25,7 +25,6 @@ namespace NumberRecognizer.Cloud.Service
     using NumberRecognizer.Cloud.Data;
     using NumberRecognizer.Lib.DataManagement;
     using NumberRecognizer.Lib.Network;
-    using NumberRecognizer.Cloud.Contract.Data;
 
     /// <summary>
     /// NumberRecognizerService - Service Role.

diff --git a/NumberRecognizer/NumberRecognizer.Cloud.Service/Properties/AssemblyInfo.cs b/NumberRecognizer/NumberRecognizer.Cloud.Service/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="FH Wr.Neustadt">
+//     Copyright Markus Zytek. All rights reserved.
+// </copyright>
+// <author>Markus Zytek</author>
+// <summary>AssemblyInfo Data.</summary>
+//-----------------------------------------------------------------------
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

diff --git a/NumberRecognizer/NumberRecognizer.Cloud.Worker/NumberRecognizer.Cloud.Worker.csproj b/NumberRecognizer/NumberRecognizer.Cloud.Worker/NumberRecognizer.Cloud.Worker.csproj
@@ -88,8 +88,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WorkerRole.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <ExcludeFromStyleCop>True</ExcludeFromStyleCop>
+    </Compile>
+    <Compile Include="WorkerRole.cs">
+      <ExcludeFromStyleCop>False</ExcludeFromStyleCop>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

diff --git a/NumberRecognizer/NumberRecognizer.Cloud.Worker/Properties/AssemblyInfo.cs b/NumberRecognizer/NumberRecognizer.Cloud.Worker/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="FH Wr.Neustadt">
+//     Copyright Markus Zytek. All rights reserved.
+// </copyright>
+// <author>Markus Zytek</author>
+// <summary>AssemblyInfo Data.</summary>
+//-----------------------------------------------------------------------
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;