pulizia codice

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();
         }
 

Thermo.Cam.Utils/TCContr.cs

@@ -66,13 +66,6 @@ namespace Thermo.Cam.Utils
         /// </summary>
         public Point lastPoint = new Point();
 
-#if false
-        /// <summary>
-        /// Ultima temp letta da FLIR
-        /// </summary>
-        public double lastReadTemp = 0;
-#endif
-
         /// <summary>
         /// Ultimo range di temperature osservato
         /// </summary>
@@ -148,7 +141,7 @@ namespace Thermo.Cam.Utils
         /// <summary>
         /// conf corrente applicata
         /// </summary>
-        public ThermoCamConf currConf { get; set; } = new ThermoCamConf();
+        public TConfig currConf { get; set; } = new TConfig();
 
         /// <summary>
         /// 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<ThermoCamConf>(rawData);
+                        currConf = JsonConvert.DeserializeObject<TConfig>(rawData);
                     }
                     catch (Exception exc)
                     {

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
         /// </summary>
         public SetPoints OrigPoints { get; set; } = new SetPoints();
 
-#if false
-        /// <summary>
-        /// Camera selezionata
-        /// </summary>
-        public CameraDeviceInfo SelectedCameraDevice { get; set; }
-#endif
-
         /// <summary>
         /// Range scala colori desiderata
         /// </summary>