No commit message

hauerCodes · Dec 17, 2014 · 74fc561 · 74fc561
1 parent a207077
commit 74fc561
Show file tree

Hide file tree

Showing 17 changed files with 144 additions and 92 deletions.
diff --git a/NumberRecognizer/NumberRecognizer.App/Help/ImageHelperRT.cs b/NumberRecognizer/NumberRecognizer.App/Help/ImageHelperRT.cs
@@ -25,12 +25,12 @@ public static class ImageHelperRT
         /// <summary>
         /// The image height.
         /// </summary>
-        public const double ImageHeight = 20;
+        public const double ImageHeight = 16;
 
         /// <summary>
         /// The image width.
         /// </summary>
-        public const double ImageWidth = 20;
+        public const double ImageWidth = 16;
 
         /// <summary>
         /// The RGBA constant.

diff --git a/NumberRecognizer/NumberRecognizer.App/View/CreateNetworkPage.xaml b/NumberRecognizer/NumberRecognizer.App/View/CreateNetworkPage.xaml
@@ -77,17 +77,19 @@
             <TextBox Grid.Row="0" Grid.Column="1" Name="NetworkNameTextBox" Text="{Binding NetworkName, Mode=TwoWay}" FontSize="30" Margin="0,0,240,0"/>
             <AppBarButton Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Command="{Binding LabelingCommand}" Label="Show Bounding Rectangles" Icon="Crop" HorizontalAlignment="Right" Margin="0,-10,110,0"/>
             <AppBarButton Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Command="{Binding NextCommand}" Label="View Training Data" Icon="Forward" HorizontalAlignment="Right" Margin="0,-10,0,0" />
-            <TextBlock Grid.Row="1" Grid.Column="1" Visibility="{Binding IsShowHint, Converter={StaticResource boolToVisibilityConverter}}" Text="Please write at least one number on each canvas." Style="{StaticResource SubheaderTextBlockStyle}" VerticalAlignment="Center" Foreground="OrangeRed"/>
+            <TextBlock Grid.Row="1" Grid.Column="1" Visibility="{Binding IsShowHint, Converter={StaticResource boolToVisibilityConverter}}" 
+                       Text="Please write at least one number on each canvas." 
+                       Style="{StaticResource SubheaderTextBlockStyle}" VerticalAlignment="Center" Foreground="OrangeRed"/>
             <ScrollViewer Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="100"/>
                         <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="100"/>
                     </Grid.ColumnDefinitions>
                     <StackPanel x:Name="textBlockStackPanel" Orientation="Vertical" Grid.Column="0"/>
                     <StackPanel x:Name="inkCanvasRTStackPanel" Orientation="Vertical" Grid.Column="1"/>
-                    <StackPanel x:Name="resetButtonStackPanel" Orientation="Horizontal" Grid.Column="2"/>
+                    <StackPanel x:Name="resetButtonStackPanel" Orientation="Vertical" Grid.Column="2"/>
                 </Grid>
             </ScrollViewer>
         </Grid>

diff --git a/NumberRecognizer/NumberRecognizer.App/View/CreateNetworkPage.xaml.cs b/NumberRecognizer/NumberRecognizer.App/View/CreateNetworkPage.xaml.cs
@@ -38,6 +38,11 @@ public sealed partial class CreateNetworkPage : Page
         /// </summary>
         private ObservableCollection<TextBlock> textBlockCollection = new ObservableCollection<TextBlock>();
 
+        /// <summary>
+        /// The text block collection.
+        /// </summary>
+        private ObservableCollection<Button> resetButtonCollection = new ObservableCollection<Button>();
+
         /// <summary>
         /// The view model.
         /// </summary>
@@ -117,11 +122,22 @@ private void InitializePage()
                     Text = string.Format("{0} *", inkCanvasRT.Name),
                     FontSize = 28,
                     Foreground = new SolidColorBrush(Colors.OrangeRed),
-                    VerticalAlignment = VerticalAlignment.Bottom,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    Margin = inkCanvasRT.Margin
+                };
+                Button clearButton = new Button()
+                {
+                    Content = "\ue107",
+                    Command = viewModel.ClearCanvas,
+                    CommandParameter = inkCanvasRT,
+                    FontFamily= new FontFamily("Segoe UI Symbol"),
+                    BorderBrush = null,
                     Margin = inkCanvasRT.Margin
                 };
                 this.textBlockCollection.Add(textBlock);
                 this.textBlockStackPanel.Children.Add(textBlock);
+                this.resetButtonStackPanel.Children.Add(clearButton);
+                this.resetButtonCollection.Add(clearButton);
             }
         }
 
@@ -144,7 +160,13 @@ private void InkCanvasRTStackPanel_SizeChanged(object sender, SizeChangedEventAr
             foreach (TextBlock textBlock in this.textBlockCollection)
             {
                 textBlock.Height = stackPanel.ActualHeight / count;
-                textBlock.Width = stackPanel.ActualWidth;
+                textBlock.Width = textBlockStackPanel.ActualWidth;
+            }
+
+            foreach (Button button in this.resetButtonCollection)
+            {
+                button.Height = stackPanel.ActualHeight / count;
+                button.Width = resetButtonStackPanel.ActualWidth - 10;
             }
 
             this.inkCanvasRTStackPanel.SizeChanged -= this.InkCanvasRTStackPanel_SizeChanged;

diff --git a/NumberRecognizer/NumberRecognizer.App/View/GroupedNetworksPage.xaml b/NumberRecognizer/NumberRecognizer.App/View/GroupedNetworksPage.xaml
@@ -142,7 +142,7 @@
 				</ItemsPanelTemplate>
 			</GridView.ItemsPanel>
             <GridView.GroupStyle>
-                <GroupStyle>
+                <GroupStyle HidesIfEmpty="True">
                     <GroupStyle.HeaderTemplate>
                         <DataTemplate>
                             <Grid Margin="0,0,0,2">
@@ -165,7 +165,7 @@
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="120"/>
 				<ColumnDefinition Width="Auto"/>
-				<ColumnDefinition Width="*"/>
+				<ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
 			</Grid.ColumnDefinitions>
 			<Button x:Name="backButton" Margin="39,59,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=pageRoot}"
@@ -179,7 +179,7 @@
 				<TextBlock x:Name="pageTitle" Text="{StaticResource AppName}" Style="{StaticResource CustomHeaderTextBlockStyle}" />
 			</StackPanel>
             <ProgressRing Grid.Column="2" x:Name="processRingObj" Height="100" Width="100" Foreground="Orange" 
-                           Visibility="{Binding IsLoading, Converter={StaticResource booleanVisibiltyConverter}, ConverterParameter=False}"  
+                          Visibility="{Binding IsLoading, Converter={StaticResource booleanVisibiltyConverter}, ConverterParameter=False}"  
                           IsActive="{Binding IsLoading}" />
 		</Grid>
 	</Grid>

diff --git a/NumberRecognizer/NumberRecognizer.App/View/NetworkDetailPage.xaml b/NumberRecognizer/NumberRecognizer.App/View/NetworkDetailPage.xaml
@@ -44,10 +44,13 @@
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
                 <RowDefinition/>
+                <RowDefinition Height="Auto"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <charting:Chart x:Name="chartFitness" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" >
+            <TextBlock Style="{StaticResource SubheaderTextBlockStyle}" Grid.Row="0" Margin="20,0">Final GenPool Fitness Trend</TextBlock>
+            <charting:Chart x:Name="chartFitness" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" >
                 <charting:Chart.Series>
                     <charting:LineSeries Title="Fitness" 
                                              ItemsSource="{Binding FinalPoolFitnessTrend}"
@@ -72,7 +75,8 @@
                     </charting:Chart.Palette>-->
             </charting:Chart>
 
-            <charting:Chart x:Name="chartPool" Grid.Row="1" Grid.Column="0" >
+            <TextBlock Style="{StaticResource SubheaderTextBlockStyle}" Grid.Row="2" Margin="20,0" >Multiple GenPool Fitness Trend</TextBlock>
+            <charting:Chart x:Name="chartPool" Grid.Row="3" Grid.Column="0" >
                 <charting:Chart.Series>
                     <charting:LineSeries Title="GenPool 1" 
                                              ItemsSource="{Binding MultiplePoolFitnessTrends[0]}"
@@ -121,7 +125,7 @@
                 </charting:Chart.Palette>-->
             </charting:Chart>
 
-            <Grid Grid.Column="1" Grid.Row="1" Margin="2">
+            <Grid Grid.Column="1" Grid.Row="4" Margin="2">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="*"/>
@@ -132,19 +136,19 @@
                     <RowDefinition Height="Auto"/>
                     <RowDefinition/>
                 </Grid.RowDefinitions>
-                <TextBlock Style="{StaticResource SubheaderTextBlockStyle}"
+                <TextBlock Style="{StaticResource SubheaderTextBlockStyle}" VerticalAlignment="Center"
                            Grid.Row="0">Calculatuion Start</TextBlock>
-                <TextBlock  Style="{StaticResource SubheaderTextBlockStyle}"
-                            Grid.Row="1" >Calculatuion End</TextBlock>
-                <TextBlock  Style="{StaticResource SubheaderTextBlockStyle}"
-                            Grid.Row="2" >Final Fitness</TextBlock>
+                <TextBlock  Style="{StaticResource SubheaderTextBlockStyle}" VerticalAlignment="Center"
+                            Grid.Row="1" Grid.Column="0">Calculatuion End</TextBlock>
+                <TextBlock  Style="{StaticResource SubheaderTextBlockStyle}" VerticalAlignment="Center"
+                            Grid.Row="2" Grid.Column="0">Final Fitness</TextBlock>
 
-                <TextBlock Style="{StaticResource CustomTextBlockStyle}" Margin="5,10"
+                <TextBlock Style="{StaticResource CustomTextBlockStyle}" Margin="15,10"
                            Grid.Row="0" Grid.Column="1" Text="{Binding Network.CalculationStart, Converter={StaticResource dateTimeConverter}}" />
-                <TextBlock  Style="{StaticResource CustomTextBlockStyle}" Margin="5,10"
+                <TextBlock  Style="{StaticResource CustomTextBlockStyle}" Margin="15,10"
                             Grid.Row="1" Grid.Column="1"  Text="{Binding Network.CalculationEnd, Converter={StaticResource dateTimeConverter}}" />
-                <TextBlock  Style="{StaticResource CustomTextBlockStyle}" Margin="5,10"
-                            Grid.Row="2" Grid.Column="1"  Text="{Binding Network.Fitness}" />
+                <TextBlock  Style="{StaticResource CustomTextBlockStyle}" Margin="15,10"
+                            Grid.Row="2" Grid.Column="1"  Text="{Binding Network.NetworkFitness}" />
             </Grid>
         </Grid>
         <!-- Back button and page title -->

diff --git a/NumberRecognizer/NumberRecognizer.App/View/NetworkRecognizePage.xaml b/NumberRecognizer/NumberRecognizer.App/View/NetworkRecognizePage.xaml
@@ -11,6 +11,7 @@
     xmlns:control="using:NumberRecognizer.App.Control"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:charting="using:WinRTXamlToolkit.Controls.DataVisualization.Charting"
     mc:Ignorable="d">
 
     <!--<Page.DataContext>
@@ -41,9 +42,9 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            
+
             <!-- Input -->
-            <Grid Grid.Column="0" Margin="20,2,2,2">
+            <Grid Grid.Column="0" Margin="20,2,2,2" VerticalAlignment="Center">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="100"/>
@@ -54,52 +55,55 @@
                     <RowDefinition Height="50"/>
                     <RowDefinition Height="50"/>
                     <RowDefinition Height="100"/>
-                    <RowDefinition Height="110"/>
-                    <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
                 <TextBlock Grid.Row="0" Grid.Column="0" Text="Please write your phone number on the canvas." Style="{StaticResource CustomTextBlockStyle}" VerticalAlignment="Center"/>
                 <control:InkCanvasRT x:Name="inkCanvas" Grid.Column="0" Grid.Row="1" />
                 <AppBarButton Command="{Binding RecognizeNumber}" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Icon="Globe" 
                               Padding="0" Margin="0" Height="110" Label="Recognize Number"/>
                 <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" Orientation="Horizontal" HorizontalAlignment="Center">
+                <!--<StackPanel Grid.Row="5" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center">
                     <AppBarButton Icon="Clear" Command="{Binding ClearPage}"  Label="Clear Result" Height="110"/>
-                    <!--<AppBarButton Icon="Cancel" Foreground="Red"/>-->
-                </StackPanel>
+                    -->
+                <!--<AppBarButton Icon="Cancel" Foreground="Red"/>-->
+                <!--
+                </StackPanel>-->
             </Grid>
 
             <!-- Result View -->
             <Grid Grid.Column="1">
                 <ListView ItemsSource="{Binding ChartResult}">
                     <ListView.ItemTemplate>
                         <DataTemplate>
-                            <Viewbox Height="300">
-                                <chart:RadialGaugeChart
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock FontSize="60" Text="{Binding Number}" VerticalAlignment="Center" />
+                                <Viewbox Height="300">
+                                    <chart:ClusteredColumnChart
 									    Background="Transparent"
 									    Style="{StaticResource ChartStyleVariableSize}"
 									    ChartTitle=""
                                         Palette="{StaticResource CustomColors}"
 									    ChartTitleVisibility="Collapsed"
 									    ChartLegendVisibility="Collapsed"
 									    ChartSubTitle="">
-                                    <chart:RadialGaugeChart.Series>
-                                        <chart:ChartSeries 
+                                        <chart:ClusteredColumnChart.Series>
+                                            <chart:ChartSeries 
 											    SeriesTitle="Fitness"
-											    ItemsSource="{Binding}" 
+											    ItemsSource="{Binding Values}" 
 											    DisplayMember="Name" 
 											    ValueMember="Value" />
-                                    </chart:RadialGaugeChart.Series>
-                                </chart:RadialGaugeChart>
-                            </Viewbox>
+                                        </chart:ClusteredColumnChart.Series>
+                                    </chart:ClusteredColumnChart>
+                                </Viewbox>
+                            </StackPanel>
                         </DataTemplate>
                     </ListView.ItemTemplate>
                 </ListView>
             </Grid>
         </Grid>
 
         <!-- Back button and page title -->
-        <Grid>
+        <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="120"/>
                 <ColumnDefinition Width="*"/>

diff --git a/NumberRecognizer/NumberRecognizer.App/ViewModel/CreateNetworkPageViewModel.cs b/NumberRecognizer/NumberRecognizer.App/ViewModel/CreateNetworkPageViewModel.cs
@@ -85,6 +85,14 @@ public CreateNetworkPageViewModel()
         /// </value>
         public ICommand LabelingCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the clear canvas.
+        /// </summary>
+        /// <value>
+        /// The clear canvas.
+        /// </value>
+        public ICommand ClearCanvas { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether [is error].
         /// </summary>
@@ -100,6 +108,7 @@ private void InitializeCommands()
         {
             this.LabelingCommand = new RelayCommand(this.LabelingAsync);
             this.NextCommand = new RelayCommand(this.NextPage, this.CanExecuteNextCommand);
+            this.ClearCanvas = new RelayCommand<InkCanvasRT>((canvas) => canvas.ClearInk());
         }
 
         /// <summary>
@@ -150,8 +159,8 @@ private async void LabelingAsync()
                     this.trainingImagesRT.Add(localTrainingImage);
                 }
             }
-
             NextCommand.RaiseCanExecuteChanged();
+            RaisePropertyChanged(() => IsShowHint);
         }
 
         /// <summary>

diff --git a/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedNetworksPageViewModel.cs b/NumberRecognizer/NumberRecognizer.App/ViewModel/GroupedNetworksPageViewModel.cs
@@ -6,9 +6,6 @@
 // <summary>Network Data Source.</summary>
 //-----------------------------------------------------------------------
 
-
-using Windows.UI.Core;
-
 namespace NumberRecognizer.App.ViewModel
 {
     using System;
@@ -29,6 +26,7 @@ namespace NumberRecognizer.App.ViewModel
     using System.Collections.Generic;
     using GalaSoft.MvvmLight.Command;
     using Windows.UI.Xaml;
+    using Windows.UI.Core;
 
     /// <summary>
     /// Grouped Networks Page ViewModel.
@@ -74,7 +72,7 @@ public bool IsNetworkSelected
         /// <value>
         ///   <c>true</c> if [is loading]; otherwise, <c>false</c>.
         /// </value>
-        public bool IsLoading { get; private set; }
+        public bool IsLoading { get; set; }
 
         /// <summary>
         /// Gets or sets the networks.
@@ -179,7 +177,7 @@ private async Task LoadNetworksAsync()
 
             this.NetworkGroups = new ObservableCollection<NetworkInfoGroup>();
             NetworkInfoGroup calculated = new NetworkInfoGroup("calculated", "Calculated Networks");
-            foreach (NetworkInfo network in this.Networks.Where(p => p.Calculated))
+            foreach (NetworkInfo network in this.Networks.Where(p => p.Status == NetworkStatusType.Ready))
             {
                 network.ChartFitness = new List<ChartPopulation>();
                 foreach (string key in network.FinalPatternFittness.Keys)
@@ -193,16 +191,24 @@ private async Task LoadNetworksAsync()
                 calculated.Networks.Add(network);
             }
 
+            NetworkInfoGroup runnning = new NetworkInfoGroup("running", "Calculation Running");
+            foreach (NetworkInfo network in this.Networks.Where(p => p.Status == NetworkStatusType.Running))
+            {
+                runnning.Networks.Add(network);
+            }
+
+
             NetworkInfoGroup uncalculated = new NetworkInfoGroup("uncalculated", "Uncalculated Networks");
-            foreach (NetworkInfo network in this.Networks.Where(p => !p.Calculated))
+            foreach (NetworkInfo network in this.Networks.Where(p => p.Status != NetworkStatusType.Ready && p.Status != NetworkStatusType.Running))
             {
                 uncalculated.Networks.Add(network);
             }
 
             this.NetworkGroups.Add(calculated);
+            this.NetworkGroups.Add(runnning);
             this.NetworkGroups.Add(uncalculated);
 
-            this.IsLoading = true;
+            this.IsLoading = false;
         }
 
         /// <summary>
@@ -218,13 +224,9 @@ private void InitializeCommands()
                                                                   () => this.SelectedNetwork);
             this.RefreshCommand = new RelayCommand(() => LoadNetworksAsync());
             this.NetworkClicked = new RelayCommand<NetworkInfo>((item) => App.RootFrame.Navigate(typeof(NetworkRecognizePage), item));
-            this.NetworkDetails = new DependentRelayCommand(() =>
-            {
-                App.RootFrame.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,
-                            () => App.RootFrame.Navigate(typeof(NetworkDetailPage), SelectedNetwork));
-            },
-            () => this.SelectedNetwork != null && this.SelectedNetwork.Calculated, this,
-            () => this.SelectedNetwork);
+            this.NetworkDetails = new DependentRelayCommand(() =>App.RootFrame.Navigate(typeof(NetworkDetailPage), SelectedNetwork),
+                                                            () => this.SelectedNetwork != null && this.SelectedNetwork.Calculated, this,
+                                                            () => this.SelectedNetwork);
 
             this.SelectionChanged = new RelayCommand<SelectionChangedEventArgs>((args) =>
             {