diff --git a/THermo.Active.Thermocamera/ThermoCamComunicator.cs b/THermo.Active.Thermocamera/ThermoCamComunicator.cs index 7639c5d8..ef1ef7ef 100644 --- a/THermo.Active.Thermocamera/ThermoCamComunicator.cs +++ b/THermo.Active.Thermocamera/ThermoCamComunicator.cs @@ -91,10 +91,9 @@ namespace Thermo.Active.Thermocamera /// Dictionary id richiesta + punto (es canali + relativi punti medi come centro calcolato della resistenza di riferimento del canale) /// Dizionario temperature come id + valore double in °C /// - public bool readMultiTemperatures(string setName, Dictionary points, out Dictionary temp) + public bool readMultiTemperatures(string setName, Dictionary points, out List temp) { - temp = new Dictionary(); - List measData = new List(); + temp = new List(); // converto la richiesta in una lista di punti di misura... List reqData = points.Select(item => new MeasurePoint() { @@ -112,12 +111,12 @@ namespace Thermo.Active.Thermocamera // carico file vari... done = TCamLive.fileLoad(setName); } - measData = TCamLive.getPointsTemperature(false, reqData); - // converto valori nel formato finale - foreach (var item in measData) + try { - temp.Add(item.Id, item.Temperature); + temp = TCamLive.getPointsTemperature(false, reqData); } + catch + { } // fatto! return true; } diff --git a/Thermo.Active.Core/Thermo.Active.Core.csproj b/Thermo.Active.Core/Thermo.Active.Core.csproj index e081834c..7b27088a 100644 --- a/Thermo.Active.Core/Thermo.Active.Core.csproj +++ b/Thermo.Active.Core/Thermo.Active.Core.csproj @@ -110,6 +110,10 @@ {cbeb631b-abfa-4042-9779-c0060b0dfefe} Thermo.Active.Utils + + {E4587942-498B-4AA7-9CC9-9304EB2D05C8} + Thermo.Cam.Utils + diff --git a/Thermo.Active.Core/ThreadsFunctions.cs b/Thermo.Active.Core/ThreadsFunctions.cs index be559e9c..541cc4b7 100644 --- a/Thermo.Active.Core/ThreadsFunctions.cs +++ b/Thermo.Active.Core/ThreadsFunctions.cs @@ -352,17 +352,23 @@ public static class ThreadsFunctions // if requested --> give ack! ncAdapter.ManageFlirStrobe(); // requesto photo from library - ncAdapter.lastThermoImage = TCCom.takePicture(); - done = !string.IsNullOrEmpty(ncAdapter.lastThermoImage); + NcAdapter.lastThermoImage = TCCom.takePicture(); + done = !string.IsNullOrEmpty(NcAdapter.lastThermoImage); if (done) { // init + List measuredpoints = new List(); Dictionary actualTemp = new Dictionary(); Dictionary chPoints = new Dictionary(); // recupero punti centrali resistenze ncAdapter.GetWarmersChannelCenterPoints(out chPoints); // richiesta temperature per i punti - done = TCCom.readMultiTemperatures("", chPoints, out actualTemp); + done = TCCom.readMultiTemperatures("", chPoints, out measuredpoints); + // converto in actualTemp + foreach (var item in measuredpoints) + { + actualTemp.Add(item.Id, item.Temperature); + } // salvo dati temp sul PLC ncAdapter.WriteRecipeWarmChTCamTempAct(actualTemp); // give PLC strobe for uploaded Actual TEMP from image diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs index 49034447..cf4083b9 100644 --- a/Thermo.Active.NC/NcAdapter.cs +++ b/Thermo.Active.NC/NcAdapter.cs @@ -117,7 +117,7 @@ namespace Thermo.Active.NC /// /// ultima immagine scattata dalla thermocam x salvataggio in PROD /// - public string lastThermoImage = "_last"; + public static string lastThermoImage = "_last"; /// /// Avvio prod lotto diff --git a/Thermo.Active/Controllers/WebApi/WarmersController.cs b/Thermo.Active/Controllers/WebApi/WarmersController.cs index 1353ebab..fe013035 100644 --- a/Thermo.Active/Controllers/WebApi/WarmersController.cs +++ b/Thermo.Active/Controllers/WebApi/WarmersController.cs @@ -350,12 +350,12 @@ namespace Thermo.Active.Controllers.WebApi return Ok(currWarmers); } - [ResponseType(typeof(Dictionary))] + [ResponseType(typeof(List))] [Route("getMeasurePoints"), HttpGet] public IHttpActionResult GetMeasurePoints(string setName) { // init punti... - Dictionary resultPoints = new Dictionary(); + List resultPoints = new List(); // Chiamo l'oggetto thermocam x il set richiesto... TCCom.readMultiTemperatures(setName, MeasurePoints, out resultPoints); // ritorno! diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index 082e9d47..dac17096 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/Thermo.Active/Properties/AssemblyInfo.cs @@ -30,4 +30,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.165")] +[assembly: AssemblyVersion("1.1.167")] diff --git a/Thermo.Active/Thermo.Active.csproj b/Thermo.Active/Thermo.Active.csproj index 2fff4879..62fd5148 100644 --- a/Thermo.Active/Thermo.Active.csproj +++ b/Thermo.Active/Thermo.Active.csproj @@ -16213,6 +16213,10 @@ {cbeb631b-abfa-4042-9779-c0060b0dfefe} Thermo.Active.Utils + + {e4587942-498b-4aa7-9cc9-9304eb2d05c8} + Thermo.Cam.Utils + diff --git a/Thermo.Cam.Setup/MainForm.cs b/Thermo.Cam.Setup/MainForm.cs index b9432f22..5188f9af 100644 --- a/Thermo.Cam.Setup/MainForm.cs +++ b/Thermo.Cam.Setup/MainForm.cs @@ -24,7 +24,7 @@ namespace Thermo.Cam.Setup /// /// Classe gestione ThermoCam (oggetti Image, metodi processing...) x FlirCam /// - protected TCContr TCamCtrl = new TCContr(BASE_PATH, BASE_PATH); + protected TCContr TCamCtrl = new TCContr($"{BASE_PATH}images\\", BASE_PATH); #endregion Protected Fields diff --git a/Thermo.Cam.Utils/TCContr.cs b/Thermo.Cam.Utils/TCContr.cs index ae2979bf..7c3c7079 100644 --- a/Thermo.Cam.Utils/TCContr.cs +++ b/Thermo.Cam.Utils/TCContr.cs @@ -20,13 +20,13 @@ namespace Thermo.Cam.Utils { #region Protected Fields - protected const string colorPath = "images\\colored"; + protected const string colorPath = "colored"; protected const string confFileName = "ThermoConf.json"; protected const string currName = "_last"; protected const string dataFormat = "dat"; - protected const string dataPath = "images\\data"; + protected const string dataPath = "data"; protected const string imgFormat = "jpg"; - protected const string thermPath = "images\\original"; + protected const string thermPath = "original"; protected string _confBasePath = ""; protected string _imgBasePath = "";