Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conf x Setup a 32bit

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-02-23 11:43:08 +01:00
parent b6dbe49a47
commit 4d210ddf9b
7 changed files with 77 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
THermo.Active.Thermocamera/Thermo.Active.Thermocamera.csproj
+20
View File
@@ -30,6 +30,26 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Thermo.Active.Core/Thermo.Active.Core.csproj
+21
View File
@@ -31,6 +31,27 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Thermo.Active/wwwroot/src/app_modules_thermo/components/numeric.ts
-1
View File
@@ -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";
Thermo.Active/wwwroot/src/services/recipeService.ts
+2 -1
View File
@@ -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) {
Thermo.Cam.Setup.sln
+12 -12
View File
@@ -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
Thermo.Cam.Setup/Thermo.Cam.Setup.csproj
+16 -38
View File
@@ -32,56 +32,34 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\win32\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\win32\Release\</OutputPath>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<PlatformTarget>x64</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Flir.Atlas.Image, Version=2.0.14266.1000, Culture=neutral, PublicKeyToken=caa391fd8e07c76b, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Thermo.Cam.Utils\dll\x64\Flir.Atlas.Image.dll</HintPath>
<HintPath>..\..\..\..\..\..\Program Files (x86)\FLIR Systems\FLIR Atlas SDK 6\bin\x86\Flir.Atlas.Image.dll</HintPath>
</Reference>
<Reference Include="Flir.Atlas.Live, Version=2.0.14266.1000, Culture=neutral, PublicKeyToken=caa391fd8e07c76b, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Thermo.Cam.Utils\dll\x64\Flir.Atlas.Live.dll</HintPath>
<HintPath>..\..\..\..\..\..\Program Files (x86)\FLIR Systems\FLIR Atlas SDK 6\bin\x86\Flir.Atlas.Live.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -167,7 +145,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>call "$(ProjectDir)\FLIR.Atlas.x64.bat" "$(TargetDir)"</PostBuildEvent>
<PostBuildEvent>call "$(ProjectDir)\FLIR.Atlas.x86.bat" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
<!-- <Target Name="AfterBuild">
<Exec Command="call &quot;$(ProjectDir)\FLIR.Atlas.x86.bat&quot; &quot;$(TargetDir)&quot;" Condition="$(Platform) == x86" />
Thermo.Cam.Utils/Thermo.Cam.Utils.csproj
+6 -2
View File
@@ -41,11 +41,11 @@
<ItemGroup>
<Reference Include="Flir.Atlas.Image, Version=2.0.14266.1000, Culture=neutral, PublicKeyToken=caa391fd8e07c76b, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>dll\x64\Flir.Atlas.Image.dll</HintPath>
<HintPath>..\..\..\..\..\..\Program Files (x86)\FLIR Systems\FLIR Atlas SDK 6\bin\x86\Flir.Atlas.Image.dll</HintPath>
</Reference>
<Reference Include="Flir.Atlas.Live, Version=2.0.14266.1000, Culture=neutral, PublicKeyToken=caa391fd8e07c76b, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>dll\x64\Flir.Atlas.Live.dll</HintPath>
<HintPath>..\..\..\..\..\..\Program Files (x86)\FLIR Systems\FLIR Atlas SDK 6\bin\x86\Flir.Atlas.Live.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -112,4 +112,8 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\OpenCvSharp4.runtime.win.4.5.1.20210208\build\net\OpenCvSharp4.runtime.win.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp4.runtime.win.4.5.1.20210208\build\net\OpenCvSharp4.runtime.win.props'))" />
</Target>
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>