Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
hauerCodes committed Dec 16, 2014
1 parent 3dd29a2 commit 03cb0e1
Show file tree
Hide file tree
Showing 51 changed files with 2,106 additions and 922 deletions.
71 changes: 71 additions & 0 deletions NumberRecognizer/NumberRecognizer.App/Common/ItemClickCommand.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;

namespace NumberRecognizer.App.Common
{
/// <summary>
///
/// </summary>
public static class ItemClickCommand
{
/// <summary>
/// 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="value">The value.</param>
public static void SetCommand(DependencyObject d, ICommand value)
{
d.SetValue(CommandProperty, value);
}

/// <summary>
/// Gets the command.
/// </summary>
/// <param name="d">The d.</param>
/// <returns></returns>
public static ICommand GetCommand(DependencyObject d)
{
return (ICommand)d.GetValue(CommandProperty);
}

/// <summary>
/// Called when [command property changed].
/// </summary>
/// <param name="d">The d.</param>
/// <param name="e">The <see cref="DependencyPropertyChangedEventArgs"/> instance containing the event data.</param>
private static void OnCommandPropertyChanged(DependencyObject d,
DependencyPropertyChangedEventArgs e)
{
var control = d as ListViewBase;
if (control != null)
control.ItemClick += OnItemClick;
}

/// <summary>
/// Called when [item click].
/// </summary>
/// <param name="sender">The sender.</param>
/// <param name="e">The <see cref="ItemClickEventArgs"/> instance containing the event data.</param>
private static void OnItemClick(object sender, ItemClickEventArgs e)
{
var control = sender as ListViewBase;
var command = GetCommand(control);

if (command != null && command.CanExecute(e.ClickedItem))
command.Execute(e.ClickedItem);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private void InkCanvasRT_PointerMoved(object sender, PointerRoutedEventArgs e)
PointerPoint pointerPoint = e.GetCurrentPoint(this);
this.currentContactPoint = pointerPoint.Position;

if (Distance(this.previousContactPoint, this.currentContactPoint) > 1.0)
if (Distance(this.previousContactPoint, this.currentContactPoint) > 2.0)
{
Line line = new Line()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,57 +1,56 @@
//-----------------------------------------------------------------------
// <copyright file="BooleanToVisibilityConverter.cs" company="FH Wr.Neustadt">
// Copyright Markus Zytek. All rights reserved.
// </copyright>
// <author>Markus Zytek</author>
// <summary>DateTime To String Converterer.</summary>
//-----------------------------------------------------------------------
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Runtime.CompilerServices;
using Windows.Foundation;
using Windows.Foundation.Collections;
using Windows.Graphics.Display;
using Windows.UI.ViewManagement;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Data;

namespace NumberRecognizer.App.Converter
{
using System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;

/// <summary>
/// Boolean To Visibility Converter.
/// Wertkonverter, der TRUE in <see cref="Visibility.Visible"/> und FALSE in
/// <see cref="Visibility.Collapsed"/> übersetzt.
/// </summary>
public class BooleanToVisibilityConverter : IValueConverter
{
/// <summary>
/// Modifies the source data before passing it to the target for display in the UI.
/// Ändert die Quelldaten vor der Übergabe an das Ziel zur Anzeige in der Benutzeroberfläche.
/// </summary>
/// <param name="value">The source data being passed to the target.</param>
/// <param name="targetType">The type of the target property. This uses a different type depending on whether you're programming with Microsoft .NET or Visual C++ component extensions (C++/CX). See Remarks.</param>
/// <param name="parameter">An optional parameter to be used in the converter logic.</param>
/// <param name="language">The language of the conversion.</param>
/// <param name="value">Die Quelldaten, die ans Ziel übergeben werden.</param>
/// <param name="targetType">Der Typ der Zieleigenschaft. Dadurch wird ein anderer Typ verwendet, abhängig davon, ob Sie mit Microsoft .NET oder Visual&amp;nbsp;C++-Komponentenerweiterungen (C++/CX) programmieren. Siehe Hinweise.</param>
/// <param name="parameter">Ein optionaler Parameter, der in der Konverterlogik verwendet wird.</param>
/// <param name="language">Die Sprache der Konvertierung.</param>
/// <returns>
/// The value to be passed to the target dependency property.
/// Der Wert, der an die Zielabhängigkeitseigenschaft übergeben werden soll.
/// </returns>
public object Convert(object value, Type targetType, object parameter, string language)
{
bool isVisible = (bool)value;
if (isVisible)
if (parameter != null)
{
return Visibility.Visible;
return (value is bool && (bool)value) ? Visibility.Collapsed : Visibility.Visible;
}
else
{
return Visibility.Collapsed;
}
return (value is bool && (bool)value) ? Visibility.Visible : Visibility.Collapsed;
}

/// <summary>
/// Modifies the target data before passing it to the source object. This method is called only in TwoWay bindings.
/// Ändert die Zieldaten vor der Übergabe an das Quellobjekt. Diese Methode wird nur in TwoWay-Bindungen aufgerufen.
/// </summary>
/// <param name="value">The target data being passed to the source.</param>
/// <param name="targetType">The type of the target property, specified by a helper structure that wraps the type name.</param>
/// <param name="parameter">An optional parameter to be used in the converter logic.</param>
/// <param name="language">The language of the conversion.</param>
/// <param name="value">Die Zieldaten, die an die Quelle übergeben werden.</param>
/// <param name="targetType">Der Typ der Zieleigenschaft, angegeben durch eine Hilfestruktur, die den Typnamen umschließt.</param>
/// <param name="parameter">Ein optionaler Parameter, der in der Konverterlogik verwendet wird.</param>
/// <param name="language">Die Sprache der Konvertierung.</param>
/// <returns>
/// The value to be passed to the source object.
/// Der Wert, der an das Quellobjekt weitergeleitet wird.
/// </returns>
public object ConvertBack(object value, Type targetType, object parameter, string language)
{
throw new NotImplementedException();
return value is Visibility && (Visibility)value == Visibility.Visible;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
// <author>Markus Zytek</author>
// <summary>Network Info Group.</summary>
//-----------------------------------------------------------------------

using NumberRecognizer.Cloud.Contract.Data;

namespace NumberRecognizer.App.DataModel
{
using System.Collections.ObjectModel;
Expand Down Expand Up @@ -62,7 +65,7 @@ public NetworkInfoGroup(string uniqueId, string title)
/// <value>
/// The networks.
/// </value>
public ObservableCollection<NetworkInfoRT> Networks { get; set; }
public ObservableCollection<NetworkInfo> Networks { get; set; }

/// <summary>
/// Gets the click title command.
Expand All @@ -85,7 +88,7 @@ private void InitializeCommands()
/// </summary>
private void InitializeProperties()
{
this.Networks = new ObservableCollection<NetworkInfoRT>();
this.Networks = new ObservableCollection<NetworkInfo>();
}

/// <summary>
Expand Down
64 changes: 0 additions & 64 deletions NumberRecognizer/NumberRecognizer.App/DataModel/NetworkInfoRT.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@
// <author>Markus Zytek</author>
// <summary>Training Image RT.</summary>
//-----------------------------------------------------------------------


namespace NumberRecognizer.App.DataModel
{
using NumberRecognizer.App.NumberRecognizerService;
using NumberRecognizer.Cloud.Contract.Data;
using Windows.UI.Xaml.Media.Imaging;

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
// <author>Markus Zytek</author>
// <summary>Labeling Helper for RT.</summary>
//-----------------------------------------------------------------------


namespace NumberRecognizer.App.Help
{
using System;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Runtime.InteropServices.WindowsRuntime;
using System.Threading.Tasks;
using NumberRecognition.Labeling;
Expand Down Expand Up @@ -93,6 +96,7 @@ public static async Task ConnectedComponentLabelingForInkCanvasRT(InkCanvasRT in
}
catch (Exception ex)
{
Debug.WriteLine(ex.Message);
}
}
}
Expand Down
Binary file not shown.
36 changes: 20 additions & 16 deletions NumberRecognizer/NumberRecognizer.App/NumberRecognizer.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
</Compile>
<Compile Include="Common\ItemClickCommand.cs" />
<Compile Include="Common\LoadStateEventArgs.cs" />
<Compile Include="Common\SaveStateEventArgs.cs" />
<Compile Include="Common\SuspensionManagerException.cs" />
Expand All @@ -119,7 +120,6 @@
<Compile Include="Converter\BooleanToVisibilityConverter.cs" />
<Compile Include="Converter\DateTimeToStringConverter.cs" />
<Compile Include="DataModel\NetworkInfoGroup.cs" />
<Compile Include="DataModel\NetworkInfoRT.cs" />
<Compile Include="DataModel\TrainingImageGroup.cs" />
<Compile Include="DataModel\TrainingImageRT.cs" />
<Compile Include="Help\LabelingHelperRT.cs" />
Expand All @@ -129,6 +129,7 @@
<DependentUpon>Reference.svcmap</DependentUpon>
</Compile>
<Compile Include="ViewModel\CreateNetworkPageViewModel.cs" />
<Compile Include="ViewModel\Design\DesignGroupedNetworksPageViewModel.cs" />
<Compile Include="ViewModel\GroupDetailPageViewModel.cs" />
<Compile Include="ViewModel\GroupedImagesPageViewModel.cs" />
<Compile Include="ViewModel\GroupedNetworksPageViewModel.cs" />
Expand Down Expand Up @@ -166,26 +167,21 @@
<SubType>Designer</SubType>
</AppxManifest>
<Content Include="FodyWeavers.xml" />
<Content Include="Lib\De.TorstenMandelkow.MetroChart.dll" />
<None Include="Service References\NumberRecognizerService\NumberRecognizerService1.disco" />
<None Include="Properties\DataSources\NumberRecognizer.Cloud.Contract.Data.NetworkInfo.datasource" />
<None Include="Properties\DataSources\NumberRecognizer.Cloud.Contract.Data.NumberRecognitionResult.datasource" />
<None Include="Service References\NumberRecognizerService\NumberRecognizerService.disco" />
<None Include="NumberRecognizer.App_TemporaryKey.pfx" />
<None Include="Service References\NumberRecognizerService\NumberRecognizer.App.NumberRecognizerService.NetworkInfo.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Service References\NumberRecognizerService\NumberRecognizer.App.NumberRecognizerService.NumberRecognitionResult.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Service References\NumberRecognizerService\NumberRecognizerService1.wsdl" />
<None Include="Service References\NumberRecognizerService\NumberRecognizerService4.xsd">
<None Include="Service References\NumberRecognizerService\NumberRecognizerService.wsdl" />
<None Include="Service References\NumberRecognizerService\NumberRecognizerService.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Service References\NumberRecognizerService\NumberRecognizerService41.xsd">
<None Include="Service References\NumberRecognizerService\NumberRecognizerService1.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Service References\NumberRecognizerService\NumberRecognizerService42.xsd">
<None Include="Service References\NumberRecognizerService\NumberRecognizerService2.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Service References\NumberRecognizerService\NumberRecognizerService43.xsd">
<None Include="Service References\NumberRecognizerService\NumberRecognizerService3.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Service References\NumberRecognizerService\Reference.svcmap">
Expand Down Expand Up @@ -238,6 +234,10 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NumberRecognizer.Cloud.Contract\NumberRecognizer.Cloud.Contract.csproj">
<Project>{75663fb2-975a-4d29-816b-5750e61891dc}</Project>
<Name>NumberRecognizer.Cloud.Contract</Name>
</ProjectReference>
<ProjectReference Include="..\NumberRecognizer.Labeling\NumberRecognition.Labeling.csproj">
<Project>{73dab28e-ec91-469b-904e-9ec8123d155f}</Project>
<Name>NumberRecognition.Labeling</Name>
Expand All @@ -246,7 +246,7 @@
<ItemGroup>
<Reference Include="De.TorstenMandelkow.MetroChart, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Lib\De.TorstenMandelkow.MetroChart.dll</HintPath>
<HintPath>..\packages\ModernChart.1.0.0\lib\netcore45\De.TorstenMandelkow.MetroChart.dll</HintPath>
</Reference>
<Reference Include="GalaSoft.MvvmLight">
<HintPath>..\packages\Portable.MvvmLightLibs.5.0.2.0\lib\netcore451\GalaSoft.MvvmLight.dll</HintPath>
Expand All @@ -271,7 +271,11 @@
<ItemGroup>
<WCFMetadataStorage Include="Service References\NumberRecognizerService\" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<SDKReference Include="BehaviorsXamlSDKManaged, Version=12.0">
<Name>Behaviors SDK %28XAML%29</Name>
</SDKReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
<VisualStudioVersion>12.0</VisualStudioVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="NetworkInfo" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>NumberRecognizer.App.NumberRecognizerService.NetworkInfo, Service References.NumberRecognizerService.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
<TypeInfo>NumberRecognizer.Cloud.Contract.Data.NetworkInfo, NumberRecognizer.Cloud.Contract, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
Loading

0 comments on commit 03cb0e1

Please sign in to comment.