Merge remote-tracking branch 'origin/Connect-UI' into develop

THermo.Active.Thermocamera/Thermo.Active.Thermocamera.csproj

@@ -32,6 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

THermo.Active.Thermocamera/ThermocameraComunicator.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Drawing;
 using System.Globalization;
 using System.IO.MemoryMappedFiles;
@@ -142,6 +143,19 @@ namespace Thermo.Active.Thermocamera
 
         #region Public Methods
 
+        /// <summary>
+        /// Swap x/y requesto from FLIR camera
+        /// </summary>
+        public bool flirSwapXY
+        {
+            get
+            {
+                bool answ = false;
+                bool.TryParse(ConfigurationManager.AppSettings["flirSwapXY"], out answ);
+                return answ;
+            }
+        }
+
         public static ThermocameraComunicator getInstance()
         {
             if (_instance == null)
@@ -168,7 +182,14 @@ namespace Thermo.Active.Thermocamera
                 string cmdRead = "";
                 foreach (var point in points)
                 {
-                    cmdRead += point.Value.X + ";" + point.Value.Y + ";";
+                    if (flirSwapXY)
+                    {
+                        cmdRead += point.Value.Y + ";" + point.Value.X + ";";
+                    }
+                    else
+                    {
+                        cmdRead += point.Value.X + ";" + point.Value.Y + ";";
+                    }
                 }
 
                 if (!writeCommand(accessor, tempCommand + ";" + cmdRead))

Thermo.Active/App.config

@@ -17,6 +17,7 @@
         <add key="nMaxParamWrite" value="5" />
         <add key="delayParamWrite" value="5" />
         <add key="ewmaPar100" value="40" />
+        <add key="flirSwapXY" value="true" />
     </appSettings>
     <system.web>
         <compilation debug="true" targetFramework="4.6.2" />

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("0.110.142")]
+[assembly: AssemblyVersion("0.110.143")]