diff --git a/THermo.Active.Thermocamera/Thermo.Active.Thermocamera.csproj b/THermo.Active.Thermocamera/Thermo.Active.Thermocamera.csproj
index 4bb1df4c..50920185 100644
--- a/THermo.Active.Thermocamera/Thermo.Active.Thermocamera.csproj
+++ b/THermo.Active.Thermocamera/Thermo.Active.Thermocamera.csproj
@@ -30,6 +30,26 @@
prompt
4
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/Thermo.Active.Config/Config/serverConfig.xml b/Thermo.Active.Config/Config/serverConfig.xml
index ae08b068..3d7f5591 100644
--- a/Thermo.Active.Config/Config/serverConfig.xml
+++ b/Thermo.Active.Config/Config/serverConfig.xml
@@ -141,7 +141,7 @@
-
+
diff --git a/Thermo.Active.Core/Thermo.Active.Core.csproj b/Thermo.Active.Core/Thermo.Active.Core.csproj
index cefca42b..e081834c 100644
--- a/Thermo.Active.Core/Thermo.Active.Core.csproj
+++ b/Thermo.Active.Core/Thermo.Active.Core.csproj
@@ -31,6 +31,27 @@
prompt
4
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ false
+ 7.3
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/Thermo.Active.sln b/Thermo.Active.sln
index 8e69cb33..3c9a9a5d 100644
--- a/Thermo.Active.sln
+++ b/Thermo.Active.sln
@@ -204,14 +204,14 @@ Global
{49B04D99-0ECD-4900-86D3-7098D61314D7}.Release|x86.Build.0 = Release|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.ActiveCfg = Debug|x64
- {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.Build.0 = Debug|x64
+ {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.Build.0 = Debug|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.ActiveCfg = Debug|x86
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.Build.0 = Debug|x86
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|Any CPU.Build.0 = Release|Any CPU
- {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.ActiveCfg = Release|x64
- {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.Build.0 = Release|x64
+ {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.ActiveCfg = Release|Any CPU
+ {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.Build.0 = Release|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.ActiveCfg = Release|x86
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.Build.0 = Release|x86
{0780047F-12E4-4FCC-9748-6B23F0FD3711}.Debug|Any CPU.ActiveCfg = Debug|x64
diff --git a/Thermo.Cam.Utils/dll/x64/FLIR.Atlas.x64.bat b/Thermo.Active/FLIR.Atlas.x64.bat
similarity index 100%
rename from Thermo.Cam.Utils/dll/x64/FLIR.Atlas.x64.bat
rename to Thermo.Active/FLIR.Atlas.x64.bat
diff --git a/Thermo.Cam.Utils/dll/x86/FLIR.Atlas.x86.bat b/Thermo.Active/FLIR.Atlas.x86.bat
similarity index 100%
rename from Thermo.Cam.Utils/dll/x86/FLIR.Atlas.x86.bat
rename to Thermo.Active/FLIR.Atlas.x86.bat
diff --git a/Thermo.Active/Thermo.Active.csproj b/Thermo.Active/Thermo.Active.csproj
index 202e4f8b..2fff4879 100644
--- a/Thermo.Active/Thermo.Active.csproj
+++ b/Thermo.Active/Thermo.Active.csproj
@@ -11778,6 +11778,8 @@
Always
+
+
@@ -16499,6 +16501,29 @@
app.manifest
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ false
+ 7.3
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
+ true
+ bin\x64\Release\
+ TRACE
+ pdbonly
+ x64
+ 7.3
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
@@ -16513,12 +16538,12 @@
-->
-
+
@@ -16527,4 +16552,7 @@
+
+ call "$(ProjectDir)\FLIR.Atlas.x86.bat" "$(TargetDir)"
+
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/numeric.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/numeric.ts
index a823197f..dea983e6 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/numeric.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/numeric.ts
@@ -1,4 +1,3 @@
-import { TimeLineChartHeader } from "@/components/timeline-chart";
import { debounce } from "@/_base/debounce";
import Vue from "vue";
import Component from "vue-class-component";
diff --git a/Thermo.Active/wwwroot/src/services/recipeService.ts b/Thermo.Active/wwwroot/src/services/recipeService.ts
index 32c0ad33..21a2abd7 100644
--- a/Thermo.Active/wwwroot/src/services/recipeService.ts
+++ b/Thermo.Active/wwwroot/src/services/recipeService.ts
@@ -25,7 +25,6 @@ export class RecipeService extends baseRestService {
}
async Update(model: { [id: string]: Recipe.IValue }) {
-
let payload = {}
let needsUpdate = false;
@@ -47,6 +46,8 @@ export class RecipeService extends baseRestService {
}
async UpdateChanges(newmodel: { [id: string]: Recipe.IValue }, oldmodel: { [id: string]: Recipe.IValue }) {
+
+ console.log("UpdateChanges");
let toupdate: { [id: string]: Recipe.IValue } = {};
let needsUpdate: boolean = false
for (const key in newmodel) {
diff --git a/Thermo.Cam.Setup.sln b/Thermo.Cam.Setup.sln
index d0cbdf7a..09acb08a 100644
--- a/Thermo.Cam.Setup.sln
+++ b/Thermo.Cam.Setup.sln
@@ -17,18 +17,18 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|Any CPU.ActiveCfg = Debug|x64
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|Any CPU.Build.0 = Debug|x64
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|x64.ActiveCfg = Debug|x64
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|x64.Build.0 = Debug|x64
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|x86.ActiveCfg = Debug|x86
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|x86.Build.0 = Debug|x86
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|Any CPU.ActiveCfg = Release|x86
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|Any CPU.Build.0 = Release|x86
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|x64.ActiveCfg = Release|x64
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|x64.Build.0 = Release|x64
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|x86.ActiveCfg = Release|x86
- {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|x86.Build.0 = Release|x86
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|x64.Build.0 = Debug|Any CPU
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Debug|x86.Build.0 = Debug|Any CPU
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|Any CPU.Build.0 = Release|Any CPU
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|x64.ActiveCfg = Release|Any CPU
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|x64.Build.0 = Release|Any CPU
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|x86.ActiveCfg = Release|Any CPU
+ {009978D9-A2D0-4354-A4C1-E181D7F34919}.Release|x86.Build.0 = Release|Any CPU
{E4587942-498B-4AA7-9CC9-9304EB2D05C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4587942-498B-4AA7-9CC9-9304EB2D05C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4587942-498B-4AA7-9CC9-9304EB2D05C8}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/Thermo.Cam.Setup/Thermo.Cam.Setup.csproj b/Thermo.Cam.Setup/Thermo.Cam.Setup.csproj
index c4f5930e..2001be79 100644
--- a/Thermo.Cam.Setup/Thermo.Cam.Setup.csproj
+++ b/Thermo.Cam.Setup/Thermo.Cam.Setup.csproj
@@ -32,56 +32,34 @@
false
true
-
+
+ true
+ bin\Debug\
+ DEBUG;TRACE
+ full
AnyCPU
- true
- full
- false
- bin\win32\Debug\
- DEBUG;TRACE
+ 7.3
prompt
- 4
- false
+ MinimumRecommendedRules.ruleset
-
- x86
- pdbonly
- true
- bin\win32\Release\
+
+ bin\Release\
TRACE
- prompt
- 4
- false
-
-
- x64
- true
- full
- false
- bin\x64\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- x64
- pdbonly
true
- bin\x64\Release\
- TRACE
+ pdbonly
+ AnyCPU
+ 7.3
prompt
- 4
- false
+ MinimumRecommendedRules.ruleset
False
- ..\Thermo.Cam.Utils\dll\x64\Flir.Atlas.Image.dll
+ ..\..\..\..\..\..\Program Files (x86)\FLIR Systems\FLIR Atlas SDK 6\bin\x86\Flir.Atlas.Image.dll
False
- ..\Thermo.Cam.Utils\dll\x64\Flir.Atlas.Live.dll
+ ..\..\..\..\..\..\Program Files (x86)\FLIR Systems\FLIR Atlas SDK 6\bin\x86\Flir.Atlas.Live.dll
..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
@@ -167,7 +145,7 @@
- call "$(ProjectDir)\FLIR.Atlas.x64.bat" "$(TargetDir)"
+ call "$(ProjectDir)\FLIR.Atlas.x86.bat" "$(TargetDir)"