projects
/
master-thesis.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ecf48cd
)
Back to .NET 4.5.2
author
Greg Burri
<greg.burri@gmail.com>
Sat, 22 Apr 2017 11:58:02 +0000
(13:58 +0200)
committer
Greg Burri
<greg.burri@gmail.com>
Sat, 22 Apr 2017 11:58:02 +0000
(13:58 +0200)
Parasitemia/Logger/Logger.fsproj
patch
|
blob
|
history
Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj
patch
|
blob
|
history
Parasitemia/ParasitemiaUI/App.config
patch
|
blob
|
history
Parasitemia/ParasitemiaUI/GUI.fs
patch
|
blob
|
history
Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
patch
|
blob
|
history
diff --git
a/Parasitemia/Logger/Logger.fsproj
b/Parasitemia/Logger/Logger.fsproj
index
3f7eaa6
..
a9fd374
100644
(file)
--- a/
Parasitemia/Logger/Logger.fsproj
+++ b/
Parasitemia/Logger/Logger.fsproj
@@
-9,7
+9,7
@@
<OutputType>Library</OutputType>
<RootNamespace>Logger</RootNamespace>
<AssemblyName>Logger</AssemblyName>
<OutputType>Library</OutputType>
<RootNamespace>Logger</RootNamespace>
<AssemblyName>Logger</AssemblyName>
- <TargetFrameworkVersion>v4.
6
.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.
5
.2</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Name>Logger</Name>
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Name>Logger</Name>
diff --git
a/Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj
b/Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj
index
a0dda64
..
8275c95
100644
(file)
--- a/
Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj
+++ b/
Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj
@@
-9,7
+9,7
@@
<OutputType>Library</OutputType>
<RootNamespace>ParasitemiaCore</RootNamespace>
<AssemblyName>ParasitemiaCore</AssemblyName>
<OutputType>Library</OutputType>
<RootNamespace>ParasitemiaCore</RootNamespace>
<AssemblyName>ParasitemiaCore</AssemblyName>
- <TargetFrameworkVersion>v4.
6
.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.
5
.2</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Name>ParasitemiaCore</Name>
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Name>ParasitemiaCore</Name>
diff --git
a/Parasitemia/ParasitemiaUI/App.config
b/Parasitemia/ParasitemiaUI/App.config
index
f0c7a74
..
e5e7f9f
100644
(file)
--- a/
Parasitemia/ParasitemiaUI/App.config
+++ b/
Parasitemia/ParasitemiaUI/App.config
@@
-1,14
+1,10
@@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.
6
.2" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.
5
.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
- </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
<dependentAssembly>
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
diff --git
a/Parasitemia/ParasitemiaUI/GUI.fs
b/Parasitemia/ParasitemiaUI/GUI.fs
index
985c8a4
..
0a93d90
100644
(file)
--- a/
Parasitemia/ParasitemiaUI/GUI.fs
+++ b/
Parasitemia/ParasitemiaUI/GUI.fs
@@
-226,7
+226,6
@@
let run (defaultConfig : Config) (fileToOpen : string option) =
RBCFrameFromExisting srcImg rbc (win.canvasCurrentImage.Children.[currentCanvas] :?> Views.RBCFrame)
else
let f = RBCFrame srcImg rbc
RBCFrameFromExisting srcImg rbc (win.canvasCurrentImage.Children.[currentCanvas] :?> Views.RBCFrame)
else
let f = RBCFrame srcImg rbc
- f.Opacity <- 0.7
win.canvasCurrentImage.Children.Add(f) |> ignore
f
win.canvasCurrentImage.Children.Add(f) |> ignore
f
diff --git
a/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
b/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
index
365cc93
..
c5bb1e2
100644
(file)
--- a/
Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
+++ b/
Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
@@
-9,7
+9,7
@@
<OutputType>WinExe</OutputType>
<RootNamespace>ParasitemiaUI</RootNamespace>
<AssemblyName>ParasitemiaUI</AssemblyName>
<OutputType>WinExe</OutputType>
<RootNamespace>ParasitemiaUI</RootNamespace>
<AssemblyName>ParasitemiaUI</AssemblyName>
- <TargetFrameworkVersion>v4.
6
.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.
5
.2</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<Name>ParasitemiaUI</Name>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<Name>ParasitemiaUI</Name>