No commit message

hauerCodes · Dec 15, 2014 · 3960b35 · 3960b35
1 parent 4f03ce8
commit 3960b35
Show file tree

Hide file tree

Showing 33 changed files with 410 additions and 81 deletions.
diff --git a/NumberRecognizer/NumberRecognizer.App/NumberRecognizer.App.csproj b/NumberRecognizer/NumberRecognizer.App/NumberRecognizer.App.csproj
@@ -169,25 +169,25 @@
     </AppxManifest>
     <Content Include="FodyWeavers.xml" />
     <Content Include="Lib\De.TorstenMandelkow.MetroChart.dll" />
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService1.disco" />
+    <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">

diff --git a/...erRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.disco b/...erRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.disco
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
+  <contractRef ref="http://localhost:8644/NumberRecognizerService.svc?wsdl" docRef="http://localhost:8644/NumberRecognizerService.svc" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+</discovery>
diff --git a/...izerService/NumberRecognizerService1.wsdl → ...nizerService/NumberRecognizerService.wsdl b/...izerService/NumberRecognizerService1.wsdl → ...nizerService/NumberRecognizerService.wsdl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="NumberRecognizerService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="NumberRecognizerService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
     <xsd:schema targetNamespace="http://tempuri.org/Imports">
-      <xsd:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd0" namespace="http://tempuri.org/" />
-      <xsd:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
-      <xsd:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
-      <xsd:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd3" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+      <xsd:import schemaLocation="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd0" namespace="http://tempuri.org/" />
+      <xsd:import schemaLocation="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+      <xsd:import schemaLocation="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
+      <xsd:import schemaLocation="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd3" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
     </xsd:schema>
   </wsdl:types>
   <wsdl:message name="INumberRecognizerService_GetNetworks_InputMessage">
@@ -110,7 +110,7 @@
   </wsdl:binding>
   <wsdl:service name="NumberRecognizerService">
     <wsdl:port name="BasicHttpBinding_INumberRecognizerService" binding="tns:BasicHttpBinding_INumberRecognizerService">
-      <soap:address location="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc" />
+      <soap:address location="http://localhost:8644/NumberRecognizerService.svc" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
diff --git a/...izerService/NumberRecognizerService42.xsd → ...gnizerService/NumberRecognizerService.xsd b/...izerService/NumberRecognizerService42.xsd → ...gnizerService/NumberRecognizerService.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:tns="http://tempuri.org/" elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
+  <xs:import schemaLocation="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
   <xs:element name="GetNetworks">
     <xs:complexType>
       <xs:sequence />

diff --git a/...rRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.disco b/...rRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.disco
diff --git a/...izerService/NumberRecognizerService43.xsd → ...nizerService/NumberRecognizerService1.xsd b/...izerService/NumberRecognizerService43.xsd → ...nizerService/NumberRecognizerService1.xsd
diff --git a/...nizerService/NumberRecognizerService4.xsd → ...nizerService/NumberRecognizerService2.xsd b/...nizerService/NumberRecognizerService4.xsd → ...nizerService/NumberRecognizerService2.xsd
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd3" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+  <xs:import schemaLocation="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd3" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+  <xs:import schemaLocation="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
   <xs:complexType name="ArrayOfNetworkInfo">
     <xs:sequence>
       <xs:element minOccurs="0" maxOccurs="unbounded" name="NetworkInfo" nillable="true" type="tns:NetworkInfo" />
@@ -18,6 +19,7 @@
       <xs:element minOccurs="0" name="NetworkFitness" type="xs:double" />
       <xs:element minOccurs="0" name="NetworkId" type="xs:int" />
       <xs:element minOccurs="0" name="NetworkName" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="Status" type="tns:NetworkStatusType" />
     </xs:sequence>
   </xs:complexType>
   <xs:element name="NetworkInfo" nillable="true" type="tns:NetworkInfo" />
@@ -29,6 +31,39 @@
     </xs:sequence>
   </xs:complexType>
   <xs:element name="FitnessLog" nillable="true" type="tns:FitnessLog" />
+  <xs:simpleType name="NetworkStatusType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="NotStarted">
+        <xs:annotation>
+          <xs:appinfo>
+            <EnumerationValue xmlns="http://schemas.microsoft.com/2003/10/Serialization/">1</EnumerationValue>
+          </xs:appinfo>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="Running">
+        <xs:annotation>
+          <xs:appinfo>
+            <EnumerationValue xmlns="http://schemas.microsoft.com/2003/10/Serialization/">2</EnumerationValue>
+          </xs:appinfo>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="Ready">
+        <xs:annotation>
+          <xs:appinfo>
+            <EnumerationValue xmlns="http://schemas.microsoft.com/2003/10/Serialization/">4</EnumerationValue>
+          </xs:appinfo>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="Error">
+        <xs:annotation>
+          <xs:appinfo>
+            <EnumerationValue xmlns="http://schemas.microsoft.com/2003/10/Serialization/">8</EnumerationValue>
+          </xs:appinfo>
+        </xs:annotation>
+      </xs:enumeration>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:element name="NetworkStatusType" nillable="true" type="tns:NetworkStatusType" />
   <xs:complexType name="ArrayOfTrainingImage">
     <xs:sequence>
       <xs:element minOccurs="0" maxOccurs="unbounded" name="TrainingImage" nillable="true" type="tns:TrainingImage" />

diff --git a/...izerService/NumberRecognizerService41.xsd → ...nizerService/NumberRecognizerService3.xsd b/...izerService/NumberRecognizerService41.xsd → ...nizerService/NumberRecognizerService3.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" xmlns:tns="http://schemas.microsoft.com/2003/10/Serialization/Arrays" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
-  <xs:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+  <xs:import schemaLocation="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
+  <xs:import schemaLocation="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
   <xs:complexType name="ArrayOfKeyValueOfstringdouble">
     <xs:annotation>
       <xs:appinfo>

diff --git a/...erRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.cs b/...erRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.34014
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -38,6 +38,8 @@ public partial class NetworkInfo : object, System.ComponentModel.INotifyProperty
 
         private string NetworkNameField;
 
+        private NumberRecognizer.App.NumberRecognizerService.NetworkStatusType StatusField;
+
         [System.Runtime.Serialization.DataMemberAttribute()]
         public bool Calculated {
             get {
@@ -155,6 +157,19 @@ public string NetworkName {
             }
         }
 
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public NumberRecognizer.App.NumberRecognizerService.NetworkStatusType Status {
+            get {
+                return this.StatusField;
+            }
+            set {
+                if ((this.StatusField.Equals(value) != true)) {
+                    this.StatusField = value;
+                    this.RaisePropertyChanged("Status");
+                }
+            }
+        }
+
         public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
 
         protected void RaisePropertyChanged(string propertyName) {
@@ -225,6 +240,23 @@ protected void RaisePropertyChanged(string propertyName) {
         }
     }
 
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
+    [System.Runtime.Serialization.DataContractAttribute(Name="NetworkStatusType", Namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data")]
+    public enum NetworkStatusType : int {
+
+        [System.Runtime.Serialization.EnumMemberAttribute()]
+        NotStarted = 1,
+
+        [System.Runtime.Serialization.EnumMemberAttribute()]
+        Running = 2,
+
+        [System.Runtime.Serialization.EnumMemberAttribute()]
+        Ready = 4,
+
+        [System.Runtime.Serialization.EnumMemberAttribute()]
+        Error = 8,
+    }
+
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     [System.Runtime.Serialization.DataContractAttribute(Name="TrainingImage", Namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data")]
@@ -503,7 +535,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
 
         private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration) {
             if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_INumberRecognizerService)) {
-                return new System.ServiceModel.EndpointAddress("http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc");
+                return new System.ServiceModel.EndpointAddress("http://localhost:8644/NumberRecognizerService.svc");
             }
             throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
         }

diff --git a/...cognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.svcmap b/...cognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.svcmap
@@ -21,15 +21,15 @@
     <ServiceContractMappings />
   </ClientOptions>
   <MetadataSources>
-    <MetadataSource Address="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc" Protocol="http" SourceId="1" />
+    <MetadataSource Address="http://localhost:8644/NumberRecognizerService.svc" Protocol="http" SourceId="1" />
   </MetadataSources>
   <Metadata>
-    <MetadataFile FileName="NumberRecognizerService4.xsd" MetadataType="Schema" ID="d7bef503-ade8-488a-8baa-7add37263146" SourceId="1" SourceUrl="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" />
-    <MetadataFile FileName="NumberRecognizerService41.xsd" MetadataType="Schema" ID="41c9f9f4-5992-4190-92af-c62bc0853d7e" SourceId="1" SourceUrl="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd3" />
-    <MetadataFile FileName="NumberRecognizerService42.xsd" MetadataType="Schema" ID="2f79dd74-5a84-4d97-b985-db596e58a1cd" SourceId="1" SourceUrl="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd0" />
-    <MetadataFile FileName="NumberRecognizerService43.xsd" MetadataType="Schema" ID="509e1dca-6b4a-4d0b-9b56-e418a8fce0d7" SourceId="1" SourceUrl="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd1" />
-    <MetadataFile FileName="NumberRecognizerService1.wsdl" MetadataType="Wsdl" ID="f46aa47e-21a5-475a-b4a7-9987efeb35cf" SourceId="1" SourceUrl="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?wsdl" />
-    <MetadataFile FileName="NumberRecognizerService1.disco" MetadataType="Disco" ID="18f19edd-a784-4d4c-8ffb-ea88f4264858" SourceId="1" SourceUrl="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?disco" />
+    <MetadataFile FileName="NumberRecognizerService.disco" MetadataType="Disco" ID="3926b089-4981-4cea-9017-310c5d7ffe60" SourceId="1" SourceUrl="http://localhost:8644/NumberRecognizerService.svc?disco" />
+    <MetadataFile FileName="NumberRecognizerService.xsd" MetadataType="Schema" ID="13a3d45f-b290-4bda-9e08-daa53a194367" SourceId="1" SourceUrl="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd0" />
+    <MetadataFile FileName="NumberRecognizerService1.xsd" MetadataType="Schema" ID="5c5c5f6e-79c5-4e61-b2e7-32b3e903e4f2" SourceId="1" SourceUrl="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd1" />
+    <MetadataFile FileName="NumberRecognizerService2.xsd" MetadataType="Schema" ID="161f6df1-10fa-4dba-89e5-e10ff232f0f3" SourceId="1" SourceUrl="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd2" />
+    <MetadataFile FileName="NumberRecognizerService3.xsd" MetadataType="Schema" ID="63f3162e-7349-4ed6-9797-207f057dc4a5" SourceId="1" SourceUrl="http://localhost:8644/NumberRecognizerService.svc?xsd=xsd3" />
+    <MetadataFile FileName="NumberRecognizerService.wsdl" MetadataType="Wsdl" ID="02841120-846b-473b-a306-b8542db2bf5b" SourceId="1" SourceUrl="http://localhost:8644/NumberRecognizerService.svc?wsdl" />
   </Metadata>
   <Extensions>
     <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />