diff --git a/Thermo.Cam.Setup/MainForm.cs b/Thermo.Cam.Setup/MainForm.cs
index a1692b25..bdd1dd38 100644
--- a/Thermo.Cam.Setup/MainForm.cs
+++ b/Thermo.Cam.Setup/MainForm.cs
@@ -451,22 +451,6 @@ namespace Thermo.Cam.Setup
private void timerUI_Tick(object sender, EventArgs e)
{
-#if false
- // controllo se deve fare discovery
- if (!IRCam.ThermoCamera.IsConnected)
- {
- // controllo se ricaricare da discovery...
- if (!string.IsNullOrEmpty(TCamCtrl.currConf.CameraName))
- {
- try
- {
- TCamCtrl.discoveryCamera();
- }
- catch
- { }
- }
- }
-#endif
updateForm();
}
diff --git a/Thermo.Cam.Utils/TCContr.cs b/Thermo.Cam.Utils/TCContr.cs
index 783e26be..07261397 100644
--- a/Thermo.Cam.Utils/TCContr.cs
+++ b/Thermo.Cam.Utils/TCContr.cs
@@ -66,13 +66,6 @@ namespace Thermo.Cam.Utils
///
public Point lastPoint = new Point();
-#if false
- ///
- /// Ultima temp letta da FLIR
- ///
- public double lastReadTemp = 0;
-#endif
-
///
/// Ultimo range di temperature osservato
///
@@ -148,7 +141,7 @@ namespace Thermo.Cam.Utils
///
/// conf corrente applicata
///
- public ThermoCamConf currConf { get; set; } = new ThermoCamConf();
+ public TConfig currConf { get; set; } = new TConfig();
///
/// Ultima bitmap disegnata (con punti)
@@ -580,9 +573,6 @@ namespace Thermo.Cam.Utils
{
if (Thermal != null)
{
-#if false
- lastReadTemp = 0;
-#endif
if (readTemp)
{
try
@@ -590,11 +580,6 @@ namespace Thermo.Cam.Utils
sw.Restart();
foreach (var item in currConf.MeasPoints)
{
-#if false
- // recupero da ARRAY in memoria delle ultime letture fatte...
- lastReadTemp = lastFlirData.Values[item.Coords.X + Thermal.Size.Width * item.Coords.Y];
- //lastReadTemp = Thermal.GetValueAt(item.Coords).Value;
-#endif
item.Temperature = lastFlirData.Values[item.Coords.X + Thermal.Size.Width * item.Coords.Y];
}
sw.Stop();
@@ -791,7 +776,7 @@ namespace Thermo.Cam.Utils
{
try
{
- currConf = JsonConvert.DeserializeObject(rawData);
+ currConf = JsonConvert.DeserializeObject(rawData);
}
catch (Exception exc)
{
diff --git a/Thermo.Cam.Utils/ThermoCamConf.cs b/Thermo.Cam.Utils/TConfig.cs
similarity index 91%
rename from Thermo.Cam.Utils/ThermoCamConf.cs
rename to Thermo.Cam.Utils/TConfig.cs
index e3ecb26c..5d828a10 100644
--- a/Thermo.Cam.Utils/ThermoCamConf.cs
+++ b/Thermo.Cam.Utils/TConfig.cs
@@ -43,7 +43,7 @@ namespace Thermo.Cam.Utils
#endregion Public Properties
}
- public class ThermoCamConf
+ public class TConfig
{
#region Public Fields
@@ -76,13 +76,6 @@ namespace Thermo.Cam.Utils
///
public SetPoints OrigPoints { get; set; } = new SetPoints();
-#if false
- ///
- /// Camera selezionata
- ///
- public CameraDeviceInfo SelectedCameraDevice { get; set; }
-#endif
-
///
/// Range scala colori desiderata
///