Add launch settings.

diff --git a/.gitignore b/.gitignore
index dca0f82..4666cef 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ packages/
 *.suo
 Images
 Scripts
-*.csproj.user
\ No newline at end of file
+*.csproj.user
+*.fsproj.user
\ No newline at end of file

diff --git a/Parasitemia/Parasitemia.sln b/Parasitemia/Parasitemia.sln
index 15b5e71..8102b58 100644 (file)
--- a/Parasitemia/Parasitemia.sln
+++ b/Parasitemia/Parasitemia.sln
@@ -15,49 +15,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1EC5C716
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ParasitemiaCore.Tests", "Tests\ParasitemiaCore.Tests\ParasitemiaCore.Tests.fsproj", "{2AB542E3-5F90-48CA-9442-32B2780B3E4A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParasitemiaUIControls", "ParasitemiaUIControls\ParasitemiaUIControls.csproj", "{98E21672-B520-4CBA-86C7-6A0856367A10}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ParasitemiaUIControls", "ParasitemiaUIControls\ParasitemiaUIControls.csproj", "{98E21672-B520-4CBA-86C7-6A0856367A10}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
-               DebugGUI|Any CPU = DebugGUI|Any CPU
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
                {70838E65-F211-44FC-B28F-0ED1CA6E850F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {70838E65-F211-44FC-B28F-0ED1CA6E850F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {70838E65-F211-44FC-B28F-0ED1CA6E850F}.DebugGUI|Any CPU.ActiveCfg = DebugGUI|Any CPU
-               {70838E65-F211-44FC-B28F-0ED1CA6E850F}.DebugGUI|Any CPU.Build.0 = DebugGUI|Any CPU
                {70838E65-F211-44FC-B28F-0ED1CA6E850F}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {70838E65-F211-44FC-B28F-0ED1CA6E850F}.Release|Any CPU.Build.0 = Release|Any CPU
                {314FD78E-870E-4794-BB16-EA4586F2ABDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {314FD78E-870E-4794-BB16-EA4586F2ABDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {314FD78E-870E-4794-BB16-EA4586F2ABDB}.DebugGUI|Any CPU.ActiveCfg = Debug|Any CPU
-               {314FD78E-870E-4794-BB16-EA4586F2ABDB}.DebugGUI|Any CPU.Build.0 = Debug|Any CPU
                {314FD78E-870E-4794-BB16-EA4586F2ABDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {314FD78E-870E-4794-BB16-EA4586F2ABDB}.Release|Any CPU.Build.0 = Release|Any CPU
                {A4F183AE-562A-4BAD-88E6-658B4CE15DC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {A4F183AE-562A-4BAD-88E6-658B4CE15DC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {A4F183AE-562A-4BAD-88E6-658B4CE15DC3}.DebugGUI|Any CPU.ActiveCfg = Debug|Any CPU
-               {A4F183AE-562A-4BAD-88E6-658B4CE15DC3}.DebugGUI|Any CPU.Build.0 = Debug|Any CPU
                {A4F183AE-562A-4BAD-88E6-658B4CE15DC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {A4F183AE-562A-4BAD-88E6-658B4CE15DC3}.Release|Any CPU.Build.0 = Release|Any CPU
                {0F8A85F4-9328-40C3-B8FF-44FB39CEB01F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {0F8A85F4-9328-40C3-B8FF-44FB39CEB01F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {0F8A85F4-9328-40C3-B8FF-44FB39CEB01F}.DebugGUI|Any CPU.ActiveCfg = Debug|Any CPU
-               {0F8A85F4-9328-40C3-B8FF-44FB39CEB01F}.DebugGUI|Any CPU.Build.0 = Debug|Any CPU
                {0F8A85F4-9328-40C3-B8FF-44FB39CEB01F}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {0F8A85F4-9328-40C3-B8FF-44FB39CEB01F}.Release|Any CPU.Build.0 = Release|Any CPU
                {2AB542E3-5F90-48CA-9442-32B2780B3E4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {2AB542E3-5F90-48CA-9442-32B2780B3E4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {2AB542E3-5F90-48CA-9442-32B2780B3E4A}.DebugGUI|Any CPU.ActiveCfg = Debug|Any CPU
-               {2AB542E3-5F90-48CA-9442-32B2780B3E4A}.DebugGUI|Any CPU.Build.0 = Debug|Any CPU
                {2AB542E3-5F90-48CA-9442-32B2780B3E4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {2AB542E3-5F90-48CA-9442-32B2780B3E4A}.Release|Any CPU.Build.0 = Release|Any CPU
                {98E21672-B520-4CBA-86C7-6A0856367A10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {98E21672-B520-4CBA-86C7-6A0856367A10}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {98E21672-B520-4CBA-86C7-6A0856367A10}.DebugGUI|Any CPU.ActiveCfg = Debug|Any CPU
-               {98E21672-B520-4CBA-86C7-6A0856367A10}.DebugGUI|Any CPU.Build.0 = Debug|Any CPU
                {98E21672-B520-4CBA-86C7-6A0856367A10}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {98E21672-B520-4CBA-86C7-6A0856367A10}.Release|Any CPU.Build.0 = Release|Any CPU
        EndGlobalSection

diff --git a/Parasitemia/ParasitemiaCore/Analysis.fs b/Parasitemia/ParasitemiaCore/Analysis.fs
index a4bb0ec..1ba273c 100644 (file)
--- a/Parasitemia/ParasitemiaCore/Analysis.fs
+++ b/Parasitemia/ParasitemiaCore/Analysis.fs
@@ -171,7 +171,7 @@ let doAnalysis (img : Image<Bgr, byte>) (name : string) (config : Config) (repor
     }
 
 /// <summary>
-/// Do multiple analyses on the same time. The number of concurrent process depends if the number of the core.
+/// Do multiple analyses on the same time. The number of concurrent process depends on the number of the core.
 /// </summary>
 /// <param name="imgs">The images: (name * configuration * image)</param>
 /// <param name="reportProgress">An optional function to report progress and/or cancel the process.

diff --git a/Parasitemia/ParasitemiaUI/AssemblyInfo.fs b/Parasitemia/ParasitemiaUI/AssemblyInfo.fs
deleted file mode 100644 (file)
index 3fdcd4b..0000000
--- a/Parasitemia/ParasitemiaUI/AssemblyInfo.fs
+++ /dev/null
@@ -1,41 +0,0 @@
-namespace ParasitemiaUI.AssemblyInfo
-
-open System.Reflection
-open System.Runtime.CompilerServices
-open System.Runtime.InteropServices
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[<assembly: AssemblyTitle "ParasitemiaUI">]
-[<assembly: AssemblyDescription "">]
-[<assembly: AssemblyConfiguration "">]
-[<assembly: AssemblyCompany "HES-SO / CHUV / Grégory Burri">]
-[<assembly: AssemblyProduct "ParasitemiaUI">]
-[<assembly: AssemblyCopyright "Copyright © 2015-2016">]
-[<assembly: AssemblyTrademark "">]
-[<assembly: AssemblyCulture "">]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[<assembly: ComVisible false>]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[<assembly: Guid "70838e65-f211-44fc-b28f-0ed1ca6e850f">]
-
-// Version information for an assembly consists of the following four values:
-//
-//       Major Version
-//       Minor Version
-//       Build Number
-//       Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [<assembly: AssemblyVersion "1.0.*">]
-[<assembly: AssemblyVersion "1.0.0.12">]
-[<assembly: AssemblyFileVersion "1.0.0.12">]
-
-do
-    ()
\ No newline at end of file

diff --git a/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj b/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
index 3e7e22f..4f37773 100644 (file)
--- a/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
+++ b/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
@@ -4,10 +4,12 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
+    <AssemblyVersion>1.0.0.12</AssemblyVersion>
+    <FileVersion>1.0.0.12</FileVersion>
+    <Version>1.0.12</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Types.fs" />
     <Compile Include="Utils.fs" />
     <Compile Include="SourceImage.fs" />

diff --git a/Parasitemia/ParasitemiaUI/Properties/launchSettings.json b/Parasitemia/ParasitemiaUI/Properties/launchSettings.json
new file mode 100644 (file)
index 0000000..19b0025
--- /dev/null
+++ b/Parasitemia/ParasitemiaUI/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "UI": {
+      "commandName": "Project",
+      "commandLineArgs": "--output \"../../../Images/output\" --debug"
+    },
+    "ProcessImages": {
+      "commandName": "Project",
+      "commandLineArgs": "--folder \"../../../Images/input\" --output \"../../../Images/output\" --debug"
+    }
+  }
+}
\ No newline at end of file