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

Merge branch 'new/ThermoCamManager' into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-02-25 17:36:37 +01:00
parent 04df04d15c 1914658e5c
commit 67eb8a9de7
5 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.Config/Config/ThermoConf.json
+5 -5
View File
@@ -1,7 +1,7 @@
{
"MeasPoints": [],
"CameraName": "FLIR AX5",
"CameraAddress": "",
"CameraName": "Camera Emulator",
"DestPoints": {
"Coords": [
"0, 0",
@@ -13,10 +13,10 @@
},
"OrigPoints": {
"Coords": [
"55, 214",
"49, 68",
"218, 80",
"197, 226"
"20, 501",
"16, 95",
"390, 128",
"279, 506"
],
"curr": 4
},
Thermo.Active.Config/Config/userSoftKeyConfig.xml
+39 -16
View File
@@ -26,7 +26,7 @@
</softKey_procedure>
<softKey_procedure>
<active>false</active>
<active>true</active>
<category>2</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
<plcId>3</plcId>
@@ -35,6 +35,7 @@
<lang langKey="it">Termoregolatori</lang>
</localizedNames>
<visible>true</visible>
<starred>true</starred>
<refCallParam>options_thermoregulator_enable</refCallParam>
<refCallLabel>options_thermoregulator_enable_button</refCallLabel>
</softKey_procedure>
@@ -101,7 +102,7 @@
<lang langKey="it">Riscaldi indietro</lang>
</localizedNames>
<visible>true</visible>
<starred>true</starred>
<starred>false</starred>
</softKey_procedure>
<softKey_procedure>
@@ -467,22 +468,44 @@
<refCallLabel>dash_setpoint_minus_button</refCallLabel>
</softKey_procedure>
<!--softKey_group>
<active>true</active>
<category>1</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
<softKey_procedure>
<active>true</active>
<category>3</category>
<operatorConfirmationNeeded>true</operatorConfirmationNeeded>
<plcId>39</plcId>
<localizedNames>
<lang langKey="en">aaa:</lang>
<lang langKey="it">aaa</lang>
<lang langKey="en">Mould heating</lang>
<lang langKey="it">Riscaldo stampo</lang>
</localizedNames>
<subKeys>
<subKey active="true" plcId="21"> B </subKey>
<subKey active="true" plcId="22"> C </subKey>
</subKeys>
<visible>true</visible>
</softKey_group-->
<visible>true</visible>
</softKey_procedure>
<softKey_procedure>
<active>true</active>
<category>2</category>
<operatorConfirmationNeeded>true</operatorConfirmationNeeded>
<plcId>40</plcId>
<localizedNames>
<lang langKey="en">Frame X+Y</lang>
<lang langKey="it">Cornice X+Y</lang>
</localizedNames>
<visible>true</visible>
<refCallParam>dimensions_frame_setupall</refCallParam>
<refCallLabel>dimensions_frame_setupall_button</refCallLabel>
</softKey_procedure>
<softKey_procedure>
<active>true</active>
<category>2</category>
<operatorConfirmationNeeded>true</operatorConfirmationNeeded>
<plcId>41</plcId>
<localizedNames>
<lang langKey="en">Windowplate X+Y</lang>
<lang langKey="it">Piastrafinestra X+Y</lang>
</localizedNames>
<visible>true</visible>
<refCallParam>dimensions_plate_setupall</refCallParam>
<refCallLabel>dimensions_plate_setupall_button</refCallLabel>
</softKey_procedure>
</userSoftKeys>
Thermo.Active.Config/Thermo.Active.Config.csproj
+3 -1
View File
@@ -229,7 +229,9 @@
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<None Include="Config\ThermoConf.json" />
<None Include="Config\ThermoConf.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="Recipes\testa.rcp">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Thermo.Active.Core/ThreadsFunctions.cs
+1
View File
@@ -32,6 +32,7 @@ using System.Configuration;
using Thermo.Active.Model.DTOModels.ThIO;
using Thermo.Active.Thermocamera;
public static class ThreadsFunctions
{
#region Private Fields
Thermo.Cam.Setup/MainForm.cs
+4 -1
View File
@@ -301,7 +301,10 @@ namespace Thermo.Cam.Setup
TCamCtrl.ConnectCamera(discoveryDlg.SelectedCameraDevice);
// salvo nome camera in conf attuale!
TCamCtrl.currConf.CameraName = discoveryDlg.SelectedCameraDevice.Name;
TCamCtrl.currConf.CameraAddress = discoveryDlg.SelectedCameraDevice.IpSettings.IpAddress;
if (discoveryDlg.SelectedCameraDevice.IpSettings != null)
{
TCamCtrl.currConf.CameraAddress = discoveryDlg.SelectedCameraDevice.IpSettings.IpAddress;
}
TCamCtrl.saveConf();
}
}