From 31a34f42cc5434ded1d0abb2e886314b94292a3a Mon Sep 17 00:00:00 2001 From: Christoph Hauer Date: Sun, 14 Dec 2014 02:07:44 +0000 Subject: [PATCH] --- .../NumberRecognizer.App.csproj | 12 +++---- .../NumberRecognizerService.disco | 4 +++ ...ice1.wsdl => NumberRecognizerService.wsdl} | 10 +++--- ...vice43.xsd => NumberRecognizerService.xsd} | 4 +-- .../NumberRecognizerService1.disco | 4 --- ...ice42.xsd => NumberRecognizerService1.xsd} | 2 +- ...vice4.xsd => NumberRecognizerService2.xsd} | 16 +++++----- ...ice41.xsd => NumberRecognizerService3.xsd} | 0 .../NumberRecognizerService/Reference.cs | 4 +-- .../NumberRecognizerService/Reference.svcmap | 14 ++++----- .../Data/NetworkInfo.cs | 9 ------ .../INumberRecognizerService.cs | 6 ++-- .../NumberRecognizerService.svc.cs | 4 +-- NumberRecognizer/NumberRecognizer.sln | 31 +++++-------------- 14 files changed, 46 insertions(+), 74 deletions(-) create mode 100644 NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.disco rename NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/{NumberRecognizerService1.wsdl => NumberRecognizerService.wsdl} (86%) rename NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/{NumberRecognizerService43.xsd => NumberRecognizerService.xsd} (88%) delete mode 100644 NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.disco rename NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/{NumberRecognizerService42.xsd => NumberRecognizerService1.xsd} (95%) rename NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/{NumberRecognizerService4.xsd => NumberRecognizerService2.xsd} (78%) rename NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/{NumberRecognizerService41.xsd => NumberRecognizerService3.xsd} (100%) diff --git a/NumberRecognizer/NumberRecognizer.App/NumberRecognizer.App.csproj b/NumberRecognizer/NumberRecognizer.App/NumberRecognizer.App.csproj index 4f03df2..44b3615 100644 --- a/NumberRecognizer/NumberRecognizer.App/NumberRecognizer.App.csproj +++ b/NumberRecognizer/NumberRecognizer.App/NumberRecognizer.App.csproj @@ -168,18 +168,18 @@ - - - + + + Designer - + Designer - + Designer - + Designer diff --git a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.disco b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.disco new file mode 100644 index 0000000..22bb89b --- /dev/null +++ b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.disco @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.wsdl b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.wsdl similarity index 86% rename from NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.wsdl rename to NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.wsdl index 5da949c..25fdff9 100644 --- a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.wsdl +++ b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.wsdl @@ -2,10 +2,10 @@ - - - - + + + + @@ -91,7 +91,7 @@ - + \ No newline at end of file diff --git a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService43.xsd b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.xsd similarity index 88% rename from NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService43.xsd rename to NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.xsd index ff56b8e..afba4c7 100644 --- a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService43.xsd +++ b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.xsd @@ -1,7 +1,7 @@ - - + + diff --git a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.disco b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.disco deleted file mode 100644 index 5ea0541..0000000 --- a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.disco +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService42.xsd b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.xsd similarity index 95% rename from NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService42.xsd rename to NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.xsd index 0137e5f..0b8d907 100644 --- a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService42.xsd +++ b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.xsd @@ -1,6 +1,6 @@ - + diff --git a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService4.xsd b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService2.xsd similarity index 78% rename from NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService4.xsd rename to NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService2.xsd index 3dd76bb..ed57264 100644 --- a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService4.xsd +++ b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService2.xsd @@ -1,6 +1,6 @@ - + - + @@ -13,7 +13,7 @@ - + @@ -22,14 +22,14 @@ - + - + - + @@ -39,10 +39,10 @@ - + - + diff --git a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService41.xsd b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService3.xsd similarity index 100% rename from NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService41.xsd rename to NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService3.xsd diff --git a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.cs b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.cs index d049792..b624062 100644 --- a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.cs +++ b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.cs @@ -21,7 +21,7 @@ public interface INumberRecognizerService { [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/INumberRecognizerService/GetNetworks", ReplyAction="http://tempuri.org/INumberRecognizerService/GetNetworksResponse")] System.Threading.Tasks.Task> GetNetworksAsync(); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/INumberRecognizerService/ValidateTrainingData", ReplyAction="http://tempuri.org/INumberRecognizerService/CreateNetworkResponse")] + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/INumberRecognizerService/CreateNetwork", ReplyAction="http://tempuri.org/INumberRecognizerService/CreateNetworkResponse")] System.Threading.Tasks.Task CreateNetworkAsync(string networkName, string username, System.Collections.ObjectModel.ObservableCollection individualTrainingsData); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/INumberRecognizerService/CreateNetworkWithTrainingDataCopy", ReplyAction="http://tempuri.org/INumberRecognizerService/CreateNetworkWithTrainingDataCopyResp" + @@ -113,7 +113,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://numberrecognizer.cloudapp.net/NumberRecognizerService.svc"); + return new System.ServiceModel.EndpointAddress("http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc"); } throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration)); } diff --git a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.svcmap b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.svcmap index 60e21ca..3a9d997 100644 --- a/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.svcmap +++ b/NumberRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.svcmap @@ -21,15 +21,15 @@ - + - - - - - - + + + + + + diff --git a/NumberRecognizer/NumberRecognizer.Cloud.Contract/Data/NetworkInfo.cs b/NumberRecognizer/NumberRecognizer.Cloud.Contract/Data/NetworkInfo.cs index 70186a4..655701b 100644 --- a/NumberRecognizer/NumberRecognizer.Cloud.Contract/Data/NetworkInfo.cs +++ b/NumberRecognizer/NumberRecognizer.Cloud.Contract/Data/NetworkInfo.cs @@ -31,15 +31,6 @@ public class NetworkInfo [DataMember] public string NetworkName{ get; set; } - /// - /// Gets or sets the username. - /// - /// - /// The username. - /// - [DataMember] - public string Username{ get; set; } - /// /// Gets or sets a value indicating whether the network is /// calculated/trained and can recognize numbers. diff --git a/NumberRecognizer/NumberRecognizer.Cloud.Contract/INumberRecognizerService.cs b/NumberRecognizer/NumberRecognizer.Cloud.Contract/INumberRecognizerService.cs index 68b2e7f..ad6714e 100644 --- a/NumberRecognizer/NumberRecognizer.Cloud.Contract/INumberRecognizerService.cs +++ b/NumberRecognizer/NumberRecognizer.Cloud.Contract/INumberRecognizerService.cs @@ -27,22 +27,20 @@ public interface INumberRecognizerService /// Creates the network. /// /// Name of the network. - /// The username. /// The individual trainings data. /// [OperationContract] - bool CreateNetwork(string networkName, string username, IEnumerable individualTrainingsData); + bool CreateNetwork(string networkName, IEnumerable individualTrainingsData); /// /// Creates the network and copies the training data from a previous network. /// /// Name of the network. - /// The username. /// The individual trainings data. /// The copy traindata from network identifier. /// [OperationContract] - bool CreateNetworkWithTrainingDataCopy(string networkName, string username, IEnumerable individualTrainingsData, int copyTraindataFromNetworkId); + bool CreateNetworkWithTrainingDataCopy(string networkName, IEnumerable individualTrainingsData, int copyTraindataFromNetworkId); /// /// Deletes the network. diff --git a/NumberRecognizer/NumberRecognizer.Cloud.Service/NumberRecognizerService.svc.cs b/NumberRecognizer/NumberRecognizer.Cloud.Service/NumberRecognizerService.svc.cs index 93c33d5..454a8b4 100644 --- a/NumberRecognizer/NumberRecognizer.Cloud.Service/NumberRecognizerService.svc.cs +++ b/NumberRecognizer/NumberRecognizer.Cloud.Service/NumberRecognizerService.svc.cs @@ -104,7 +104,7 @@ public IList GetNetworks() /// The username. /// The individual trainings data. /// - public bool CreateNetwork(string networkName, string username, IEnumerable individualTrainingsData) + public bool CreateNetwork(string networkName, IEnumerable individualTrainingsData) { bool status = true; DataSerializer serializer = new DataSerializer(); @@ -167,7 +167,7 @@ public bool CreateNetwork(string networkName, string username, IEnumerableThe copy traindata from network identifier. /// /// - public bool CreateNetworkWithTrainingDataCopy(string networkName, string username, IEnumerable individualTrainingsData, int copyTraindataFromNetworkId) + public bool CreateNetworkWithTrainingDataCopy(string networkName, IEnumerable individualTrainingsData, int copyTraindataFromNetworkId) { bool status = true; DataSerializer serializer = new DataSerializer(); diff --git a/NumberRecognizer/NumberRecognizer.sln b/NumberRecognizer/NumberRecognizer.sln index 2f3c3c9..3cd2154 100644 --- a/NumberRecognizer/NumberRecognizer.sln +++ b/NumberRecognizer/NumberRecognizer.sln @@ -29,13 +29,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{E025DEED-3EE EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NumberRecognizer.Labeling", "ConnectedComponentLabeling\NumberRecognizer.Labeling.csproj", "{73DAB28E-EC91-469B-904E-9EC8123D155F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NumberRecognizerDesktop", "NumberRecognizerDesktop\NumberRecognizerDesktop.csproj", "{47D0A682-1BE4-426F-A62E-13048E4123DA}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NumberRecognizer.App", "NumberRecognizer.App\NumberRecognizer.App.csproj", "{66AEAAD7-23AC-4E2D-8DF6-4142464F719B}" EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 12 + SccNumberOfProjects = 11 SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} SccTeamFoundationServer = https://hauersoftwarenet.visualstudio.com/defaultcollection SccLocalPath0 = . @@ -71,18 +69,14 @@ Global SccProjectTopLevelParentUniqueName8 = NumberRecognizer.sln SccProjectName8 = OcrTestApp SccLocalPath8 = OcrTestApp - SccProjectUniqueName9 = NumberRecognizerDesktop\\NumberRecognizerDesktop.csproj + SccProjectUniqueName9 = ConnectedComponentLabeling\\NumberRecognizer.Labeling.csproj SccProjectTopLevelParentUniqueName9 = NumberRecognizer.sln - SccProjectName9 = NumberRecognizerDesktop - SccLocalPath9 = NumberRecognizerDesktop - SccProjectUniqueName10 = ConnectedComponentLabeling\\NumberRecognizer.Labeling.csproj + SccProjectName9 = ConnectedComponentLabeling + SccLocalPath9 = ConnectedComponentLabeling + SccProjectUniqueName10 = NumberRecognizer.App\\NumberRecognizer.App.csproj SccProjectTopLevelParentUniqueName10 = NumberRecognizer.sln - SccProjectName10 = ConnectedComponentLabeling - SccLocalPath10 = ConnectedComponentLabeling - SccProjectUniqueName11 = NumberRecognizer.App\\NumberRecognizer.App.csproj - SccProjectTopLevelParentUniqueName11 = NumberRecognizer.sln - SccProjectName11 = NumberRecognizer.App - SccLocalPath11 = NumberRecognizer.App + SccProjectName10 = NumberRecognizer.App + SccLocalPath10 = NumberRecognizer.App EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -185,16 +179,6 @@ Global {73DAB28E-EC91-469B-904E-9EC8123D155F}.Release|ARM.ActiveCfg = Release|Any CPU {73DAB28E-EC91-469B-904E-9EC8123D155F}.Release|x64.ActiveCfg = Release|Any CPU {73DAB28E-EC91-469B-904E-9EC8123D155F}.Release|x86.ActiveCfg = Release|Any CPU - {47D0A682-1BE4-426F-A62E-13048E4123DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47D0A682-1BE4-426F-A62E-13048E4123DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47D0A682-1BE4-426F-A62E-13048E4123DA}.Debug|ARM.ActiveCfg = Debug|Any CPU - {47D0A682-1BE4-426F-A62E-13048E4123DA}.Debug|x64.ActiveCfg = Debug|Any CPU - {47D0A682-1BE4-426F-A62E-13048E4123DA}.Debug|x86.ActiveCfg = Debug|Any CPU - {47D0A682-1BE4-426F-A62E-13048E4123DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47D0A682-1BE4-426F-A62E-13048E4123DA}.Release|Any CPU.Build.0 = Release|Any CPU - {47D0A682-1BE4-426F-A62E-13048E4123DA}.Release|ARM.ActiveCfg = Release|Any CPU - {47D0A682-1BE4-426F-A62E-13048E4123DA}.Release|x64.ActiveCfg = Release|Any CPU - {47D0A682-1BE4-426F-A62E-13048E4123DA}.Release|x86.ActiveCfg = Release|Any CPU {66AEAAD7-23AC-4E2D-8DF6-4142464F719B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {66AEAAD7-23AC-4E2D-8DF6-4142464F719B}.Debug|Any CPU.Build.0 = Debug|Any CPU {66AEAAD7-23AC-4E2D-8DF6-4142464F719B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -234,7 +218,6 @@ Global {A30B1F52-719D-4F66-BB4A-0D0E38002EC9} = {D4C723FC-550D-4777-8559-165FFC379049} {20EBD715-2C6F-4FDD-BA01-AC22803BAE0F} = {D4C723FC-550D-4777-8559-165FFC379049} {73DAB28E-EC91-469B-904E-9EC8123D155F} = {E025DEED-3EEF-4F0B-BB37-AC445F1326D9} - {47D0A682-1BE4-426F-A62E-13048E4123DA} = {A87BC855-C41E-43F9-9A89-8EF3C8BB938D} {66AEAAD7-23AC-4E2D-8DF6-4142464F719B} = {A87BC855-C41E-43F9-9A89-8EF3C8BB938D} EndGlobalSection EndGlobal