projects
/
master-thesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use real unit (um and ppi) instead of pixel in the parameters.
[master-thesis.git]
/
Parasitemia
/
Parasitemia
/
Parasitemia.fsproj
diff --git
a/Parasitemia/Parasitemia/Parasitemia.fsproj
b/Parasitemia/Parasitemia/Parasitemia.fsproj
index
223be2c
..
590c8ea
100644
(file)
--- a/
Parasitemia/Parasitemia/Parasitemia.fsproj
+++ b/
Parasitemia/Parasitemia/Parasitemia.fsproj
@@
-9,7
+9,7
@@
<OutputType>WinExe</OutputType>
<RootNamespace>Parasitemia</RootNamespace>
<AssemblyName>Parasitemia</AssemblyName>
<OutputType>WinExe</OutputType>
<RootNamespace>Parasitemia</RootNamespace>
<AssemblyName>Parasitemia</AssemblyName>
- <TargetFrameworkVersion>v4.
6.1
</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.
5.2
</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>Parasitemia</Name>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>Parasitemia</Name>
@@
-51,7
+51,7
@@
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
- <PlatformTarget>
x64
</PlatformTarget>
+ <PlatformTarget>
AnyCPU
</PlatformTarget>
<DocumentationFile>bin\Release\Parasitemia.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
<StartArguments>--folder "../../../Images/release" --output "../../../Images/output" --debug</StartArguments>
<DocumentationFile>bin\Release\Parasitemia.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
<StartArguments>--folder "../../../Images/release" --output "../../../Images/output" --debug</StartArguments>
@@
-75,6
+75,7
@@
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Heap.fs" />
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Heap.fs" />
+ <Compile Include="UnitsOfMeasure.fs" />
<Compile Include="Const.fs" />
<Compile Include="Types.fs" />
<Compile Include="EEOver.fs" />
<Compile Include="Const.fs" />
<Compile Include="Types.fs" />
<Compile Include="EEOver.fs" />
@@
-94,17
+95,27
@@
<Compile Include="GUI\NumericUpDown.xaml.fs" />
<Resource Include="GUI\ImageSourcePreview.xaml" />
<Compile Include="GUI\ImageSourcePreview.xaml.fs" />
<Compile Include="GUI\NumericUpDown.xaml.fs" />
<Resource Include="GUI\ImageSourcePreview.xaml" />
<Compile Include="GUI\ImageSourcePreview.xaml.fs" />
+ <Resource Include="GUI\RBCFrame.xaml" />
+ <Compile Include="GUI\RBCFrame.xaml.fs" />
+ <Resource Include="GUI\AnalysisWindow.xaml" />
+ <Compile Include="GUI\AnalysisWindow.xaml.fs" />
<Resource Include="GUI\MainWindow.xaml" />
<Compile Include="GUI\MainWindow.xaml.fs" />
<Compile Include="GUI\Types.fs" />
<Resource Include="GUI\MainWindow.xaml" />
<Compile Include="GUI\MainWindow.xaml.fs" />
<Compile Include="GUI\Types.fs" />
- <Compile Include="GUI\Pia.fs" />
+ <Compile Include="GUI\Pia
Z
.fs" />
<Compile Include="GUI\State.fs" />
<Compile Include="GUI\State.fs" />
+ <Compile Include="GUI\Analysis.fs" />
<Compile Include="GUI\GUI.fs" />
<Compile Include="Program.fs" />
<None Include="App.config" />
<Content Include="packages.config" />
<Compile Include="GUI\GUI.fs" />
<Compile Include="Program.fs" />
<None Include="App.config" />
<Content Include="packages.config" />
+ <Resource Include="Resources\logo_256.png" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
<ItemGroup>
+ <Reference Include="Castle.Core">
+ <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
<Reference Include="Emgu.CV">
<HintPath>..\..\..\Emgu\emgucv-windows-universal 3.0.0.2157\bin\Emgu.CV.dll</HintPath>
</Reference>
<Reference Include="Emgu.CV">
<HintPath>..\..\..\Emgu\emgucv-windows-universal 3.0.0.2157\bin\Emgu.CV.dll</HintPath>
</Reference>
@@
-115,7
+126,7
@@
<HintPath>..\packages\FSharp.Collections.ParallelSeq.1.0.2\lib\net40\FSharp.Collections.ParallelSeq.dll</HintPath>
<Private>True</Private>
</Reference>
<HintPath>..\packages\FSharp.Collections.ParallelSeq.1.0.2\lib\net40\FSharp.Collections.ParallelSeq.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="FSharp.Core">
+ <Reference Include="FSharp.Core
, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
">
<HintPath>..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<HintPath>..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
@@
-123,6
+134,7
@@
<HintPath>..\packages\FSharp.Data.2.2.5\lib\net40\FSharp.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<HintPath>..\packages\FSharp.Data.2.2.5\lib\net40\FSharp.Data.dll</HintPath>
<Private>True</Private>
</Reference>
+ <Reference Include="FSharp.Data.TypeProviders" />
<Reference Include="FSharp.ViewModule">
<HintPath>..\packages\FSharp.ViewModule.Core.0.9.9.2\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.ViewModule.dll</HintPath>
<Private>True</Private>
<Reference Include="FSharp.ViewModule">
<HintPath>..\packages\FSharp.ViewModule.Core.0.9.9.2\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.ViewModule.dll</HintPath>
<Private>True</Private>
@@
-136,7
+148,7
@@
<Private>True</Private>
</Reference>
<Reference Include="log4net">
<Private>True</Private>
</Reference>
<Reference Include="log4net">
- <HintPath>..\packages\log4net.
1.2.10\lib\2.0
\log4net.dll</HintPath>
+ <HintPath>..\packages\log4net.
2.0.5\lib\net45-full
\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MathNet.Numerics">
<Private>True</Private>
</Reference>
<Reference Include="MathNet.Numerics">
@@
-154,6
+166,7
@@
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="System.Data.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
@@
-175,7
+188,8
@@
</ProjectReference>
</ItemGroup>
<PropertyGroup>
</ProjectReference>
</ItemGroup>
<PropertyGroup>
- <PostBuildEvent>xcopy "D:\Emgu\emgucv-windows-universal 3.0.0.2157\bin\x64\*" "$(TargetDir)" /Y /D</PostBuildEvent>
+ <PostBuildEvent>xcopy "D:\Emgu\emgucv-windows-universal 3.0.0.2157\bin\x64" "$(TargetDir)x64" /Y /D /I
+xcopy "D:\Emgu\emgucv-windows-universal 3.0.0.2157\bin\x86" "$(TargetDir)x86" /Y /D /I</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.