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

# Conflicts:
#	Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.ts
#	Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.vue

Client.Config/Config.xml

@@ -4,7 +4,7 @@
       <IsSCM>false</IsSCM>
       <TranspColor>#FF00FF</TranspColor>
       <RenderingMethod>GPU</RenderingMethod> <!-- GPU/CPU -->
-      <ShowVirtualKeyboard>false</ShowVirtualKeyboard>
+      <ShowVirtualKeyboard>true</ShowVirtualKeyboard>
       <RunningOnSecondaryScreen>false</RunningOnSecondaryScreen>
       <DeveloperMode>true</DeveloperMode>
   </Client>
@@ -12,9 +12,9 @@
       <ServerUrl>localhost</ServerUrl>
       <ServerPort>9000</ServerPort>
       <Id>1</Id>
-      <DeleteCahceFolderOnStartup>true</DeleteCahceFolderOnStartup>
+      <DeleteCahceFolderOnStartup>false</DeleteCahceFolderOnStartup>
   </Connection>
   <VendorHmi>
-      <FollowNcWindow>True</FollowNcWindow>
+      <FollowNcWindow>false</FollowNcWindow>
   </VendorHmi>
 </Config>

Client/Browser_Tools/BrowserJSObject.cs

@@ -38,13 +38,14 @@ namespace Active_Client.Browser_Tools
 
         private static readonly string[] _validExtensions = {".json", ".rcp", ".tpl" };
         //private static readonly string[] _validExtensions = { "", ".txt", ".cnc", ".cn", ".cno", ".ini", ".mpf", ".spf", ".tap", ".anc", ".iso" };
-        private static readonly string[] _validImages = { ".jpg", ".jpeg", ".png", ".svg" };
+        private static readonly string[] _validImages = { ".svg" };
         private static string jobPath = "";
         private static Dictionary<string, IntPtr> _editorOpened = new Dictionary<string, IntPtr>();
         private static EditorVar _currentEditorObject = new EditorVar();
         public static string RECENT_FOLDER_KEY = "RECENT";
-        private const string THERMO_RECIPE_PATH = @"C:\CMS\Recipe";
-
+        private const string THERMO_RECIPE_PATH = @"C:\CMS\Recipes";
+        private const string CMS_PATH = @"C:\CMS";
+        
         public static FileSystemWatcher watcher = null;
         public static DateTime _lastTimeFileWatcherEventRaised = DateTime.Now;
 
@@ -77,13 +78,15 @@ namespace Active_Client.Browser_Tools
             AddFunction("openOrStartProcess").Execute += openOrStartProcess;
             AddFunction("isVirtualKeybConfigured").Execute += isVirtualKeybConfigured;
             AddFunction("getOSdriveList").Execute += getOSdriveList;
+            AddFunction("getAllRecipeDirectories").Execute += getAllRecipeDirectories;            
             AddFunction("getFileList").Execute += getFileList;
             AddFunction("getProgramInfo").Execute += getProgramInfo;
             AddFunction("editProgram").Execute += editProgram;
             AddFunction("deleteFile").Execute += deleteFile;
             AddFunction("deleteFolder").Execute += deleteFolder;
             AddFunction("createFolder").Execute += createFolder;
-
+            AddFunction("duplicateRecipe").Execute += duplicateRecipe;
+            
 
 
             AddFunction("uploadAndActivateProgram").Execute += uploadAndActivateProgram;
@@ -364,34 +367,6 @@ namespace Active_Client.Browser_Tools
         {
             List<Drive> drivelist = new List<Drive>();
 
-            // USB & HD Drives
-            /*
-            foreach (var drive in DriveInfo.GetDrives())
-            {
-                if (drive.IsReady)
-                {
-                    //Filter NC Address
-                    if (drive.DriveType != DriveType.Network)
-                    {
-                        drivelist.Add(new Drive()
-                        {
-                            Name = ElaborateName(drive.VolumeLabel, drive.Name.TrimEnd('\\'), drive.DriveType),
-                            Path = drive.RootDirectory.ToString(),
-                            Type = ElaborateType(drive.DriveType)
-                        });
-                    }
-                }
-            }
-            
-            // Desktop folder
-            drivelist.Add(new Drive()
-            {
-                Name = ElaborateName("Desktop", "", DriveType.Unknown),
-                Path = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\",
-                Type = "SPFO"
-            });
-            */
-
             if (Directory.Exists(THERMO_RECIPE_PATH))
             {
                 drivelist.Add(new Drive()
@@ -401,32 +376,59 @@ namespace Active_Client.Browser_Tools
                     Type = "SPFO"
                 });
             }
-            /*
+
+            e.SetReturnValue(JsonConvert.SerializeObject(drivelist));
+        }
+
+        public void getAllRecipeDirectories(object sender, CfrV8HandlerExecuteEventArgs e)
+        {
+            List<string> dirs = this.DirSearch(THERMO_RECIPE_PATH);
+            for (int i = 0; i< dirs.Count; i++)
+            {
+                 dirs[i] = dirs[i].Remove(0,CMS_PATH.Length +1);
+            }
+
+            e.SetReturnValue(JsonConvert.SerializeObject(dirs));
+        }
+
+
+        public void duplicateRecipe(object sender, CfrV8HandlerExecuteEventArgs e)
+        {
+            if (e.Arguments.Count() < 2)
+            {
+                e.SetReturnValue(JsonConvert.SerializeObject(new ErrorContainer("error_arguments_not_ok")));
+                return;
+            }
+
+            string oldFile = CMS_PATH + "\\" + e.Arguments[0].StringValue + ".rcp";
+            string newFile = CMS_PATH + "\\" + e.Arguments[1].StringValue + ".rcp";
+            string oldImage = CMS_PATH + "\\" + e.Arguments[0].StringValue + ".svg";
+            string newImage = CMS_PATH + "\\" + e.Arguments[1].StringValue + ".svg";
+            if (!File.Exists(oldFile))
+            {
+                e.SetReturnValue(JsonConvert.SerializeObject(new ErrorContainer("file_not_found")));
+                return;
+            }
+            if (File.Exists(newFile))
+            {
+                e.SetReturnValue(JsonConvert.SerializeObject(new ErrorContainer("file_already_exists")));
+                return;
+            }
             try
             {
-                // Network Folders
-                var searcher = new ManagementObjectSearcher("select * from Win32_MappedLogicalDisk");
-                foreach (ManagementObject queryObj in searcher.Get())
+                File.Copy(oldFile, newFile, true);
+                if (File.Exists(oldImage))
                 {
-                    //Filter not CNC folder
-                    if (!queryObj["ProviderName"].ToString().Contains(Config.VendorHmiConfig.IpAddress))
-                    {
-                        drivelist.Add(new Drive()
-                        {
-                            Name = ElaborateName(queryObj["VolumeName"].ToString(), queryObj["Name"].ToString(), DriveType.Network),
-                            Path = queryObj["Name"].ToString(),
-                            Type = ElaborateType(DriveType.Network)
-                        });
-                    }
+                    File.Copy(oldImage, newImage, true);
                 }
             }
             catch (Exception ex)
             {
+                e.SetReturnValue(JsonConvert.SerializeObject(new ErrorContainer("cannot_copy_file")));
+            }
 
-            }*/
-
-            e.SetReturnValue(JsonConvert.SerializeObject(drivelist));
         }
+        
 
         // Read all files in directory
         public void getFileList(object sender, CfrV8HandlerExecuteEventArgs e)
@@ -434,14 +436,14 @@ namespace Active_Client.Browser_Tools
             List<FileModel> filelist = new List<FileModel>();
             if (e.Arguments.Count() == 0)
             {
-                e.SetReturnValue(JsonConvert.SerializeObject(new List<FileModel>()));
+                e.SetReturnValue(JsonConvert.SerializeObject(new ErrorContainer("error_arguments_not_ok")));
                 return;
             }
 
             string p = e.Arguments[0].StringValue;
             if (p != RECENT_FOLDER_KEY && !Directory.Exists(p))
             {
-                e.SetReturnValue(JsonConvert.SerializeObject(new List<FileModel>()));
+                e.SetReturnValue(JsonConvert.SerializeObject(new ErrorContainer("file_not_exists")));
                 return;
             }
 
@@ -516,6 +518,11 @@ namespace Active_Client.Browser_Tools
             try
             {
                 File.Delete(p);
+                string images = Path.ChangeExtension(p, "svg");
+                if(File.Exists(images))
+                {
+                    File.Delete(images);
+                }
             }
             catch(Exception ex)
             {
@@ -810,7 +817,10 @@ namespace Active_Client.Browser_Tools
                 {
                     if (File.Exists(imageDirectory + "/" + imagePath + ext))
                     {
-                        file.PreviewBase64 = "data:image/" + ext + ";base64," + Convert.ToBase64String(File.ReadAllBytes(imageDirectory + "/" + imagePath + ext));
+                        if (ext.ToLower().Equals(".svg"))
+                            file.PreviewBase64 = File.ReadAllText(imageDirectory + "/" + imagePath + ext);
+                        else
+                            file.PreviewBase64 = "data:image/" + ext + ";base64," + Convert.ToBase64String(File.ReadAllBytes(imageDirectory + "/" + imagePath + ext));
                         break;
                     }
                 }
@@ -1061,6 +1071,26 @@ namespace Active_Client.Browser_Tools
             return retName;
         }
 
+
+        private List<String> DirSearch(string sDir)
+        {
+            List<String> files = new List<String>();
+            try
+            {
+                files.Add(sDir);
+                foreach (string d in Directory.GetDirectories(sDir))
+                {
+                    files.AddRange(DirSearch(d));
+                }
+            }
+            catch (System.Exception excpt)
+            {
+                MessageBox.Show(excpt.Message);
+            }
+
+            return files;
+        }
+
         #endregion FILESYSTEM_METHODS
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

Client/Program.cs

@@ -11,6 +11,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Management;
+using System.Security.Permissions;
 using System.Threading;
 using System.Windows.Forms;
 
@@ -25,14 +26,13 @@ namespace Active_Client
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         #region MAIN_METHOD
 
-        [STAThread]
+        [STAThread]
+        [SecurityPermission(SecurityAction.Demand, Flags = SecurityPermissionFlag.ControlAppDomain)]
         static void Main(string[] args)
         {
             //Crate General Exception Handler
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(GeneralExMethod);
-
-            //Crate General Exception Handler
-            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(GeneralExMethod);
+
 
             //Read App Configuration
             readConfiguration();

Client/View/MainForm.cs

@@ -434,7 +434,7 @@ namespace Active_Client.View
                     string dom = ev.Node.GetElementAttribute("type").ToLower();
 
                     //Filter if the node Type is TEXT or PASSWORD
-                    if (dom != null && (dom.Equals("text") || dom.Equals("password")))
+                    if (dom != null && (dom.Equals("text") || dom.Equals("password") || dom.Equals("")))
                         NcWindow.openVirtualKeyboard(ev.Node.ElementBounds, ev.Browser.Identifier > 1, false);
                 }
                 //Filter if this node is TEXTAREA Node

Thermo.Active.Config/Config/InputOperatorConfigValidator.xsd

@@ -1,79 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-  <xs:element name="inputsOperator">
-    <xs:complexType>
-      <xs:choice maxOccurs="unbounded">
-        <xs:element name="realValueModal"  type="valuesType" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="showValModal" type="showValType" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="buttonsListModal" type="buttonsType" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:choice>
+    <xs:element name="inputsOperator">
+        <xs:complexType>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element name="realValueModal"  type="valuesType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="showValModal" type="showValType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="buttonsListModal" type="buttonsType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="simpleModal" type="modalType" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:choice>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:complexType name="valuesType">
+        <xs:all>
+            <xs:element name="id" minOccurs='1' maxOccurs='1'/>
+            <xs:element name="title" type="translatedText" minOccurs='1' maxOccurs='1'/>
+        </xs:all>
     </xs:complexType>
-  </xs:element>
 
-  <xs:complexType name="valuesType">
-    <xs:all>
-      <xs:element name="id" minOccurs='1' maxOccurs='1'/>
-      <xs:element name="title" type="translatedText" minOccurs='1' maxOccurs='1'/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="showValType">
-    <xs:all>
-      <xs:element name="id" minOccurs='1' maxOccurs='1'/>
-      <xs:element name="title" type="translatedText" minOccurs='1' maxOccurs='1'/>
-      <xs:element name="buttons">
-        <xs:complexType>
-          <xs:sequence minOccurs="1" maxOccurs="unbounded">
-            <xs:element name="button">
-              <xs:complexType>
-                <xs:all>
-                  <xs:element name="value" minOccurs="1" maxOccurs="1" type="xs:int"></xs:element>
-                  <xs:element name="title" type="translatedText" minOccurs='1' maxOccurs='1'/>
-                </xs:all>
-              </xs:complexType>
+    <xs:complexType name="showValType">
+        <xs:all>
+            <xs:element name="id" minOccurs='1' maxOccurs='1'/>
+            <xs:element name="title" type="translatedText" minOccurs='1' maxOccurs='1'/>
+            <xs:element name="buttons">
+                <xs:complexType>
+                    <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                        <xs:element name="button">
+                            <xs:complexType>
+                                <xs:all>
+                                    <xs:element name="value" minOccurs="1" maxOccurs="1" type="xs:int"></xs:element>
+                                    <xs:element name="title" type="translatedText" minOccurs='1' maxOccurs='1'/>
+                                </xs:all>
+                            </xs:complexType>
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
             </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-    </xs:all>
-  </xs:complexType>
+        </xs:all>
+    </xs:complexType>
 
-  <xs:complexType name="buttonsType">
-    <xs:all>
-      <xs:element name="id" minOccurs='1' maxOccurs='1'/>
-      <xs:element name="title" type="translatedText" minOccurs='1' maxOccurs='1'/>
-      <xs:element name="buttons">
-        <xs:complexType>
-          <xs:sequence minOccurs="1" maxOccurs="unbounded">
-            <xs:element name="button">
-              <xs:complexType>
-                <xs:all>
-                  <xs:element name="value" minOccurs="1" maxOccurs="1" type="xs:int"></xs:element>
-                  <xs:element name="title" type="translatedText" minOccurs='1' maxOccurs='1'/>
-                </xs:all>
-              </xs:complexType>
+    <xs:complexType name="buttonsType">
+        <xs:all>
+            <xs:element name="id" minOccurs='1' maxOccurs='1'/>
+            <xs:element name="title" type="translatedText" minOccurs='1' maxOccurs='1'/>
+            <xs:element name="buttons">
+                <xs:complexType>
+                    <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                        <xs:element name="button">
+                            <xs:complexType>
+                                <xs:all>
+                                    <xs:element name="value" minOccurs="1" maxOccurs="1" type="xs:int"></xs:element>
+                                    <xs:element name="title" type="translatedText" minOccurs='1' maxOccurs='1'/>
+                                </xs:all>
+                            </xs:complexType>
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
             </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-    </xs:all>
-  </xs:complexType>
+        </xs:all>
+    </xs:complexType>
+    <xs:complexType name="modalType">
+        <xs:all>
+            <xs:element name="id" minOccurs='1' maxOccurs='1'/>
+            <xs:element name="title" type="translatedText" minOccurs='1' maxOccurs='1'/>
+        </xs:all>
+    </xs:complexType>
 
-  <!-- Translations field Type -->
-  <xs:complexType name="translatedText">
-    <xs:sequence>
-      <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
+    <!-- Translations field Type -->
+    <xs:complexType name="translatedText">
+        <xs:sequence>
+            <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
 
-  <!-- lang field -->
-  <xs:complexType name="langType">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute name="langKey" use="required" type="xs:string" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
+    <!-- lang field -->
+    <xs:complexType name="langType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="langKey" use="required" type="xs:string" />
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
 </xs:schema>

Thermo.Active.Config/Config/axesConfig.xml

@@ -1,27 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <axes>
-  <axis id="1" >X</axis>
-  <axis id="2" >Y</axis>
-  <axis id="3" >Z</axis>
-  <axis id="4" >B</axis>
-  <axis id="5" >C</axis>
-  <axis id="6" >V</axis>
-  <axis id="7" ></axis>
-  <axis id="8" ></axis>
-  <axis id="9" ></axis>
-  <axis id="10" ></axis>
-  <axis id="11" ></axis>
-  <axis id="12" ></axis>
-  <axis id="13" ></axis>
-  <axis id="14" ></axis>
-  <axis id="15" ></axis>
-  <axis id="16" ></axis>
-  <axis id="17" >SP</axis>
-  <axis id="18" ></axis>
-  <axis id="19" ></axis>
-  <axis id="20" ></axis>
-  <axis id="21" ></axis>
-  <axis id="22" ></axis>
-  <axis id="23" ></axis>
-  <axis id="24" ></axis>
+    <axis id="1" name="KI_Asse_W1" type="LINEAR" enabled="true" />
+    <axis id="2" name="KI_Asse_W2" type="LINEAR" enabled="true" />
+    <axis id="3" name="KI_Asse_W3" type="LINEAR" enabled="false" />
+    <axis id="4" name="KI_Asse_W4" type="LINEAR" enabled="false" />
+    <axis id="5" name="KI_Asse_Z1" type="LINEAR" enabled="true" />
+    <axis id="6" name="KI_Asse_Z2" type="LINEAR" enabled="true" />
+    <axis id="7" name="KI_Asse_Z3" type="LINEAR" enabled="true" />
+    <axis id="8" name="KI_Asse_Z4" type="LINEAR" enabled="true" />
+    <axis id="9" name="KI_Asse_R1" type="LINEAR" enabled="true" />
+    <axis id="10" name="KI_Asse_R2" type="LINEAR" enabled="false" />
+    <axis id="11" name="KI_Asse_S1" type="LINEAR" enabled="true" />
+    <axis id="12" name="KI_Asse_S2" type="LINEAR" enabled="false" />
+    <axis id="13" name="KI_Asse_CZ1" type="LINEAR" enabled="true" />
+    <axis id="14" name="KI_Asse_CZ2" type="LINEAR" enabled="true" />
+    <axis id="15" name="KI_Asse_CZ3" type="LINEAR" enabled="true" />
+    <axis id="16" name="KI_Asse_CZ4" type="LINEAR" enabled="true" />
+    <axis id="17" name="KI_Asse_U1"  type="LINEAR" enabled="true" />
+    <axis id="18" name="KI_Asse_U2"  type="LINEAR" enabled="true" />
+    <axis id="19" name="KI_Asse_P"   type="LINEAR" enabled="true" />
+    <axis id="20" name="KI_Asse_X"   type="LINEAR" enabled="true" />
+    <axis id="21" name="KI_Asse_CX1" type="LINEAR" enabled="true" />
+    <axis id="22" name="KI_Asse_CX2" type="LINEAR" enabled="true" />
+    <axis id="23" name="KI_Asse_CY1" type="LINEAR" enabled="true" />
+    <axis id="24" name="KI_Asse_CY2" type="LINEAR" enabled="true" />
+    <axis id="25" name="KI_Asse_F11" type="LINEAR" enabled="true" />
+    <axis id="26" name="KI_Asse_F12" type="LINEAR" enabled="false" />
+    <axis id="27" name="KI_Asse_F21" type="LINEAR" enabled="true" />
+    <axis id="28" name="KI_Asse_F22" type="LINEAR" enabled="false" />
+    <axis id="29" name="KI_Asse_F31" type="LINEAR" enabled="true" />
+    <axis id="30" name="KI_Asse_F32" type="LINEAR" enabled="false" />
+    <axis id="31" name="KI_Asse_F41" type="LINEAR" enabled="true" />
+    <axis id="32" name="KI_Asse_F42" type="LINEAR" enabled="false" />
+    <axis id="33" name="KI_Asse_E"   type="LINEAR" enabled="true" />
+    <axis id="34" name="KI_Asse_M" type="LINEAR" enabled="false" />
 </axes>

Thermo.Active.Config/Config/axesConfigValidator.xsd

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="axes">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="axis" minOccurs="0" maxOccurs="unbounded">
+                    <xs:complexType>
+                        <xs:complexContent>
+                            <xs:extension base="axisType"/>
+                        </xs:complexContent>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:complexType name="axisType">
+        <xs:attribute name="id" type="xs:integer" use="required">
+        </xs:attribute>
+        <xs:attribute name="name" type="xs:string" use="required">
+        </xs:attribute>
+        <xs:attribute name="type" type="axType" use="required">
+        </xs:attribute>
+        <xs:attribute name="enabled" type="xs:boolean" use="required">
+        </xs:attribute>
+    </xs:complexType>
+    <xs:simpleType name="axType" final="restriction" >
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="NA" />
+            <xs:enumeration value="LINEAR" />
+            <xs:enumeration value="ROTATIONAL" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>

Thermo.Active.Config/Config/inputOperatorConfig.xml

@@ -1,63 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inputsOperator>
-  <buttonsListModal>
-    <id>1</id>
-    <title>
-      <lang langKey="it">Hai rimosso manualmente anche il pezzo lavorato ?</lang>
-      <lang langKey="en">Have you also manually removed the workpiece ?</lang>
-    </title>
-    <buttons>
-      <button>
-        <value>0</value>
+    <buttonsListModal>
+        <id>1</id>
         <title>
-          <lang langKey="it">No</lang>
-          <lang langKey="en">No</lang>
+            <lang langKey="it">Hai rimosso manualmente anche il pezzo lavorato ?</lang>
+            <lang langKey="en">Have you also manually removed the workpiece ?</lang>
         </title>
-      </button>
-      <button>
-        <value>1</value>
+        <buttons>
+            <button>
+                <value>0</value>
+                <title>
+                    <lang langKey="it">No</lang>
+                    <lang langKey="en">No</lang>
+                </title>
+            </button>
+            <button>
+                <value>1</value>
+                <title>
+                    <lang langKey="it">Si</lang>
+                    <lang langKey="en">Yes</lang>
+                </title>
+            </button>
+        </buttons>
+    </buttonsListModal>
+    <simpleModal>
+        <id>2</id>
         <title>
-          <lang langKey="it">Si</lang>
-          <lang langKey="en">Yes</lang>
+            <lang langKey="it">DUE Hai rimosso manualmente anche il pezzo lavorato ?</lang>
+            <lang langKey="en">DUE Have you also manually removed the workpiece ?</lang>
         </title>
-      </button>
-    </buttons>
-  </buttonsListModal>
-  <realValueModal>
-	   <id>10</id>
-    <title>
-      <lang langKey="en">External water</lang>
-      <lang langKey="it">Acqua esterna</lang>
-    </title>
-	</realValueModal>
-  <realValueModal>
-    <id>11</id>
-    <title>
-      <lang langKey="en">External water</lang>
-      <lang langKey="it">Acqua esterna</lang>
-    </title>
-  </realValueModal>
-  <buttonsListModal>
-    <id>6</id>
-    <title>
-      <lang langKey="en">External water</lang>
-      <lang langKey="it">Acqua esterna</lang>
-    </title>
-    <buttons>
-      <button>
-        <value>3</value>
+    </simpleModal>
+    <realValueModal>
+        <id>10</id>
         <title>
-          <lang langKey="en">External water</lang>
-          <lang langKey="it">Acqua esterna</lang>
+            <lang langKey="en">External water</lang>
+            <lang langKey="it">Acqua esterna</lang>
         </title>
-      </button>
-      <button>
-        <value>4</value>
+    </realValueModal>
+    <realValueModal>
+        <id>11</id>
         <title>
-          <lang langKey="en">External water</lang>
-          <lang langKey="it">Acqua esterna</lang>
+            <lang langKey="en">External water</lang>
+            <lang langKey="it">Acqua esterna</lang>
         </title>
-      </button>
-    </buttons>
-  </buttonsListModal>
+    </realValueModal>
+    <buttonsListModal>
+        <id>6</id>
+        <title>
+            <lang langKey="en">External water</lang>
+            <lang langKey="it">Acqua esterna</lang>
+        </title>
+        <buttons>
+            <button>
+                <value>3</value>
+                <title>
+                    <lang langKey="en">External water</lang>
+                    <lang langKey="it">Acqua esterna</lang>
+                </title>
+            </button>
+            <button>
+                <value>4</value>
+                <title>
+                    <lang langKey="en">External water</lang>
+                    <lang langKey="it">Acqua esterna</lang>
+                </title>
+            </button>
+        </buttons>
+    </buttonsListModal>
 </inputsOperator>

Thermo.Active.Config/Config/recipeConfigValidator.xsd

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    
     <xs:element name="recipe">
+        <!-- Heads -->
         <xs:complexType>
             <xs:sequence>
-                <!-- Heads -->
                 <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded">
                     <xs:complexType>
                         <xs:all>

Thermo.Active.Config/Config/serverConfig.xml

@@ -1,64 +1,126 @@
 <?xml version="1.0" encoding="utf-8"?>
 <serverConfig>
-  <ncConfig>
-    <ncVendor>S7NET</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI/S7NET -->
-    <showNcHMI>false</showNcHMI>
-    <ncIpAddress>192.168.0.102</ncIpAddress>
-    <ncPort>102</ncPort>
-    <machineModel>Thermo 2020</machineModel>
-    <sharedPath>C:\CMS\Recipes\</sharedPath>
-    <sharedName>//PARTPRG:/</sharedName>
-    <installationDate>01/06/2020</installationDate>
-    <mgiOption>false</mgiOption>
-    <siemensKeyboardOption>false</siemensKeyboardOption>
-    <machineNumberHasLetters>false</machineNumberHasLetters>
-  </ncConfig>
-  <softwareProdConfig>
-    <enabled>false</enabled>
-    <path>C:\Program Files\Notepad++\notepad++.exe</path>
-  </softwareProdConfig>
-  <serverConfig>
-    <serverPort>9000</serverPort>
-    <serverAddress>*</serverAddress>
-    <language>en</language>
-    <enableDirectoryBrowsing>true</enableDirectoryBrowsing>
-    <databaseAddress>localhost</databaseAddress>
-    <autoOpenCmsClient>false</autoOpenCmsClient>
-    <textEditorPath>C:\Windows\System32\notepad.exe</textEditorPath>
-    <MTCFolderPath>C:\CMS\MTC\ADAPTER\</MTCFolderPath>
-    <MTCApplicationName>SCMA</MTCApplicationName>
-    <CMSConnectReady>false</CMSConnectReady>
-    <maxAlarmsRows>50000</maxAlarmsRows>
-    <alarmToDelete>5000</alarmToDelete>
-  </serverConfig>
-  <extSoftwares>
-      <software>
-        <longName>Calculator</longName>
-        <shortName>CAL</shortName>
-        <path>C:\Windows\System32\calc.exe</path>
-        <arguments></arguments>
-        <inMainMenuBar>true</inMainMenuBar>
-      </software>  
-      <software>
-        <longName>NotePad</longName>
-        <shortName>NP</shortName>
-        <path>C:\Windows\System32\notepad.exe</path>
-        <arguments></arguments>
-        <inMainMenuBar>true</inMainMenuBar>
-      </software>
-      <software>
-        <longName>MsPaint</longName>
-        <shortName>PA</shortName>
-        <path>C:\Windows\System32\mspaint.exe</path>
-        <arguments></arguments>
-        <inMainMenuBar>false</inMainMenuBar>
-      </software>
-      <software>
-        <longName>NotePad2</longName>
-        <shortName>NP2</shortName>
-        <path>C:\Windows\System32\notepad.exe</path>
-        <arguments></arguments>
-        <inMainMenuBar>false</inMainMenuBar>
-      </software>
+    <ncConfig>
+        <ncVendor>S7NET</ncVendor>
+        <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI/S7NET -->
+        <showNcHMI>false</showNcHMI>
+        <ncIpAddress>192.168.0.102</ncIpAddress>
+        <ncPort>102</ncPort>
+        <machineModel>Thermo 2020</machineModel>
+        <sharedPath>C:\CMS\Recipes\</sharedPath>
+        <sharedName>//PARTPRG:/</sharedName>
+        <installationDate>01/06/2020</installationDate>
+        <mgiOption>false</mgiOption>
+        <siemensKeyboardOption>false</siemensKeyboardOption>
+        <machineNumberHasLetters>false</machineNumberHasLetters>
+    </ncConfig>
+    <softwareProdConfig>
+        <enabled>false</enabled>
+        <path>C:\Program Files\Notepad++\notepad++.exe</path>
+    </softwareProdConfig>
+    <serverConfig>
+        <serverPort>9000</serverPort>
+        <serverAddress>*</serverAddress>
+        <language>en</language>
+        <enableDirectoryBrowsing>true</enableDirectoryBrowsing>
+        <databaseAddress>localhost</databaseAddress>
+        <autoOpenCmsClient>false</autoOpenCmsClient>
+        <textEditorPath>C:\Windows\System32\notepad.exe</textEditorPath>
+        <MTCFolderPath>C:\CMS\MTC\ADAPTER\</MTCFolderPath>
+        <MTCApplicationName>SCMA</MTCApplicationName>
+        <CMSConnectReady>false</CMSConnectReady>
+        <maxAlarmsRows>50000</maxAlarmsRows>
+        <alarmToDelete>5000</alarmToDelete>
+    </serverConfig>
+    <extSoftwares>
+        <software>
+            <longName>Calculator</longName>
+            <shortName>CAL</shortName>
+            <path>C:\Windows\System32\calc.exe</path>
+            <arguments></arguments>
+            <inMainMenuBar>true</inMainMenuBar>
+        </software>
+        <software>
+            <longName>NotePad</longName>
+            <shortName>NP</shortName>
+            <path>C:\Windows\System32\notepad.exe</path>
+            <arguments></arguments>
+            <inMainMenuBar>true</inMainMenuBar>
+        </software>
+        <software>
+            <longName>MsPaint</longName>
+            <shortName>PA</shortName>
+            <path>C:\Windows\System32\mspaint.exe</path>
+            <arguments></arguments>
+            <inMainMenuBar>false</inMainMenuBar>
+        </software>
+        <software>
+            <longName>NotePad2</longName>
+            <shortName>NP2</shortName>
+            <path>C:\Windows\System32\notepad.exe</path>
+            <arguments></arguments>
+            <inMainMenuBar>false</inMainMenuBar>
+        </software>
     </extSoftwares>
+    <additionalParameters>
+        <entry>
+            <key>warmerPlanSizeX</key>
+            <value>1500</value>
+        </entry>
+        <entry>
+            <key>warmerPlanSizeY</key>
+            <value>1200</value>
+        </entry>
+        <entry>
+            <key>resistSizeX</key>
+            <value>250</value>
+        </entry>
+        <entry>
+            <key>resistSizeY</key>
+            <value>60</value>
+        </entry>
+        <entry>
+            <key>warmerAutocompStartValue</key>
+            <value>30</value>
+        </entry>
+        <entry>
+            <key>warmerAutocompStep</key>
+            <value>5</value>
+        </entry>
+    </additionalParameters>
+    <unitOfMeasures>
+        <unitOfMeasure id="0" value="" />
+        <unitOfMeasure id="1" value="%" />
+        <unitOfMeasure id="2" value="mm" />
+        <unitOfMeasure id="3" value="°C" />
+        <unitOfMeasure id="4" value="Nm" />
+        <unitOfMeasure id="5" value="Bar" />
+        <unitOfMeasure id="6" value="mm/s" />
+        <unitOfMeasure id="7" value="mm/10" />
+        <unitOfMeasure id="8" value="Bar/10" />
+        <unitOfMeasure id="9" value="°C/10" />
+        <unitOfMeasure id="10" value="Nm/10" />
+    </unitOfMeasures>
+    <sampling>
+        <thread name="alarms" value="200" />
+        <thread name="axis" value="200" />
+        <thread name="area" value="500" />
+        <thread name="confReq" value="2000" />
+        <thread name="expMan" value="30000" />
+        <thread name="functionEnab" value="300" />
+        <thread name="gauges" value="500" />
+        <thread name="m154" value="500" />
+        <thread name="mCommands" value="250" />
+        <thread name="powerOn" value="500" />
+        <thread name="prodCycle" value="1000" />
+        <thread name="prodInfo" value="1000" />
+        <thread name="prodPanel" value="1000" />
+        <thread name="modules" value="200" />
+        <thread name="recipe" value="400" />
+        <thread name="scada" value="1000" />
+        <thread name="statusCommand" value="250" />
+        <thread name="userSK" value="250" />
+        <thread name="warmers" value="1500" />
+        <thread name="watchdog" value="250" />
+    </sampling>
 </serverConfig>

Thermo.Active.Config/Config/serverConfigValidator.xsd

@@ -63,10 +63,61 @@
                         </xs:sequence>
                     </xs:complexType>
                 </xs:element>
+                <xs:element name="additionalParameters" >
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:all>
+                                        <xs:element name="key" type="xs:string" />
+                                        <xs:element name="value" type="xs:string" />
+                                    </xs:all>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="unitOfMeasures">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="unitOfMeasure" minOccurs="0" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:complexContent>
+                                        <xs:extension base="umType"/>
+                                    </xs:complexContent>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="sampling" >
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="thread" minOccurs="0" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:complexContent>
+                                        <xs:extension base="sampleType"/>
+                                    </xs:complexContent>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
             </xs:all>
         </xs:complexType>
     </xs:element>
-
+    <xs:complexType name="umType">
+        <xs:attribute name="id" type="xs:integer" use="required">
+        </xs:attribute>
+        <xs:attribute name="value" type="xs:string" use="required">
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="sampleType">
+        <xs:attribute name="name" type="xs:string" use="required">
+        </xs:attribute>
+        <xs:attribute name="value" type="xs:integer" use="required">
+        </xs:attribute>
+    </xs:complexType>
     <xs:simpleType name="ncType" final="restriction" >
         <xs:restriction base="xs:string">
             <xs:enumeration value="DEMO" />

Thermo.Active.Config/ServerConfig.cs

@@ -11,6 +11,9 @@ namespace Thermo.Active.Config
         public static ServerConfigModel ServerStartupConfig;
         public static NcConfigModel NcConfig;
         public static List<ExtSoftwareModel> ExtSoftwaresConfig;
+        public static Dictionary<string, string> AdditionalParametersConfig;
+        public static Dictionary<int, string> UnitMeasuresConfig;
+        public static Dictionary<string, int> ThreadSamplingConfig;
         public static SoftwareProdConfigModel SoftwareProdConfig;
         public static MachineModel MachineConfig;
         public static List<MaintenanceConfigModel> MaintenancesConfig;
@@ -61,6 +64,7 @@ namespace Thermo.Active.Config
         public static List<RiskResistModel> RiskResistConfig;
         public static List<RiskChannelModel> RiskChannelConfig;
         public static List<RiskBoardModel> RiskBoardConfig;
+        public static List<AxesConfigModel> AxesConfig;
 
     }
 

Thermo.Active.Config/ServerConfigController.cs

@@ -38,6 +38,7 @@ namespace Thermo.Active.Config
                 ReadRecipeConfig();
                 ReadModBlockConfig();
                 ReadRiskConfig();
+                ReadAxesConfig();
                 // ReadCMSConnectConfig();
                 ReadMacros();
                 ReadScadaFile();
@@ -292,6 +293,8 @@ namespace Thermo.Active.Config
                     return "MULTIPLE_BUTTONS";
                 case "showValModal":
                     return "SHOW_VAL";
+                case "simpleModal":
+                    return "MODAL";
                 default:
                     return "REAL";
             }
@@ -368,6 +371,27 @@ namespace Thermo.Active.Config
                     InMainMenuBar = Convert.ToBoolean(x.Element("inMainMenuBar").Value),
                     Id = softwareId++.ToString()
                 }).ToList();
+
+            // carico additionals parameters
+            AdditionalParametersConfig = xmlConfigFile
+                .Descendants("additionalParameters")
+                .Elements("entry")
+                .Select(x => new KeyValuePair<string,string>(x.Element("key").Value,x.Element("value").Value))
+                .ToDictionary(x => x.Key, x => x.Value);
+
+            // carico unità di misura...
+            UnitMeasuresConfig = xmlConfigFile
+                .Descendants("unitOfMeasures")
+                .Elements("unitOfMeasure")
+                .Select(x => new KeyValuePair<int, string>(Convert.ToInt32(x.Attribute("id").Value), x.Attribute("value").Value))
+                .ToDictionary(x => x.Key, x => x.Value);
+
+            // carico conf periodi thread...
+            ThreadSamplingConfig = xmlConfigFile
+                .Descendants("sampling")
+                .Elements("thread")
+                .Select(x => new KeyValuePair<string, int>(x.Attribute("name").Value, Convert.ToInt32(x.Attribute("value").Value)))
+                .ToDictionary(x => x.Key, x => x.Value);
         }
 
         private static void ReadAreaConfig()
@@ -851,6 +875,25 @@ namespace Thermo.Active.Config
             }
         }
 
+        /// <summary>
+        /// Axes config setup from file
+        /// </summary>
+        private static void ReadAxesConfig()
+        {
+            XDocument xmlConfigFile = GetXmlHandlerWithValidator(AXES_CONFIG_SCHEMA_PATH, AXES_CONFIG_PATH);
+
+            // Read head config from XML file
+            AxesConfig = xmlConfigFile
+                .Root
+                .Elements()
+                .Select(x => new AxesConfigModel()
+                {
+                    Id = Convert.ToInt16(x.Attribute("id").Value),
+                    Name = x.Attribute("name").Value,
+                    Type = GetTActAxes_Type(x.Attribute("type").Value)
+                })
+                .ToList();
+        }
         private static void ReadCMSConnectConfig()
         {
             String _tempUSR, _tempPSW;

Thermo.Active.Config/Thermo.Active.Config.csproj

@@ -207,6 +207,10 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="Config\axesConfigValidator.xsd">
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
     <None Include="Config\Recipes\template.tpl">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

Thermo.Active.Core/ThreadsFunctions.cs

@@ -15,6 +15,7 @@ using Thermo.Active.Database.Controllers;
 using Thermo.Active.Model.DTOModels;
 using Thermo.Active.Model.DTOModels.AlarmModels;
 using Thermo.Active.Model.DTOModels.Scada;
+using Thermo.Active.Model.DTOModels.ThAxes;
 using Thermo.Active.Model.DTOModels.ThModules;
 using Thermo.Active.Model.DTOModels.ThProd;
 using Thermo.Active.Model.DTOModels.ThRecipe;
@@ -28,6 +29,7 @@ using static Thermo.Active.Utils.ExceptionManager;
 
 public static class ThreadsFunctions
 {
+    public static int axisRtCounter = 0;
     public static int recipeRtCounter = 0;
     public static int modulesRtCounter = 0;
     public static bool reconnectionIsRunning = false;
@@ -36,6 +38,20 @@ public static class ThreadsFunctions
     private static ConcurrentDictionary<string, long> Counter = new ConcurrentDictionary<string, long>();
 
     private static Thread ConnThread;
+    /// <summary>
+    /// restituisce il periodo di campionamento SE configurato, altrimenti 1000 ms
+    /// </summary>
+    /// <param name="threadName"></param>
+    /// <returns></returns>
+    private static int samplMsec(string threadName)
+    {
+        int answ = 500;
+        if (ThreadSamplingConfig.ContainsKey(threadName))
+        {
+            answ = ThreadSamplingConfig[threadName];
+        }
+        return answ;
+    }
 
     #region Functions
 
@@ -76,7 +92,7 @@ public static class ThreadsFunctions
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
 
                 // Wait
-                Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("watchdog"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException ex)
@@ -84,7 +100,6 @@ public static class ThreadsFunctions
             ncAdapter.Dispose();
         }
     }
-
     /// <summary>
     /// Manage status/command words for actions
     /// </summary>
@@ -117,7 +132,7 @@ public static class ThreadsFunctions
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
 
                 // Wait
-                Thread.Sleep(CalcSleepTime(250, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("statusCommand"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException ex)
@@ -125,7 +140,6 @@ public static class ThreadsFunctions
             ncAdapter.Dispose();
         }
     }
-
     /// <summary>
     /// Manage action for conf request
     /// </summary>
@@ -160,49 +174,7 @@ public static class ThreadsFunctions
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
 
                 // Wait
-                Thread.Sleep(CalcSleepTime(2000, (int)sw.ElapsedMilliseconds));
-            }
-        }
-        catch (ThreadAbortException ex)
-        {
-            ncAdapter.Dispose();
-        }
-    }
-    /// <summary>
-    /// Manage action for conf request
-    /// </summary>
-    public static void ManageProdUpdate()
-    {
-        NcAdapter ncAdapter = new NcAdapter();
-        Stopwatch sw = new Stopwatch();
-        try
-        {
-            CmsError libraryError = ncAdapter.Connect();
-            if (libraryError.errorCode != 0)
-                ManageLibraryError(libraryError);
-
-            while (true)
-            {
-                sw.Restart();
-
-                // Check if client is connected
-                if (ncAdapter.numericalControl.NC_IsConnected())
-                {
-                    //// Manage status command
-                    //libraryError = ncAdapter.ManageProdUpdate();
-                    //if (libraryError.errorCode != 0)
-                    //    ManageLibraryError(libraryError);
-                }
-                else
-                    RestoreConnection();
-
-                sw.Stop();
-
-                //Update thread timer
-                UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
-
-                // Wait
-                Thread.Sleep(CalcSleepTime(1000, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("confReq"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException ex)
@@ -245,7 +217,7 @@ public static class ThreadsFunctions
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
 
                 // Wait
-                Thread.Sleep(CalcSleepTime(200, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("alarms"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -286,7 +258,7 @@ public static class ThreadsFunctions
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
 
                 // Wait
-                Thread.Sleep(CalcSleepTime(400, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("powerOn"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -374,7 +346,7 @@ public static class ThreadsFunctions
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
 
                 // Wait
-                Thread.Sleep(CalcSleepTime(200, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("functionEnab"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -425,7 +397,7 @@ public static class ThreadsFunctions
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
 
                 // Wait
-                Thread.Sleep(30000);
+                Thread.Sleep(CalcSleepTime(samplMsec("expMan"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -472,7 +444,7 @@ public static class ThreadsFunctions
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
 
                 // Wait
-                Thread.Sleep(CalcSleepTime(200, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("userSK"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -480,7 +452,10 @@ public static class ThreadsFunctions
             ncAdapter.Dispose();
         }
     }
-    public static void ReadAxesNamesData()
+    /// <summary>
+    /// Lettura valori ASSI (tutti i disponibili)
+    /// </summary>
+    public static void ReadAxisInfoData()
     {
         NcAdapter ncAdapter = new NcAdapter();
         Stopwatch sw = new Stopwatch();
@@ -494,17 +469,23 @@ public static class ThreadsFunctions
 
             while (true)
             {
+                // ogni n counter leggo anche dati NON RT
+                axisRtCounter--;
+                bool onlyRt = axisRtCounter > 0;
+                //check reset...
+                axisRtCounter = axisRtCounter < 0 ? 4 : axisRtCounter;
+
                 sw.Restart();
 
                 if (ncAdapter.numericalControl.NC_IsConnected())
                 {
                     // Get Data from config and PLC
-                    libraryError = ncAdapter.ReadAxisData(out List<DTOAxisNameModel> axes);
+                    libraryError = ncAdapter.ReadAxisData(onlyRt, out Dictionary<int, DTOAxisInfoModel> axisData);
                     if (libraryError.errorCode != 0)
                         ManageLibraryError(libraryError);
                     else
                         // Send through signalR
-                        MessageServices.Current.Publish(SEND_AXIS_NAMES_DATA, null, axes);
+                        MessageServices.Current.Publish(SEND_AXIS_INFO, null, axisData);
                 }
                 else
                     RestoreConnection();
@@ -515,50 +496,7 @@ public static class ThreadsFunctions
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
 
                 // Wait
-                Thread.Sleep(CalcSleepTime(800, (int)sw.ElapsedMilliseconds));
-            }
-        }
-        catch (ThreadAbortException)
-        {
-            ncAdapter.Dispose();
-        }
-    }
-    public static void ReadAxesPositionsData()
-    {
-        NcAdapter ncAdapter = new NcAdapter();
-        Stopwatch sw = new Stopwatch();
-
-        try
-        {
-            // Try connection
-            CmsError libraryError = ncAdapter.Connect();
-            if (libraryError.errorCode != 0)
-                ManageLibraryError(libraryError);
-
-            while (true)
-            {
-                sw.Restart();
-
-                if (ncAdapter.numericalControl.NC_IsConnected())
-                {
-                    // Get Data from NC
-                    libraryError = ncAdapter.GetAxesPositionsBySelectedProcess(out DTOAxesModel axesPositions);
-                    if (libraryError.errorCode != 0)
-                        ManageLibraryError(libraryError);
-                    else
-                        // Send through signalR
-                        MessageServices.Current.Publish(SEND_AXES, null, axesPositions);
-                }
-                else
-                    RestoreConnection();
-
-                sw.Stop();
-
-                //Update thread timer
-                UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
-
-                // Wait
-                Thread.Sleep(CalcSleepTime(100, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("axis"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -602,7 +540,7 @@ public static class ThreadsFunctions
                 //Update thread timer
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
                 // Wait
-                Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("scada"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -645,7 +583,7 @@ public static class ThreadsFunctions
                 //Update thread timer
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
                 // Wait
-                Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("gauges"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -687,7 +625,7 @@ public static class ThreadsFunctions
                 //Update thread timer
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
                 // Wait 500 ms
-                Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("prodPanel"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -729,7 +667,7 @@ public static class ThreadsFunctions
                 //Update thread timer
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
                 // Wait
-                Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("prodInfo"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -771,7 +709,7 @@ public static class ThreadsFunctions
                 //Update thread timer
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
                 // Wait
-                Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("prodCycle"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -817,6 +755,14 @@ public static class ThreadsFunctions
 
                     MessageServices.Current.Publish(SEND_THERMO_RECIPE_OVERWIEW, null, currOverview);
 
+                    // ora gestisco la lettura della overview di "modificata
+                    DTORecipeStatus message = new DTORecipeStatus()
+                    {
+                        recipeName = NcAdapter.RecipeLiveData.RecipeName,
+                        hasChanged = NcAdapter.RecipeLiveData.hasChanged
+                    };
+
+                    MessageServices.Current.Publish(SEND_THERMO_RECIPE_CHANGED, null, message);
                 }
                 else
                     RestoreConnection();
@@ -826,7 +772,7 @@ public static class ThreadsFunctions
                 // Update thread timer
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
                 // Wait
-                Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("recipe"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -867,7 +813,7 @@ public static class ThreadsFunctions
                 // Update thread timer
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
                 // Wait
-                Thread.Sleep(CalcSleepTime(1800, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("warmers"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -908,7 +854,7 @@ public static class ThreadsFunctions
                 // Update thread timer
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
                 // Wait
-                Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("area"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -949,7 +895,7 @@ public static class ThreadsFunctions
                 // Update thread timer
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
                 // Wait
-                Thread.Sleep(CalcSleepTime(250, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("modules"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -957,7 +903,6 @@ public static class ThreadsFunctions
             ncAdapter.Dispose();
         }
     }
-
     public static void ReadMComandsData()
     {
         NcAdapter ncAdapter = new NcAdapter();
@@ -996,7 +941,7 @@ public static class ThreadsFunctions
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
 
                 // Wait
-                Thread.Sleep(CalcSleepTime(200, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("mCommands"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -1004,7 +949,6 @@ public static class ThreadsFunctions
             ncAdapter.Dispose();
         }
     }
-
     public static void ReadM154Data()
     {
         NcAdapter ncAdapter = new NcAdapter();
@@ -1171,7 +1115,7 @@ public static class ThreadsFunctions
                 UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
 
                 // Wait
-                Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds));
+                Thread.Sleep(CalcSleepTime(samplMsec("m154"), (int)sw.ElapsedMilliseconds));
             }
         }
         catch (ThreadAbortException)
@@ -1179,8 +1123,6 @@ public static class ThreadsFunctions
             ncAdapter.Dispose();
         }
     }
-
-
     public static void SetupCmsConnect()
     {
         NcAdapter ncAdapter = new NcAdapter();

Thermo.Active.Core/ThreadsHandler.cs

@@ -16,13 +16,11 @@ namespace Thermo.Active.Core
                 ThreadsFunctions.ReadAlarms,
                 ThreadsFunctions.ReadPowerOnData,
                 ThreadsFunctions.StatThread,
-                ThreadsFunctions.ReadProcessesPPStatus,
+                //ThreadsFunctions.ReadProcessesPPStatus,
                 ThreadsFunctions.ReadEnabledFunctionality,
                 ThreadsFunctions.ReadExpiredMaintenances,
-                //ThreadsFunctions.ReadAxesPositionsData,
                 ThreadsFunctions.ReadUserSoftKeysData,
                 //ThreadsFunctions.ReadHeadsData,
-                //ThreadsFunctions.ReadAxesNamesData,
                 //ThreadsFunctions.ReadActiveProgramData,
                 //ThreadsFunctions.ReadPartProgramQueueData,
                 // ThreadsFunctions.ReadNcSoftKeysData,
@@ -36,6 +34,7 @@ namespace Thermo.Active.Core
                 ThreadsFunctions.ReadModulesData,
                 ThreadsFunctions.ReadScadaData,
                 ThreadsFunctions.ReadMComandsData,
+                ThreadsFunctions.ReadAxisInfoData,
                 ThreadsFunctions.ReadM154Data // levare?
 
             };

Thermo.Active.Database/Controllers/ProdInfoController.cs

@@ -1,190 +1,192 @@
 using System;
 using System.Collections.Generic;
+using System.Data.Entity.Migrations;
 using System.Linq;
 using Thermo.Active.Model.DatabaseModels;
 
 namespace Thermo.Active.Database.Controllers
 {
-    public class ProdInfoController : IDisposable
+  public class ProdInfoController : IDisposable
+  {
+    private DatabaseContext dbCtx;
+
+    public ProdInfoController()
     {
-        private DatabaseContext dbCtx;
-
-        public ProdInfoController()
-        {
-            // Initialize database context
-            dbCtx = new DatabaseContext();
-        }
-
-        public void Dispose()
-        {
-            // Clear database context
-            dbCtx.Dispose();
-        }
-        /// <summary>
-        /// Get record by NumDone
-        /// </summary>
-        /// <param name="num"></param>
-        /// <returns></returns>
-        public ProdInfoModel FindByNumDone(int num)
-        {
-            return dbCtx
-                .ProdInfo
-                .Where(x => x.NumDone == num)
-                .SingleOrDefault();
-        }
-        /// <summary>
-        /// Get historical paginated data from DB (DESC ordered
-        /// </summary>
-        /// <param name="numStart"></param>
-        /// <param name="numRecord"></param>
-        /// <returns></returns>
-        public List<ProdInfoModel> GetPaginated(int numStart, int numRecord)
-        {
-            // cehck numEnd
-            int numEnd = numStart - numRecord;
-            if (numEnd < 0)
-                numEnd = 0;
-            // retrieve
-            return dbCtx
-                .ProdInfo
-                .Where(x => x.NumDone <= numStart && x.NumDone > numEnd)
-                .OrderByDescending(x => x.DtEvent)
-                .ToList();
-        }
-        /// <summary>
-        /// Create new prodInfo record on DB
-        /// </summary>
-        /// <param name="NumTarget"></param>
-        /// <param name="NumDone"></param>
-        /// <param name="TimeWarm"></param>
-        /// <param name="TimeVent"></param>
-        /// <param name="TimeVacuum"></param>
-        /// <param name="TimeCycleGross"></param>
-        /// <param name="TimeCycleNet"></param>
-        /// <param name="MaterialTempEndWarm"></param>
-        /// <param name="MaterialTempEndVent"></param>
-        /// <param name="MoldTemp"></param>
-        /// <param name="VacuumReadVal"></param>
-        /// <param name="MouldEnergyOUT"></param>
-        /// <param name="MouldEnergyIN"></param>
-        /// <param name="IsScrap"></param>
-        /// <returns></returns>
-        public ProdInfoModel Create(short NumTarget, short NumDone, int TimeWarm, int TimeVent, int TimeVacuum, int TimeCycleGross, int TimeCycleNet, double MaterialTempEndWarm, double MaterialTempEndVent, double MoldTemp, double VacuumReadVal, double MouldEnergyOUT, double MouldEnergyIN, bool IsScrap)
-        {
-            // Create database machine model
-            ProdInfoModel prodData = new ProdInfoModel()
-            {
-                DtEvent = DateTime.Now,
-                NumTarget = NumTarget,
-                NumDone = NumDone,
-                TimeWarm = TimeWarm,
-                TimeVent = TimeVent,
-                TimeVacuum = TimeVacuum,
-                TimeCycleGross = TimeCycleGross,
-                TimeCycleNet = TimeCycleNet,
-                MaterialTempEndWarm = MaterialTempEndWarm,
-                MaterialTempEndVent = MaterialTempEndVent,
-                MoldTemp = MoldTemp,
-                VacuumReadVal = VacuumReadVal,
-                MouldEnergyOUT = MouldEnergyOUT,
-                MouldEnergyIN = MouldEnergyIN,
-                IsScrap = IsScrap
-            };
-            try
-            {
-                // Add to database
-                dbCtx.ProdInfo.Add(prodData);
-                // Commit changes
-                dbCtx.SaveChanges();
-            }
-            catch
-            { }
-
-            return prodData;
-        }
-        /// <summary>
-        /// Process table and set as scrap by num value
-        /// </summary>
-        /// <param name="maxKeep"></param>
-        /// <returns></returns>
-        public bool SetScrap(int num, bool isScrap)
-        {
-            bool answ = false;
-
-            var currRecord = dbCtx
-                .ProdInfo
-                .Where(x => x.NumDone == num)
-                .SingleOrDefault();
-            try
-            {
-                if (currRecord != null)
-                {
-                    currRecord.IsScrap = isScrap;
-                }
-                // save!
-                dbCtx.SaveChanges();
-                answ = true;
-            }
-            catch
-            { }
-            return answ;
-        }
-
-        /// <summary>
-        /// Process table and keep only maxKeep most recent ones
-        /// </summary>
-        /// <param name="maxKeep"></param>
-        /// <returns></returns>
-        public bool PurgeOldest(int maxKeep)
-        {
-            bool answ = false;
-
-            // check if purge needed
-            int numRec = dbCtx.ProdInfo.Count();
-            if (numRec > maxKeep)
-            {
-                ProdInfoModel firstToDelete = (ProdInfoModel)(from p in dbCtx.ProdInfo
-                                                              orderby p.DtEvent descending
-                                                              select p).Skip(maxKeep).Take(1);
-
-                // call deletion
-                dbCtx
-                    .ProdInfo
-                    .RemoveRange(
-                        dbCtx
-                        .ProdInfo
-                        .Where(x => x.DtEvent <= firstToDelete.DtEvent)
-                    );
-
-                try
-                {
-                    // save!
-                    dbCtx.SaveChanges();
-                    answ = true;
-                }
-                catch
-                { }
-            }
-            return answ;
-        }
-
-        /// <summary>
-        /// Process table and delete all record (truncate)
-        /// </summary>
-        /// <returns></returns>
-        public bool PurgeAll()
-        {
-            bool answ = false;
-
-            try
-            {
-                dbCtx
-                    .Database
-                    .ExecuteSqlCommand("TRUNCATE TABLE prodInfo");
-            }
-            catch
-            { }
-            return answ;
-        }
+      // Initialize database context
+      dbCtx = new DatabaseContext();
     }
+
+    public void Dispose()
+    {
+      // Clear database context
+      dbCtx.Dispose();
+    }
+    /// <summary>
+    /// Get record by NumDone
+    /// </summary>
+    /// <param name="num"></param>
+    /// <returns></returns>
+    public ProdInfoModel FindByNumDone(int num)
+    {
+      return dbCtx
+          .ProdInfo
+          .Where(x => x.NumDone == num)
+          .SingleOrDefault();
+    }
+    /// <summary>
+    /// Get historical paginated data from DB (DESC ordered
+    /// </summary>
+    /// <param name="numStart"></param>
+    /// <param name="numRecord"></param>
+    /// <returns></returns>
+    public List<ProdInfoModel> GetPaginated(int numStart, int numRecord)
+    {
+      // cehck numEnd
+      int numEnd = numStart - numRecord;
+      if (numEnd < 0)
+        numEnd = 0;
+      // retrieve
+      return dbCtx
+          .ProdInfo
+          .Where(x => x.NumDone <= numStart && x.NumDone > numEnd)
+          .OrderByDescending(x => x.DtEvent)
+          .ToList();
+    }
+    /// <summary>
+    /// Create new prodInfo record on DB
+    /// </summary>
+    /// <param name="NumTarget"></param>
+    /// <param name="NumDone"></param>
+    /// <param name="TimeWarm"></param>
+    /// <param name="TimeVent"></param>
+    /// <param name="TimeVacuum"></param>
+    /// <param name="TimeCycleGross"></param>
+    /// <param name="TimeCycleNet"></param>
+    /// <param name="MaterialTempEndWarm"></param>
+    /// <param name="MaterialTempEndVent"></param>
+    /// <param name="MoldTemp"></param>
+    /// <param name="VacuumReadVal"></param>
+    /// <param name="MouldEnergyOUT"></param>
+    /// <param name="MouldEnergyIN"></param>
+    /// <param name="IsScrap"></param>
+    /// <returns></returns>
+    public ProdInfoModel Create(short NumTarget, short NumDone, int TimeWarm, int TimeVent, int TimeVacuum, int TimeCycleGross, int TimeCycleNet, double MaterialTempEndWarm, double MaterialTempEndVent, double MoldTemp, double VacuumReadVal, double MouldEnergyOUT, double MouldEnergyIN, bool IsScrap)
+    {
+      // Create database machine model
+      ProdInfoModel prodData = new ProdInfoModel()
+      {
+        DtEvent = DateTime.Now,
+        NumTarget = NumTarget,
+        NumDone = NumDone,
+        TimeWarm = TimeWarm,
+        TimeVent = TimeVent,
+        TimeVacuum = TimeVacuum,
+        TimeCycleGross = TimeCycleGross,
+        TimeCycleNet = TimeCycleNet,
+        MaterialTempEndWarm = MaterialTempEndWarm,
+        MaterialTempEndVent = MaterialTempEndVent,
+        MoldTemp = MoldTemp,
+        VacuumReadVal = VacuumReadVal,
+        MouldEnergyOUT = MouldEnergyOUT,
+        MouldEnergyIN = MouldEnergyIN,
+        IsScrap = IsScrap
+      };
+      try
+      {
+        // Add to database
+        dbCtx.ProdInfo.AddOrUpdate(prodData);
+        //dbCtx.ProdInfo.Add(prodData);
+        // Commit changes
+        dbCtx.SaveChanges();
+      }
+      catch
+      { }
+
+      return prodData;
+    }
+    /// <summary>
+    /// Process table and set as scrap by num value
+    /// </summary>
+    /// <param name="maxKeep"></param>
+    /// <returns></returns>
+    public bool SetScrap(int num, bool isScrap)
+    {
+      bool answ = false;
+
+      var currRecord = dbCtx
+          .ProdInfo
+          .Where(x => x.NumDone == num)
+          .SingleOrDefault();
+      try
+      {
+        if (currRecord != null)
+        {
+          currRecord.IsScrap = isScrap;
+        }
+        // save!
+        dbCtx.SaveChanges();
+        answ = true;
+      }
+      catch
+      { }
+      return answ;
+    }
+
+    /// <summary>
+    /// Process table and keep only maxKeep most recent ones
+    /// </summary>
+    /// <param name="maxKeep"></param>
+    /// <returns></returns>
+    public bool PurgeOldest(int maxKeep)
+    {
+      bool answ = false;
+
+      // check if purge needed
+      int numRec = dbCtx.ProdInfo.Count();
+      if (numRec > maxKeep)
+      {
+        ProdInfoModel firstToDelete = (ProdInfoModel)(from p in dbCtx.ProdInfo
+                                                      orderby p.DtEvent descending
+                                                      select p).Skip(maxKeep).Take(1);
+
+        // call deletion
+        dbCtx
+            .ProdInfo
+            .RemoveRange(
+                dbCtx
+                .ProdInfo
+                .Where(x => x.DtEvent <= firstToDelete.DtEvent)
+            );
+
+        try
+        {
+          // save!
+          dbCtx.SaveChanges();
+          answ = true;
+        }
+        catch
+        { }
+      }
+      return answ;
+    }
+
+    /// <summary>
+    /// Process table and delete all record (truncate)
+    /// </summary>
+    /// <returns></returns>
+    public bool PurgeAll()
+    {
+      bool answ = false;
+
+      try
+      {
+        dbCtx
+            .Database
+            .ExecuteSqlCommand("TRUNCATE TABLE prodInfo");
+      }
+      catch
+      { }
+      return answ;
+    }
+  }
 }

Thermo.Active.Model/ConfigModels/AxesConfigModel.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using static Thermo.Active.Model.Constants;
+
+namespace Thermo.Active.Model.ConfigModels
+{
+    public class AxesConfigModel
+    {
+        public int Id;
+        public string Name { get; set; }
+        public bool IsSelectable { get; set; } = true;
+        public TACT_AXES_TYPE Type { get; set; }      
+    }
+}

Thermo.Active.Model/Constants.cs

@@ -102,6 +102,12 @@ namespace Thermo.Active.Model
             COOLING,
             EXTRACTION
         }
+        public enum TACT_AXES_TYPE
+        {
+            NA = 0,
+            LINEAR,
+            ROTATIONAL
+        }
 
         [JsonConverter(typeof(StringEnumConverter))]
         public enum TACT_PROD_CATEGORY
@@ -272,6 +278,10 @@ namespace Thermo.Active.Model
         public const string MACROS_CONFIG_SCHEMA_PATH = RESOURCE_DIRECTORY + "macrosConfigValidator.xsd";
         public const string MACROS_CONFIG_PATH = CONFIG_DIRECTORY + "macrosConfig.xml";
 
+
+        public const string AXES_CONFIG_SCHEMA_PATH = RESOURCE_DIRECTORY + @"axesConfigValidator.xsd";
+        public const string AXES_CONFIG_PATH = CONFIG_DIRECTORY + "axesConfig.xml";
+
         public const string MAIN_PROGRAM_CONFIG_PATH = CONFIG_DIRECTORY + "customMainProgram.txt";
 
 
@@ -300,14 +310,13 @@ namespace Thermo.Active.Model
 
         public const string SEND_POWER_ON_DATA = "SEND_POWER_ON_DATA";
         public const string SEND_GENERIC_DATA = "SEND_GENERIC_DATA";
-        public const string SEND_AXES = "SEND_AXES";
         public const string SEND_PROCESSES_DATA = "SEND_PROCESSES_STATUS";
         public const string SEND_FUNCTIONALITY_DATA = "SEND_FUNCTION_DATA";
         public const string SEND_EXPIRED_MAINTENANCES_DATA = "SEND_EXPIRED_MAINTENANCES_DATA";
         public const string SEND_USER_SOFTKEYS_DATA = "SEND_USER_SOFTKEYS_DATA";
         public const string SEND_NC_SOFTKEYS_DATA = "SEND_NC_SOFTKEYS_DATA";
         public const string SEND_HEADS_DATA = "SEND_HEADS_DATA";
-        public const string SEND_AXIS_NAMES_DATA = "SEND_AXIS_NAMES_DATA";
+        public const string SEND_AXIS_INFO = "SEND_AXIS_INFO";
         public const string SEND_ACTIVE_PROGRAM_DATA = "SEND_ACTIVE_PROGRAM_DATA";
         public const string SEND_QUEUE_DATA = "SEND_QUEUE_DATA";
         public const string SEND_M155_DATA = "SEND_M155_DATA";
@@ -317,6 +326,7 @@ namespace Thermo.Active.Model
         // MVVM Messages for Thermo active specs
         public const string SEND_THERMO_RECIPE_FULL = "SEND_THERMO_RECIPE_FULL";
         public const string SEND_THERMO_RECIPE_OVERWIEW = "SEND_THERMO_RECIPE_OVERWIEW";
+        public const string SEND_THERMO_RECIPE_CHANGED = "SEND_THERMO_RECIPE_CHANGED";
         public const string SEND_THERMO_MODULE_DATA = "SEND_THERMO_MODULE_DATA";
         public const string SEND_THERMO_WARMERS_DATA = "SEND_THERMO_WARMERS_DATA";
         public const string SEND_THERMO_AREA_DATA = "SEND_THERMO_AREA_DATA";
@@ -381,7 +391,7 @@ namespace Thermo.Active.Model
 
         public static readonly string[] VALID_FILE_EXTENSIONS = { "", ".txt", ".cnc", ".ini", ".mpf", ".spf" };
         public static readonly string[] VALID_IMAGE_EXTENSIONS = { ".jpg", ".jpeg", ".png", ".bmp", ".gif" };
-        public const double EPSILON = 0.001;
+        public const double EPSILON = 0.1;
         public static string QUEUE_FILE_NAME = "pp";
         public const string JOB_MAIN_FILENAME = "main.cnc";
         public const string JOB_METADATA_FILENAME = "metadata.json";

Thermo.Active.Model/DTOModels/DTOAxisNameModel.cs

@@ -1,33 +0,0 @@
-using static CMS_CORE_Library.Models.DataStructures;
-
-namespace Thermo.Active.Model.DTOModels
-{
-    public class DTOAxisNameModel : AxisModel
-    {
-        public new string Type;
-
-        public override bool Equals(object obj)
-        {
-
-            // Object is not a DTOAxisNameModel instance
-            if (!(obj is DTOAxisNameModel item))
-                return false;
-
-            if (item.Id != Id)
-                return false;
-
-            if (item.Name != Name)
-                return false;
-
-            if (item.IsSelectable != IsSelectable)
-                return false;
-
-            return true;
-        }
-
-        public override int GetHashCode()
-        {
-            return base.GetHashCode();
-        }
-    }
-}

Thermo.Active.Model/DTOModels/DTOClientConfigurationModel.cs

@@ -20,6 +20,7 @@ namespace Thermo.Active.Model.DTOModels
         public bool SiemensKeyboardOption { get; set; }
 
         public List<ExtSoftwareModel> ExtSoftwares { get; set; }
+        public Dictionary<string, string> AdditionalParameters { get; set; }
 
         public CultureInfo DefaultLanguage
         {

Thermo.Active.Model/DTOModels/Scada/DTOScadaModel.cs

@@ -78,7 +78,6 @@ namespace Thermo.Active.Model.DTOModels.Scada
     //        Inputs = new List<DTOScadaInputModel>();
     //    }
     //}
-
     public class DTOScadaButtonModel
     {
         public int Id { get; set; }

Thermo.Active.Model/DTOModels/ThAxes/DTOAxisInfoModel.cs

@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static Thermo.Active.Model.Constants;
+
+namespace Thermo.Active.Model.DTOModels.ThAxes
+{
+    public class DTOAxisInfoModel
+    {
+        /// <summary>
+        /// Actual position
+        /// </summary>
+        public int ID { get; set; } = 0;
+        /// <summary>
+        /// Actual position
+        /// </summary>
+        public string name { get; set; } = "";
+        /// <summary>
+        /// Type of axis
+        /// </summary>
+        public string type { get; set; } = "";
+        /// <summary>
+        /// Actual position
+        /// </summary>
+        public double position { get; set; } = 0;
+        /// <summary>
+        /// Actual Speed
+        /// </summary>
+        public double speed { get; set; } = 0;
+        /// <summary>
+        /// Actual Load
+        /// </summary>
+        public double load { get; set; } = 0;
+        /// <summary>
+        /// Error code (0=none)
+        /// </summary>
+        public int errorCode { get; set; } = 0;
+        /// <summary>
+        /// Movement
+        /// </summary>
+        public int movPhase { get; set; } = 0;
+        /// <summary>
+        /// Status Word
+        /// </summary>
+        public int statusCode { get; set; } = 0;
+
+        public override bool Equals(object obj)
+        {
+            // Object is not a GaugeModel instance
+            if (!(obj is DTOAxisInfoModel item))
+                return false;
+            if (ID != item.ID)
+                return false;
+            if (name != item.name)
+                return false;
+            if (Math.Round(Math.Abs(position - item.position), 1) >= Constants.EPSILON)
+                return false;
+            if (Math.Round(Math.Abs(speed - item.speed), 1) >= Constants.EPSILON)
+                return false;
+            if (Math.Round(Math.Abs(load - item.load), 1) >= Constants.EPSILON)
+                return false;
+            if (errorCode != item.errorCode)
+                return false;
+            if (movPhase != item.movPhase)
+                return false;
+            if (statusCode != item.statusCode)
+                return false;
+
+
+            return true;
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+
+
+#if false
+        private bool CheckDictInt(IDictionary<string, int> x, IDictionary<string, int> y)
+        {
+            // early-exit checks
+            if (y == null)
+                return x == null;
+            if (x == null)
+                return false;
+
+            if (x.Count != y.Count)
+                return false;
+
+            // Check keys are the same
+            foreach (string k in x.Keys)
+                if (!y.ContainsKey(k))
+                    return false;
+
+            // Check values are different
+            foreach (string k in x.Keys)
+            {
+                if (y[k] != x[k])
+                    return false;
+            }
+
+            return true;
+        }
+        public bool CheckDictDouble(IDictionary<string, double> x, IDictionary<string, double> y)
+        {
+            // early-exit checks
+            if (y == null)
+                return x == null;
+            if (x == null)
+                return false;
+
+            if (x.Count != y.Count)
+                return false;
+
+            // Check keys are the same
+            foreach (string k in x.Keys)
+                if (!y.ContainsKey(k))
+                    return false;
+
+            // Check values are different
+            foreach (string k in x.Keys)
+            {
+                double a = Math.Abs(y[k] - x[k]);
+
+                if (Math.Round(a, 3) >= Constants.EPSILON)
+                    return false;
+            }
+
+            return true;
+        } 
+#endif
+    }
+}

Thermo.Active.Model/DTOModels/ThModules/DTOModulesBlock.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using static Thermo.Active.Model.Constants;
 
@@ -52,13 +53,13 @@ namespace Thermo.Active.Model.DTOModels.ThModules
                 return false;
             if (NumDec != item.NumDec)
                 return false;
-            if (ActualDelay != item.ActualDelay)
+            if (Math.Round(Math.Abs(ActualDelay - item.ActualDelay), 1) >= Constants.EPSILON)
                 return false;
-            if (ActualDuration != item.ActualDuration)
+            if (Math.Round(Math.Abs(ActualDuration - item.ActualDuration), 1) >= Constants.EPSILON)
                 return false;
-            if (EstimatedDelay != item.EstimatedDelay)
+            if (Math.Round(Math.Abs(EstimatedDelay - item.EstimatedDelay), 1) >= Constants.EPSILON)
                 return false;
-            if (EstimatedDuration != item.EstimatedDuration)
+            if (Math.Round(Math.Abs(EstimatedDuration - item.EstimatedDuration), 1) >= Constants.EPSILON)
                 return false;
             if (!Enumerable.SequenceEqual(PrecedingId, item.PrecedingId))
                 return false;

Thermo.Active.Model/DTOModels/ThProd/DTOProdInfo.cs

@@ -39,27 +39,27 @@ namespace Thermo.Active.Model.DTOModels.ThProd
                 return false;
             if (NumDone != item.NumDone)
                 return false;
-            if (TimeWarm != item.TimeWarm)
+            if (Math.Round(Math.Abs(TimeWarm - item.TimeWarm), 1) >= Constants.EPSILON)
                 return false;
-            if (TimeVent != item.TimeVent)
+            if  (Math.Round(Math.Abs(TimeVent - item.TimeVent), 1) >= Constants.EPSILON)
                 return false;
-            if (TimeVacuum != item.TimeVacuum)
+            if (Math.Round(Math.Abs(TimeVacuum - item.TimeVacuum), 1) >= Constants.EPSILON) 
                 return false;
-            if (TimeCycleGross != item.TimeCycleGross)
+            if (Math.Round(Math.Abs(TimeCycleGross - item.TimeCycleGross), 1) >= Constants.EPSILON) 
                 return false;
-            if (TimeCycleNet != item.TimeCycleNet)
+            if (Math.Round(Math.Abs(TimeCycleNet - item.TimeCycleNet), 1) >= Constants.EPSILON) 
                 return false;
-            if (MaterialTempEndWarm != item.MaterialTempEndWarm)
+            if (Math.Round(Math.Abs(MaterialTempEndWarm - item.MaterialTempEndWarm), 1) >= Constants.EPSILON) 
                 return false;
-            if (MaterialTempEndVent != item.MaterialTempEndVent)
+            if (Math.Round(Math.Abs(MaterialTempEndVent - item.MaterialTempEndVent), 1) >= Constants.EPSILON)
                 return false;
-            if (MoldTemp != item.MoldTemp)
+            if (Math.Round(Math.Abs(MoldTemp - item.MoldTemp), 1) >= Constants.EPSILON)
                 return false;
-            if (VacuumReadVal != item.VacuumReadVal)
+            if (Math.Round(Math.Abs(VacuumReadVal - item.VacuumReadVal), 1) >= Constants.EPSILON) 
                 return false;
-            if (MouldEnergyOUT != item.MouldEnergyOUT)
+            if (Math.Round(Math.Abs(MouldEnergyOUT - item.MouldEnergyOUT), 1) >= Constants.EPSILON)
                 return false;
-            if (MouldEnergyIN != item.MouldEnergyIN)
+            if (Math.Round(Math.Abs(MouldEnergyIN - item.MouldEnergyIN), 1) >= Constants.EPSILON)
                 return false;
             if (IsScrap != item.IsScrap)
                 return false;

Thermo.Active.Model/DTOModels/ThProd/DTOThermoPanelProd.cs

@@ -30,17 +30,17 @@ namespace Thermo.Active.Model.DTOModels.ThProd
                 return false;
             if (InizioProd != item.InizioProd)
                 return false;
-            if (StimaDurata != item.StimaDurata)
+            if (Math.Round(Math.Abs(StimaDurata - item.StimaDurata), 1) >= Constants.EPSILON)
                 return false;
-            if (TempAct != item.TempAct)
+            if (Math.Round(Math.Abs(TempAct - item.TempAct), 1) >= Constants.EPSILON)
                 return false;
-            if (TempSetpoint != item.TempSetpoint)
+            if (Math.Round(Math.Abs(TempSetpoint - item.TempSetpoint), 1) >= Constants.EPSILON)
                 return false;
             if (NomeRicetta != item.NomeRicetta)
                 return false;
-            if (LastCadenza != item.LastCadenza)
+            if (Math.Round(Math.Abs(LastCadenza - item.LastCadenza), 1) >= Constants.EPSILON)
                 return false;
-            if (LastTCiclo != item.LastTCiclo)
+            if (Math.Round(Math.Abs(LastTCiclo - item.LastTCiclo), 1) >= Constants.EPSILON)
                 return false;
             if (!Enumerable.SequenceEqual(TS_Cadenza, item.TS_Cadenza))
                 return false;

Thermo.Active.Model/DTOModels/ThProd/DTOThermoProd.cs

@@ -22,7 +22,7 @@ namespace Thermo.Active.Model.DTOModels.ThProd
 
             if (!Category.Equals(item.Category))
                 return false;
-            if (Value != item.Value)
+            if (Math.Round(Math.Abs(Value - item.Value), 1) >= Constants.EPSILON)
                 return false;
             if (Name != item.Name)
                 return false;

Thermo.Active.Model/DTOModels/ThRecipe/DTORecipeStatus.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Thermo.Active.Model.DTOModels.ThRecipe
+{
+    public class DTORecipeStatus
+    {
+        public string recipeName { get; set; } = "";
+        public bool hasChanged { get; set; } = false;
+        public bool forceSend { get; set; } = false;
+    }
+}

Thermo.Active.Model/Thermo.Active.Model.csproj

@@ -64,6 +64,7 @@
     <Compile Include="ConfigModels\CmsConnectConfigModel.cs" />
     <Compile Include="ConfigModels\ExtSoftwareModel.cs" />
     <Compile Include="ConfigModels\InputOperatorConfigModel.cs" />
+    <Compile Include="ConfigModels\AxesConfigModel.cs" />
     <Compile Include="ConfigModels\ThermoProdConfigModel.cs" />
     <Compile Include="ConfigModels\ModBlockConfigModel.cs" />
     <Compile Include="ConfigModels\RiskConfigModel.cs" />
@@ -105,13 +106,14 @@
     <Compile Include="DTOModels\AlarmModels\DTOAlarmHistoricModel.cs" />
     <Compile Include="DTOModels\AlarmModels\DTOAlarmsModel.cs" />
     <Compile Include="DTOModels\DTOAxesModel.cs" />
-    <Compile Include="DTOModels\DTOAxisNameModel.cs" />
     <Compile Include="DTOModels\DTOClientConfigurationModel.cs" />
     <Compile Include="DTOModels\DTOM156InputModel.cs" />
+    <Compile Include="DTOModels\ThAxes\DTOAxisInfoModel.cs" />
     <Compile Include="DTOModels\ThModules\DTOModulesBlock.cs" />
     <Compile Include="DTOModels\ThProd\DTOProdInfo.cs" />
     <Compile Include="DTOModels\ThProd\DTOThermoPanelProd.cs" />
     <Compile Include="DTOModels\ThProd\DTOThermoProd.cs" />
+    <Compile Include="DTOModels\ThRecipe\DTORecipeStatus.cs" />
     <Compile Include="DTOModels\ThRecipe\LiveData.cs" />
     <Compile Include="DTOModels\ThWarmers\DTOWarmers.cs" />
     <Compile Include="DTOModels\ThRecipe\DTORecipeParam.cs" />

Thermo.Active.NC/NcFileAdapter.cs

@@ -705,6 +705,8 @@ namespace Thermo.Active.NC
                     answ.RecipeDir = $"{Path.GetDirectoryName(filePath)}\\";
                     // fix Modifica dati
                     answ.hasChanged = false;
+                    // fix NOME ricetta
+                    answ.RecipeName = fileName;
                 }
                 catch
                 { }
@@ -760,8 +762,6 @@ namespace Thermo.Active.NC
             bool answ = false;
             try
             {
-                // indico che ora è OK x salvataggio...
-                RecipeLiveData.hasChanged = false;
                 // serialize
                 string rawData = JsonConvert.SerializeObject(RecipeLiveData, Newtonsoft.Json.Formatting.Indented);
                 // save live!
@@ -837,7 +837,7 @@ namespace Thermo.Active.NC
             return SaveRecipe(RECIPE_TEMPLATE_PATH, data2save);
         }
         /// <summary>
-        /// Try to save live recipe to selected filePath
+        /// Try to save LIVE recipe to selected filePath
         /// </summary>
         public static bool SaveRecipe(string filePath, LiveData currRecipe)
         {

Thermo.Active.UI/ServerControlWindow.Designer.cs

@@ -30,436 +30,436 @@ namespace Thermo.Active.UI
     /// </summary>
     private void InitializeComponent()
     {
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerControlWindow));
-            this.StepNotifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
-            this.NotifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.adminMachineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.passwordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.goBackToStandardModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
-            this.resetSpindleHoursToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.resetCountersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.resetMachineWorkingHoursToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-            this.StopServerItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.TXTstatus = new System.Windows.Forms.TextBox();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.stopServerButton = new System.Windows.Forms.Button();
-            this.openUiButton = new System.Windows.Forms.Button();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.label3 = new System.Windows.Forms.Label();
-            this.TXTVersion = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.TXTType = new System.Windows.Forms.Label();
-            this.CHNcConnected = new System.Windows.Forms.CheckBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.TXTMachId = new System.Windows.Forms.Label();
-            this.LISTThreadStatus = new System.Windows.Forms.ListView();
-            this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-            this.menuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.closeCMSServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.serviceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.passwordToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.goBackToStandardModeToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.resetSpindleHoursToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.resetCountersToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.resetMachineWorkingHoursToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.NotifyIconMenu.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.panel1.SuspendLayout();
-            this.menuStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // StepNotifyIcon
-            // 
-            this.StepNotifyIcon.BalloonTipText = "Active";
-            this.StepNotifyIcon.ContextMenuStrip = this.NotifyIconMenu;
-            this.StepNotifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("StepNotifyIcon.Icon")));
-            this.StepNotifyIcon.Text = "Active";
-            this.StepNotifyIcon.Visible = true;
-            this.StepNotifyIcon.DoubleClick += new System.EventHandler(this.NotifyIcon_Click);
-            // 
-            // NotifyIconMenu
-            // 
-            this.NotifyIconMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+      this.components = new System.ComponentModel.Container();
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerControlWindow));
+      this.StepNotifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
+      this.NotifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+      this.adminMachineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.passwordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.goBackToStandardModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
+      this.resetSpindleHoursToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.resetCountersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.resetMachineWorkingHoursToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+      this.StopServerItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.TXTstatus = new System.Windows.Forms.TextBox();
+      this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+      this.stopServerButton = new System.Windows.Forms.Button();
+      this.openUiButton = new System.Windows.Forms.Button();
+      this.panel1 = new System.Windows.Forms.Panel();
+      this.label3 = new System.Windows.Forms.Label();
+      this.TXTVersion = new System.Windows.Forms.Label();
+      this.label1 = new System.Windows.Forms.Label();
+      this.TXTType = new System.Windows.Forms.Label();
+      this.CHNcConnected = new System.Windows.Forms.CheckBox();
+      this.label2 = new System.Windows.Forms.Label();
+      this.TXTMachId = new System.Windows.Forms.Label();
+      this.LISTThreadStatus = new System.Windows.Forms.ListView();
+      this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+      this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+      this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+      this.menuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.closeCMSServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+      this.serviceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.passwordToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+      this.goBackToStandardModeToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+      this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+      this.resetSpindleHoursToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+      this.resetCountersToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+      this.resetMachineWorkingHoursToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+      this.NotifyIconMenu.SuspendLayout();
+      this.tableLayoutPanel1.SuspendLayout();
+      this.panel1.SuspendLayout();
+      this.menuStrip1.SuspendLayout();
+      this.SuspendLayout();
+      // 
+      // StepNotifyIcon
+      // 
+      this.StepNotifyIcon.BalloonTipText = "Active";
+      this.StepNotifyIcon.ContextMenuStrip = this.NotifyIconMenu;
+      this.StepNotifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("StepNotifyIcon.Icon")));
+      this.StepNotifyIcon.Text = "Active";
+      this.StepNotifyIcon.Visible = true;
+      this.StepNotifyIcon.DoubleClick += new System.EventHandler(this.NotifyIcon_Click);
+      // 
+      // NotifyIconMenu
+      // 
+      this.NotifyIconMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.adminMachineToolStripMenuItem,
             this.toolStripSeparator3,
             this.StopServerItem});
-            this.NotifyIconMenu.Name = "NotifyIconMenu";
-            this.NotifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.NotifyIconMenu.Size = new System.Drawing.Size(175, 54);
-            // 
-            // adminMachineToolStripMenuItem
-            // 
-            this.adminMachineToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+      this.NotifyIconMenu.Name = "NotifyIconMenu";
+      this.NotifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
+      this.NotifyIconMenu.Size = new System.Drawing.Size(175, 54);
+      // 
+      // adminMachineToolStripMenuItem
+      // 
+      this.adminMachineToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.passwordToolStripMenuItem,
             this.goBackToStandardModeToolStripMenuItem,
             this.toolStripSeparator,
             this.resetSpindleHoursToolStripMenuItem,
             this.resetCountersToolStripMenuItem,
             this.resetMachineWorkingHoursToolStripMenuItem});
-            this.adminMachineToolStripMenuItem.Name = "adminMachineToolStripMenuItem";
-            this.adminMachineToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-            this.adminMachineToolStripMenuItem.Text = "Service";
-            // 
-            // passwordToolStripMenuItem
-            // 
-            this.passwordToolStripMenuItem.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Lock_icon;
-            this.passwordToolStripMenuItem.Name = "passwordToolStripMenuItem";
-            this.passwordToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
-            this.passwordToolStripMenuItem.Text = "Password";
-            this.passwordToolStripMenuItem.Click += new System.EventHandler(this.passwordToolStripMenuItem_Click);
-            // 
-            // goBackToStandardModeToolStripMenuItem
-            // 
-            this.goBackToStandardModeToolStripMenuItem.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Unlock_icon;
-            this.goBackToStandardModeToolStripMenuItem.Name = "goBackToStandardModeToolStripMenuItem";
-            this.goBackToStandardModeToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
-            this.goBackToStandardModeToolStripMenuItem.Text = "Go back to standard mode";
-            this.goBackToStandardModeToolStripMenuItem.Visible = false;
-            this.goBackToStandardModeToolStripMenuItem.Click += new System.EventHandler(this.goBackToStandardModeToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator
-            // 
-            this.toolStripSeparator.Name = "toolStripSeparator";
-            this.toolStripSeparator.Size = new System.Drawing.Size(231, 6);
-            this.toolStripSeparator.Visible = false;
-            // 
-            // resetSpindleHoursToolStripMenuItem
-            // 
-            this.resetSpindleHoursToolStripMenuItem.Name = "resetSpindleHoursToolStripMenuItem";
-            this.resetSpindleHoursToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
-            this.resetSpindleHoursToolStripMenuItem.Text = "Reset Spindle Active Time";
-            this.resetSpindleHoursToolStripMenuItem.Visible = false;
-            this.resetSpindleHoursToolStripMenuItem.Click += new System.EventHandler(this.resetSpindleHoursToolStripMenuItem_Click);
-            // 
-            // resetCountersToolStripMenuItem
-            // 
-            this.resetCountersToolStripMenuItem.Name = "resetCountersToolStripMenuItem";
-            this.resetCountersToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
-            this.resetCountersToolStripMenuItem.Text = "Reset CMS-Active Counters";
-            this.resetCountersToolStripMenuItem.Visible = false;
-            this.resetCountersToolStripMenuItem.Click += new System.EventHandler(this.resetCountersToolStripMenuItem_Click);
-            // 
-            // resetMachineWorkingHoursToolStripMenuItem
-            // 
-            this.resetMachineWorkingHoursToolStripMenuItem.Name = "resetMachineWorkingHoursToolStripMenuItem";
-            this.resetMachineWorkingHoursToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
-            this.resetMachineWorkingHoursToolStripMenuItem.Text = "Reset Machine Working Hours";
-            this.resetMachineWorkingHoursToolStripMenuItem.Visible = false;
-            this.resetMachineWorkingHoursToolStripMenuItem.Click += new System.EventHandler(this.resetMachineWorkingHoursToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator3
-            // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(171, 6);
-            // 
-            // StopServerItem
-            // 
-            this.StopServerItem.Name = "StopServerItem";
-            this.StopServerItem.Size = new System.Drawing.Size(174, 22);
-            this.StopServerItem.Text = "Close Active Server";
-            this.StopServerItem.Click += new System.EventHandler(this.StopServerItem_Click);
-            // 
-            // TXTstatus
-            // 
-            this.TXTstatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+      this.adminMachineToolStripMenuItem.Name = "adminMachineToolStripMenuItem";
+      this.adminMachineToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+      this.adminMachineToolStripMenuItem.Text = "Service";
+      // 
+      // passwordToolStripMenuItem
+      // 
+      this.passwordToolStripMenuItem.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Lock_icon;
+      this.passwordToolStripMenuItem.Name = "passwordToolStripMenuItem";
+      this.passwordToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
+      this.passwordToolStripMenuItem.Text = "Password";
+      this.passwordToolStripMenuItem.Click += new System.EventHandler(this.passwordToolStripMenuItem_Click);
+      // 
+      // goBackToStandardModeToolStripMenuItem
+      // 
+      this.goBackToStandardModeToolStripMenuItem.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Unlock_icon;
+      this.goBackToStandardModeToolStripMenuItem.Name = "goBackToStandardModeToolStripMenuItem";
+      this.goBackToStandardModeToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
+      this.goBackToStandardModeToolStripMenuItem.Text = "Go back to standard mode";
+      this.goBackToStandardModeToolStripMenuItem.Visible = false;
+      this.goBackToStandardModeToolStripMenuItem.Click += new System.EventHandler(this.goBackToStandardModeToolStripMenuItem_Click);
+      // 
+      // toolStripSeparator
+      // 
+      this.toolStripSeparator.Name = "toolStripSeparator";
+      this.toolStripSeparator.Size = new System.Drawing.Size(231, 6);
+      this.toolStripSeparator.Visible = false;
+      // 
+      // resetSpindleHoursToolStripMenuItem
+      // 
+      this.resetSpindleHoursToolStripMenuItem.Name = "resetSpindleHoursToolStripMenuItem";
+      this.resetSpindleHoursToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
+      this.resetSpindleHoursToolStripMenuItem.Text = "Reset Spindle Active Time";
+      this.resetSpindleHoursToolStripMenuItem.Visible = false;
+      this.resetSpindleHoursToolStripMenuItem.Click += new System.EventHandler(this.resetSpindleHoursToolStripMenuItem_Click);
+      // 
+      // resetCountersToolStripMenuItem
+      // 
+      this.resetCountersToolStripMenuItem.Name = "resetCountersToolStripMenuItem";
+      this.resetCountersToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
+      this.resetCountersToolStripMenuItem.Text = "Reset CMS-Active Counters";
+      this.resetCountersToolStripMenuItem.Visible = false;
+      this.resetCountersToolStripMenuItem.Click += new System.EventHandler(this.resetCountersToolStripMenuItem_Click);
+      // 
+      // resetMachineWorkingHoursToolStripMenuItem
+      // 
+      this.resetMachineWorkingHoursToolStripMenuItem.Name = "resetMachineWorkingHoursToolStripMenuItem";
+      this.resetMachineWorkingHoursToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
+      this.resetMachineWorkingHoursToolStripMenuItem.Text = "Reset Machine Working Hours";
+      this.resetMachineWorkingHoursToolStripMenuItem.Visible = false;
+      this.resetMachineWorkingHoursToolStripMenuItem.Click += new System.EventHandler(this.resetMachineWorkingHoursToolStripMenuItem_Click);
+      // 
+      // toolStripSeparator3
+      // 
+      this.toolStripSeparator3.Name = "toolStripSeparator3";
+      this.toolStripSeparator3.Size = new System.Drawing.Size(171, 6);
+      // 
+      // StopServerItem
+      // 
+      this.StopServerItem.Name = "StopServerItem";
+      this.StopServerItem.Size = new System.Drawing.Size(174, 22);
+      this.StopServerItem.Text = "Close Active Server";
+      this.StopServerItem.Click += new System.EventHandler(this.StopServerItem_Click);
+      // 
+      // TXTstatus
+      // 
+      this.TXTstatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.tableLayoutPanel1.SetColumnSpan(this.TXTstatus, 2);
-            this.TXTstatus.Enabled = false;
-            this.TXTstatus.Location = new System.Drawing.Point(3, 435);
-            this.TXTstatus.Name = "TXTstatus";
-            this.TXTstatus.ReadOnly = true;
-            this.TXTstatus.Size = new System.Drawing.Size(438, 20);
-            this.TXTstatus.TabIndex = 8;
-            this.TXTstatus.Text = "...";
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+      this.tableLayoutPanel1.SetColumnSpan(this.TXTstatus, 2);
+      this.TXTstatus.Enabled = false;
+      this.TXTstatus.Location = new System.Drawing.Point(3, 435);
+      this.TXTstatus.Name = "TXTstatus";
+      this.TXTstatus.ReadOnly = true;
+      this.TXTstatus.Size = new System.Drawing.Size(438, 20);
+      this.TXTstatus.TabIndex = 8;
+      this.TXTstatus.Text = "...";
+      // 
+      // tableLayoutPanel1
+      // 
+      this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.tableLayoutPanel1.ColumnCount = 2;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.Controls.Add(this.stopServerButton, 1, 2);
-            this.tableLayoutPanel1.Controls.Add(this.openUiButton, 0, 2);
-            this.tableLayoutPanel1.Controls.Add(this.TXTstatus, 0, 3);
-            this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.LISTThreadStatus, 0, 0);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 27);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 3;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 89F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 54F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(444, 457);
-            this.tableLayoutPanel1.TabIndex = 58;
-            // 
-            // stopServerButton
-            // 
-            this.stopServerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+      this.tableLayoutPanel1.ColumnCount = 2;
+      this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+      this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+      this.tableLayoutPanel1.Controls.Add(this.stopServerButton, 1, 2);
+      this.tableLayoutPanel1.Controls.Add(this.openUiButton, 0, 2);
+      this.tableLayoutPanel1.Controls.Add(this.TXTstatus, 0, 3);
+      this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 1);
+      this.tableLayoutPanel1.Controls.Add(this.LISTThreadStatus, 0, 0);
+      this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 27);
+      this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+      this.tableLayoutPanel1.RowCount = 3;
+      this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+      this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 89F));
+      this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 54F));
+      this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
+      this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+      this.tableLayoutPanel1.Size = new System.Drawing.Size(444, 457);
+      this.tableLayoutPanel1.TabIndex = 58;
+      // 
+      // stopServerButton
+      // 
+      this.stopServerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.stopServerButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.stopServerButton.Location = new System.Drawing.Point(225, 381);
-            this.stopServerButton.Name = "stopServerButton";
-            this.stopServerButton.Size = new System.Drawing.Size(216, 48);
-            this.stopServerButton.TabIndex = 3;
-            this.stopServerButton.TabStop = false;
-            this.stopServerButton.Text = "Close Active";
-            this.stopServerButton.Click += new System.EventHandler(this.StopServerButton_Click);
-            // 
-            // openUiButton
-            // 
-            this.openUiButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+      this.stopServerButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+      this.stopServerButton.Location = new System.Drawing.Point(225, 381);
+      this.stopServerButton.Name = "stopServerButton";
+      this.stopServerButton.Size = new System.Drawing.Size(216, 48);
+      this.stopServerButton.TabIndex = 3;
+      this.stopServerButton.TabStop = false;
+      this.stopServerButton.Text = "Close Active";
+      this.stopServerButton.Click += new System.EventHandler(this.StopServerButton_Click);
+      // 
+      // openUiButton
+      // 
+      this.openUiButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.openUiButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.openUiButton.Location = new System.Drawing.Point(3, 381);
-            this.openUiButton.Name = "openUiButton";
-            this.openUiButton.Size = new System.Drawing.Size(216, 48);
-            this.openUiButton.TabIndex = 58;
-            this.openUiButton.TabStop = false;
-            this.openUiButton.Text = "Open Active Client";
-            this.openUiButton.Click += new System.EventHandler(this.OpenUiButton_Click);
-            // 
-            // panel1
-            // 
-            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+      this.openUiButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+      this.openUiButton.Location = new System.Drawing.Point(3, 381);
+      this.openUiButton.Name = "openUiButton";
+      this.openUiButton.Size = new System.Drawing.Size(216, 48);
+      this.openUiButton.TabIndex = 58;
+      this.openUiButton.TabStop = false;
+      this.openUiButton.Text = "Open Active Client";
+      this.openUiButton.Click += new System.EventHandler(this.OpenUiButton_Click);
+      // 
+      // panel1
+      // 
+      this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.tableLayoutPanel1.SetColumnSpan(this.panel1, 2);
-            this.panel1.Controls.Add(this.label3);
-            this.panel1.Controls.Add(this.TXTVersion);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.TXTType);
-            this.panel1.Controls.Add(this.CHNcConnected);
-            this.panel1.Controls.Add(this.label2);
-            this.panel1.Controls.Add(this.TXTMachId);
-            this.panel1.Location = new System.Drawing.Point(3, 292);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(438, 83);
-            this.panel1.TabIndex = 9;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(3, 49);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(78, 13);
-            this.label3.TabIndex = 59;
-            this.label3.Text = "Active Version:";
-            // 
-            // TXTVersion
-            // 
-            this.TXTVersion.AutoSize = true;
-            this.TXTVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.TXTVersion.Location = new System.Drawing.Point(87, 49);
-            this.TXTVersion.Name = "TXTVersion";
-            this.TXTVersion.Size = new System.Drawing.Size(19, 13);
-            this.TXTVersion.TabIndex = 58;
-            this.TXTVersion.Text = "---";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(3, 24);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(44, 13);
-            this.label1.TabIndex = 54;
-            this.label1.Text = "Vendor:";
-            // 
-            // TXTType
-            // 
-            this.TXTType.AutoSize = true;
-            this.TXTType.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.TXTType.Location = new System.Drawing.Point(48, 24);
-            this.TXTType.Name = "TXTType";
-            this.TXTType.Size = new System.Drawing.Size(19, 13);
-            this.TXTType.TabIndex = 53;
-            this.TXTType.Text = "---";
-            // 
-            // CHNcConnected
-            // 
-            this.CHNcConnected.AutoCheck = false;
-            this.CHNcConnected.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.CHNcConnected.Location = new System.Drawing.Point(340, 24);
-            this.CHNcConnected.Name = "CHNcConnected";
-            this.CHNcConnected.Size = new System.Drawing.Size(81, 20);
-            this.CHNcConnected.TabIndex = 52;
-            this.CHNcConnected.Text = "Connected";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(142, 24);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(63, 13);
-            this.label2.TabIndex = 57;
-            this.label2.Text = "Machine Id:";
-            // 
-            // TXTMachId
-            // 
-            this.TXTMachId.AutoSize = true;
-            this.TXTMachId.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.TXTMachId.Location = new System.Drawing.Point(240, 24);
-            this.TXTMachId.Name = "TXTMachId";
-            this.TXTMachId.Size = new System.Drawing.Size(19, 13);
-            this.TXTMachId.TabIndex = 56;
-            this.TXTMachId.Text = "---";
-            // 
-            // LISTThreadStatus
-            // 
-            this.LISTThreadStatus.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+      this.tableLayoutPanel1.SetColumnSpan(this.panel1, 2);
+      this.panel1.Controls.Add(this.label3);
+      this.panel1.Controls.Add(this.TXTVersion);
+      this.panel1.Controls.Add(this.label1);
+      this.panel1.Controls.Add(this.TXTType);
+      this.panel1.Controls.Add(this.CHNcConnected);
+      this.panel1.Controls.Add(this.label2);
+      this.panel1.Controls.Add(this.TXTMachId);
+      this.panel1.Location = new System.Drawing.Point(3, 292);
+      this.panel1.Name = "panel1";
+      this.panel1.Size = new System.Drawing.Size(438, 83);
+      this.panel1.TabIndex = 9;
+      // 
+      // label3
+      // 
+      this.label3.AutoSize = true;
+      this.label3.Location = new System.Drawing.Point(3, 49);
+      this.label3.Name = "label3";
+      this.label3.Size = new System.Drawing.Size(78, 13);
+      this.label3.TabIndex = 59;
+      this.label3.Text = "Active Version:";
+      // 
+      // TXTVersion
+      // 
+      this.TXTVersion.AutoSize = true;
+      this.TXTVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+      this.TXTVersion.Location = new System.Drawing.Point(87, 49);
+      this.TXTVersion.Name = "TXTVersion";
+      this.TXTVersion.Size = new System.Drawing.Size(19, 13);
+      this.TXTVersion.TabIndex = 58;
+      this.TXTVersion.Text = "---";
+      // 
+      // label1
+      // 
+      this.label1.AutoSize = true;
+      this.label1.Location = new System.Drawing.Point(3, 24);
+      this.label1.Name = "label1";
+      this.label1.Size = new System.Drawing.Size(44, 13);
+      this.label1.TabIndex = 54;
+      this.label1.Text = "Vendor:";
+      // 
+      // TXTType
+      // 
+      this.TXTType.AutoSize = true;
+      this.TXTType.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+      this.TXTType.Location = new System.Drawing.Point(48, 24);
+      this.TXTType.Name = "TXTType";
+      this.TXTType.Size = new System.Drawing.Size(19, 13);
+      this.TXTType.TabIndex = 53;
+      this.TXTType.Text = "---";
+      // 
+      // CHNcConnected
+      // 
+      this.CHNcConnected.AutoCheck = false;
+      this.CHNcConnected.ForeColor = System.Drawing.SystemColors.ControlText;
+      this.CHNcConnected.Location = new System.Drawing.Point(340, 24);
+      this.CHNcConnected.Name = "CHNcConnected";
+      this.CHNcConnected.Size = new System.Drawing.Size(81, 20);
+      this.CHNcConnected.TabIndex = 52;
+      this.CHNcConnected.Text = "Connected";
+      // 
+      // label2
+      // 
+      this.label2.AutoSize = true;
+      this.label2.Location = new System.Drawing.Point(142, 24);
+      this.label2.Name = "label2";
+      this.label2.Size = new System.Drawing.Size(63, 13);
+      this.label2.TabIndex = 57;
+      this.label2.Text = "Machine Id:";
+      // 
+      // TXTMachId
+      // 
+      this.TXTMachId.AutoSize = true;
+      this.TXTMachId.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+      this.TXTMachId.Location = new System.Drawing.Point(240, 24);
+      this.TXTMachId.Name = "TXTMachId";
+      this.TXTMachId.Size = new System.Drawing.Size(19, 13);
+      this.TXTMachId.TabIndex = 56;
+      this.TXTMachId.Text = "---";
+      // 
+      // LISTThreadStatus
+      // 
+      this.LISTThreadStatus.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.columnHeader1,
             this.columnHeader2});
-            this.tableLayoutPanel1.SetColumnSpan(this.LISTThreadStatus, 2);
-            this.LISTThreadStatus.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.LISTThreadStatus.HideSelection = false;
-            this.LISTThreadStatus.Location = new System.Drawing.Point(3, 3);
-            this.LISTThreadStatus.Name = "LISTThreadStatus";
-            this.LISTThreadStatus.Size = new System.Drawing.Size(438, 283);
-            this.LISTThreadStatus.TabIndex = 59;
-            this.LISTThreadStatus.UseCompatibleStateImageBehavior = false;
-            this.LISTThreadStatus.View = System.Windows.Forms.View.Details;
-            // 
-            // columnHeader1
-            // 
-            this.columnHeader1.Text = "Thread Name";
-            this.columnHeader1.Width = 328;
-            // 
-            // columnHeader2
-            // 
-            this.columnHeader2.Text = "Time";
-            this.columnHeader2.Width = 78;
-            // 
-            // menuStrip1
-            // 
-            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+      this.tableLayoutPanel1.SetColumnSpan(this.LISTThreadStatus, 2);
+      this.LISTThreadStatus.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.LISTThreadStatus.HideSelection = false;
+      this.LISTThreadStatus.Location = new System.Drawing.Point(3, 3);
+      this.LISTThreadStatus.Name = "LISTThreadStatus";
+      this.LISTThreadStatus.Size = new System.Drawing.Size(438, 283);
+      this.LISTThreadStatus.TabIndex = 59;
+      this.LISTThreadStatus.UseCompatibleStateImageBehavior = false;
+      this.LISTThreadStatus.View = System.Windows.Forms.View.Details;
+      // 
+      // columnHeader1
+      // 
+      this.columnHeader1.Text = "Thread Name";
+      this.columnHeader1.Width = 328;
+      // 
+      // columnHeader2
+      // 
+      this.columnHeader2.Text = "Time";
+      this.columnHeader2.Width = 78;
+      // 
+      // menuStrip1
+      // 
+      this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuToolStripMenuItem});
-            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(468, 24);
-            this.menuStrip1.TabIndex = 59;
-            this.menuStrip1.Text = "menuStrip1";
-            // 
-            // menuToolStripMenuItem
-            // 
-            this.menuToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+      this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+      this.menuStrip1.Name = "menuStrip1";
+      this.menuStrip1.Size = new System.Drawing.Size(468, 24);
+      this.menuStrip1.TabIndex = 59;
+      this.menuStrip1.Text = "menuStrip1";
+      // 
+      // menuToolStripMenuItem
+      // 
+      this.menuToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.closeCMSServerToolStripMenuItem,
             this.toolStripSeparator2,
             this.serviceToolStripMenuItem});
-            this.menuToolStripMenuItem.Name = "menuToolStripMenuItem";
-            this.menuToolStripMenuItem.Size = new System.Drawing.Size(50, 20);
-            this.menuToolStripMenuItem.Text = "Menu";
-            // 
-            // closeCMSServerToolStripMenuItem
-            // 
-            this.closeCMSServerToolStripMenuItem.Name = "closeCMSServerToolStripMenuItem";
-            this.closeCMSServerToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-            this.closeCMSServerToolStripMenuItem.Text = "Close Active Server";
-            this.closeCMSServerToolStripMenuItem.Click += new System.EventHandler(this.closeCMSServerToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator2
-            // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(171, 6);
-            // 
-            // serviceToolStripMenuItem
-            // 
-            this.serviceToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+      this.menuToolStripMenuItem.Name = "menuToolStripMenuItem";
+      this.menuToolStripMenuItem.Size = new System.Drawing.Size(50, 20);
+      this.menuToolStripMenuItem.Text = "Menu";
+      // 
+      // closeCMSServerToolStripMenuItem
+      // 
+      this.closeCMSServerToolStripMenuItem.Name = "closeCMSServerToolStripMenuItem";
+      this.closeCMSServerToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+      this.closeCMSServerToolStripMenuItem.Text = "Close Active Server";
+      this.closeCMSServerToolStripMenuItem.Click += new System.EventHandler(this.closeCMSServerToolStripMenuItem_Click);
+      // 
+      // toolStripSeparator2
+      // 
+      this.toolStripSeparator2.Name = "toolStripSeparator2";
+      this.toolStripSeparator2.Size = new System.Drawing.Size(171, 6);
+      // 
+      // serviceToolStripMenuItem
+      // 
+      this.serviceToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.passwordToolStripMenuItem1,
             this.goBackToStandardModeToolStripMenuItem1,
             this.toolStripSeparator1,
             this.resetSpindleHoursToolStripMenuItem1,
             this.resetCountersToolStripMenuItem1,
             this.resetMachineWorkingHoursToolStripMenuItem1});
-            this.serviceToolStripMenuItem.Name = "serviceToolStripMenuItem";
-            this.serviceToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-            this.serviceToolStripMenuItem.Text = "Service";
-            // 
-            // passwordToolStripMenuItem1
-            // 
-            this.passwordToolStripMenuItem1.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Lock_icon;
-            this.passwordToolStripMenuItem1.Name = "passwordToolStripMenuItem1";
-            this.passwordToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
-            this.passwordToolStripMenuItem1.Text = "Password";
-            this.passwordToolStripMenuItem1.Click += new System.EventHandler(this.passwordToolStripMenuItem1_Click);
-            // 
-            // goBackToStandardModeToolStripMenuItem1
-            // 
-            this.goBackToStandardModeToolStripMenuItem1.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Unlock_icon;
-            this.goBackToStandardModeToolStripMenuItem1.Name = "goBackToStandardModeToolStripMenuItem1";
-            this.goBackToStandardModeToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
-            this.goBackToStandardModeToolStripMenuItem1.Text = "Go back to standard mode";
-            this.goBackToStandardModeToolStripMenuItem1.Visible = false;
-            this.goBackToStandardModeToolStripMenuItem1.Click += new System.EventHandler(this.goBackToStandardModeToolStripMenuItem1_Click);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(231, 6);
-            this.toolStripSeparator1.Visible = false;
-            // 
-            // resetSpindleHoursToolStripMenuItem1
-            // 
-            this.resetSpindleHoursToolStripMenuItem1.Name = "resetSpindleHoursToolStripMenuItem1";
-            this.resetSpindleHoursToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
-            this.resetSpindleHoursToolStripMenuItem1.Text = "Reset Spindle Active Time";
-            this.resetSpindleHoursToolStripMenuItem1.Visible = false;
-            this.resetSpindleHoursToolStripMenuItem1.Click += new System.EventHandler(this.resetSpindleHoursToolStripMenuItem1_Click);
-            // 
-            // resetCountersToolStripMenuItem1
-            // 
-            this.resetCountersToolStripMenuItem1.Name = "resetCountersToolStripMenuItem1";
-            this.resetCountersToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
-            this.resetCountersToolStripMenuItem1.Text = "Reset CMS-Active Counters";
-            this.resetCountersToolStripMenuItem1.Visible = false;
-            this.resetCountersToolStripMenuItem1.Click += new System.EventHandler(this.resetCountersToolStripMenuItem1_Click);
-            // 
-            // resetMachineWorkingHoursToolStripMenuItem1
-            // 
-            this.resetMachineWorkingHoursToolStripMenuItem1.Name = "resetMachineWorkingHoursToolStripMenuItem1";
-            this.resetMachineWorkingHoursToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
-            this.resetMachineWorkingHoursToolStripMenuItem1.Text = "Reset Machine Working Hours";
-            this.resetMachineWorkingHoursToolStripMenuItem1.Visible = false;
-            this.resetMachineWorkingHoursToolStripMenuItem1.Click += new System.EventHandler(this.resetMachineWorkingHoursToolStripMenuItem1_Click);
-            // 
-            // ServerControlWindow
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(468, 496);
-            this.Controls.Add(this.menuStrip1);
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MainMenuStrip = this.menuStrip1;
-            this.Margin = new System.Windows.Forms.Padding(2);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "ServerControlWindow";
-            this.ShowInTaskbar = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ServerControlWindow_FormClosing);
-            this.Load += new System.EventHandler(this.ServerControlWindow_Load);
-            this.NotifyIconMenu.ResumeLayout(false);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            this.menuStrip1.ResumeLayout(false);
-            this.menuStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
+      this.serviceToolStripMenuItem.Name = "serviceToolStripMenuItem";
+      this.serviceToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+      this.serviceToolStripMenuItem.Text = "Service";
+      // 
+      // passwordToolStripMenuItem1
+      // 
+      this.passwordToolStripMenuItem1.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Lock_icon;
+      this.passwordToolStripMenuItem1.Name = "passwordToolStripMenuItem1";
+      this.passwordToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
+      this.passwordToolStripMenuItem1.Text = "Password";
+      this.passwordToolStripMenuItem1.Click += new System.EventHandler(this.passwordToolStripMenuItem1_Click);
+      // 
+      // goBackToStandardModeToolStripMenuItem1
+      // 
+      this.goBackToStandardModeToolStripMenuItem1.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Unlock_icon;
+      this.goBackToStandardModeToolStripMenuItem1.Name = "goBackToStandardModeToolStripMenuItem1";
+      this.goBackToStandardModeToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
+      this.goBackToStandardModeToolStripMenuItem1.Text = "Go back to standard mode";
+      this.goBackToStandardModeToolStripMenuItem1.Visible = false;
+      this.goBackToStandardModeToolStripMenuItem1.Click += new System.EventHandler(this.goBackToStandardModeToolStripMenuItem1_Click);
+      // 
+      // toolStripSeparator1
+      // 
+      this.toolStripSeparator1.Name = "toolStripSeparator1";
+      this.toolStripSeparator1.Size = new System.Drawing.Size(231, 6);
+      this.toolStripSeparator1.Visible = false;
+      // 
+      // resetSpindleHoursToolStripMenuItem1
+      // 
+      this.resetSpindleHoursToolStripMenuItem1.Name = "resetSpindleHoursToolStripMenuItem1";
+      this.resetSpindleHoursToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
+      this.resetSpindleHoursToolStripMenuItem1.Text = "Reset Spindle Active Time";
+      this.resetSpindleHoursToolStripMenuItem1.Visible = false;
+      this.resetSpindleHoursToolStripMenuItem1.Click += new System.EventHandler(this.resetSpindleHoursToolStripMenuItem1_Click);
+      // 
+      // resetCountersToolStripMenuItem1
+      // 
+      this.resetCountersToolStripMenuItem1.Name = "resetCountersToolStripMenuItem1";
+      this.resetCountersToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
+      this.resetCountersToolStripMenuItem1.Text = "Reset CMS-Active Counters";
+      this.resetCountersToolStripMenuItem1.Visible = false;
+      this.resetCountersToolStripMenuItem1.Click += new System.EventHandler(this.resetCountersToolStripMenuItem1_Click);
+      // 
+      // resetMachineWorkingHoursToolStripMenuItem1
+      // 
+      this.resetMachineWorkingHoursToolStripMenuItem1.Name = "resetMachineWorkingHoursToolStripMenuItem1";
+      this.resetMachineWorkingHoursToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
+      this.resetMachineWorkingHoursToolStripMenuItem1.Text = "Reset Machine Working Hours";
+      this.resetMachineWorkingHoursToolStripMenuItem1.Visible = false;
+      this.resetMachineWorkingHoursToolStripMenuItem1.Click += new System.EventHandler(this.resetMachineWorkingHoursToolStripMenuItem1_Click);
+      // 
+      // ServerControlWindow
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.ClientSize = new System.Drawing.Size(468, 496);
+      this.Controls.Add(this.menuStrip1);
+      this.Controls.Add(this.tableLayoutPanel1);
+      this.ForeColor = System.Drawing.SystemColors.ControlText;
+      this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+      this.MainMenuStrip = this.menuStrip1;
+      this.Margin = new System.Windows.Forms.Padding(2);
+      this.MaximizeBox = false;
+      this.MinimizeBox = false;
+      this.Name = "ServerControlWindow";
+      this.ShowInTaskbar = false;
+      this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+      this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ServerControlWindow_FormClosing);
+      this.Load += new System.EventHandler(this.ServerControlWindow_Load);
+      this.NotifyIconMenu.ResumeLayout(false);
+      this.tableLayoutPanel1.ResumeLayout(false);
+      this.tableLayoutPanel1.PerformLayout();
+      this.panel1.ResumeLayout(false);
+      this.panel1.PerformLayout();
+      this.menuStrip1.ResumeLayout(false);
+      this.menuStrip1.PerformLayout();
+      this.ResumeLayout(false);
+      this.PerformLayout();
 
     }
 

Thermo.Active.Utils/supportFunctions.cs

@@ -70,6 +70,21 @@ namespace Thermo.Active.Utils
             return answ;
         }
         /// <summary>
+        /// Conversion string --> TACT_AXIS_TYPE
+        /// </summary>
+        /// <param name="strValue"></param>
+        /// <returns></returns>
+        public static TACT_AXES_TYPE GetTActAxes_Type(string strValue)
+        {
+            TACT_AXES_TYPE answ = TACT_AXES_TYPE.NA;
+            try
+            {
+                answ = (TACT_AXES_TYPE)Enum.Parse(typeof(TACT_AXES_TYPE), strValue);
+            }
+            catch { }
+            return answ;
+        }
+        /// <summary>
         /// Conversion string --> TACT_MBLOCK_TYPE
         /// </summary>
         /// <param name="strValue"></param>

Thermo.Active/App.config

@@ -15,7 +15,7 @@
         <add key="ClientSettingsProvider.ServiceUri" value="" />
         <add key="ServerServiceName" value="MariaDB" />
         <add key="nMaxParamWrite" value="5" />
-        <add key="delayParamWrite" value="10" />
+        <add key="delayParamWrite" value="5" />
         <add key="ewmaPar100" value="40" />
     </appSettings>
     <system.web>

Thermo.Active/Controllers/WebApi/ConfigurationController.cs

@@ -45,6 +45,7 @@ namespace Thermo.Active.Controllers.WebApi
                 ProdEnabled = SoftwareProdConfig.Enabled,
                 ProdPath = SoftwareProdConfig.Path,
                 ExtSoftwares = ExtSoftwaresConfig,
+                AdditionalParameters = AdditionalParametersConfig,
                 Autorun = ServerStartupConfig.AutoOpenCmsClient,
                 EditorPath = ServerStartupConfig.TextEditorPath,
                 MgiOption = NcConfig.MgiOption,

Thermo.Active/Listeners/ListenersHandler.cs

@@ -60,13 +60,9 @@ namespace Thermo.Active.Listeners
             {
                 SignalRListener.SendHeadsData(a);
             }));
-            infos.Add(MessageServices.Current.Subscribe(SEND_AXIS_NAMES_DATA, (a, b) =>
+            infos.Add(MessageServices.Current.Subscribe(SEND_AXIS_INFO, (a, b) =>
             {
-                SignalRListener.SendAxesNamesData(a);
-            }));
-            infos.Add(MessageServices.Current.Subscribe(SEND_AXES, (a, b) =>
-            {
-                SignalRListener.SendAxesToClient(a);
+                SignalRListener.SendThermoAxisInfoData(a);
             }));
             infos.Add(MessageServices.Current.Subscribe(SEND_ACTIVE_PROGRAM_DATA, (a, b) =>
             {
@@ -100,6 +96,10 @@ namespace Thermo.Active.Listeners
             {
                 SignalRListener.SendThermoRecipeOverviewData(a);
             }));
+            infos.Add(MessageServices.Current.Subscribe(SEND_THERMO_RECIPE_CHANGED, (a, b) =>
+            {
+                SignalRListener.SendThermoRecipeChangedData(a);
+            }));
             infos.Add(MessageServices.Current.Subscribe(SEND_THERMO_MODULE_DATA, (a, b) =>
             {
                 SignalRListener.SendThermoModulesData(a);

Thermo.Active/Listeners/SignalR/SignalRListener.cs

@@ -4,11 +4,13 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
+using TeamDev.SDK.FluentProgramming;
 using Thermo.Active.Config;
 using Thermo.Active.Controllers.SignalR;
 using Thermo.Active.Model.DTOModels;
 using Thermo.Active.Model.DTOModels.AlarmModels;
 using Thermo.Active.Model.DTOModels.Scada;
+using Thermo.Active.Model.DTOModels.ThAxes;
 using Thermo.Active.Model.DTOModels.ThModules;
 using Thermo.Active.Model.DTOModels.ThProd;
 using Thermo.Active.Model.DTOModels.ThRecipe;
@@ -34,17 +36,6 @@ namespace Thermo.Active.Listeners.SignalR
             }
         }
 
-        public static void SendAxesToClient(object newAxesData)
-        {
-            if (!LastAxesPositions.Equals(newAxesData))
-            {
-                var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
-                LastAxesPositions = newAxesData as DTOAxesModel;
-
-                context.Clients.Group("ncData").axesPositions(newAxesData);
-            }
-        }
-
         public static void SendPowerOnDataToClient(object powerOnData)
         {
             var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
@@ -170,20 +161,6 @@ namespace Thermo.Active.Listeners.SignalR
             }
         }
 
-        public static void SendAxesNamesData(object axesNames)
-        {
-            var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
-            List<DTOAxisNameModel> newData = axesNames as List<DTOAxisNameModel>;
-
-            // Check if collections are equals
-            if (newData.Count != LastAxesNamesData.Count || !LastAxesNamesData.All(newData.Contains))
-            {
-                LastAxesNamesData = newData;
-                // Send data to clients
-                context.Clients.Group("ncData").axesNames(axesNames);
-            }
-        }
-
         public static void SendActiveProgramData(object programData)
         {
             var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
@@ -226,19 +203,6 @@ namespace Thermo.Active.Listeners.SignalR
             }
         }
 
-#if false
-        public static void SendM155Data(object data)
-        {
-            List<DTOM155InputModel> dtoM155Data = data as List<DTOM155InputModel>;
-
-            if (!LastM155Data.SequenceEqual(dtoM155Data))
-            {
-                LastM155Data = dtoM155Data;
-                var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
-                context.Clients.Group("ncData").m155Data(dtoM155Data);
-            }
-        } 
-#endif
         public static void SendM156Data(object data)
         {
             List<DTOM156InputModel> dtoM156Data = data as List<DTOM156InputModel>;
@@ -250,7 +214,6 @@ namespace Thermo.Active.Listeners.SignalR
                 context.Clients.Group("ncData").m156Data(dtoM156Data);
             }
         }
-
         public static void SendScadaData(object scada)
         {
             List<DTOScadaModel> scadaVal = scada as List<DTOScadaModel>;
@@ -287,8 +250,9 @@ namespace Thermo.Active.Listeners.SignalR
 
             if (diffData.Count > 0)
             {
-                // salvo update
-                LastRecipeFullData = currRecipeFull;
+                // salvo update CLONANDO
+                //LastRecipeFullData = currRecipeFull;
+                LastRecipeFullData = currRecipeFull.Keys.ToDictionary(_ => _, _ => currRecipeFull[_].Clone());
 
                 var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
                 context.Clients.Group("ncData").recipeFullData(diffData);
@@ -325,7 +289,17 @@ namespace Thermo.Active.Listeners.SignalR
                 context.Clients.Group("ncData").recipeOverData(currRecipeOver);
             }
         }
-
+        public static void SendThermoRecipeChangedData(object message)
+        {
+            DTORecipeStatus currMessage = message as DTORecipeStatus;
+            if (currMessage.hasChanged != recipeHasChanged || currMessage.forceSend)
+            {
+                // salvo update
+                recipeHasChanged = currMessage.hasChanged;
+                var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
+                context.Clients.Group("ncData").recipeChangedData(currMessage);
+            }
+        }
         public static void SendThermoModulesData(object modules)
         {
             Dictionary<int, DTOModulesBlock> currModules = modules as Dictionary<int, DTOModulesBlock>;
@@ -355,7 +329,6 @@ namespace Thermo.Active.Listeners.SignalR
                 context.Clients.Group("ncData").modulesData(currModules);
             }
         }
-
         public static void SendThermoWarmersData(object warmers)
         {
             Dictionary<int, DTOWarmers> currWarmers = warmers as Dictionary<int, DTOWarmers>;
@@ -385,8 +358,6 @@ namespace Thermo.Active.Listeners.SignalR
                 context.Clients.Group("ncData").warmersData(currWarmers);
             }
         }
-
-
         public static void SendThermoAreaData(object area)
         {
             Dictionary<string, double> currArea = area as Dictionary<string, double>;
@@ -416,17 +387,34 @@ namespace Thermo.Active.Listeners.SignalR
                 context.Clients.Group("ncData").areaData(currArea);
             }
         }
-
         public static void sendThermoGaugeData(object currentLiveProd)
         {
             Dictionary<string, DTOThermoProd> currLiveProd = currentLiveProd as Dictionary<string, DTOThermoProd>;
+            Dictionary<string, DTOThermoProd> diffGaugeData = new Dictionary<string, DTOThermoProd>();
 
-            if (!LastLiveProdData.Equals(currLiveProd))
+            foreach (var item in currLiveProd)
             {
-                LastLiveProdData = currLiveProd;
+                if (!LastLiveProdData.ContainsKey(item.Key))
+                {
+                    diffGaugeData.Add(item.Key, item.Value);
+                }
+                else
+                {
+                    // comparazione
+                    if (!item.Value.Equals(LastLiveProdData[item.Key]))
+                    {
+                        diffGaugeData.Add(item.Key, item.Value);
+                    }
+                }
+            }
+
+            if (diffGaugeData.Count > 0)
+            {
+                // salvo update CLONANDO
+                LastLiveProdData = currLiveProd.Keys.ToDictionary(_ => _, _ => currLiveProd[_].Clone());
 
                 var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
-                context.Clients.Group("ncData").gaugeData(currLiveProd);
+                context.Clients.Group("ncData").gaugeData(diffGaugeData);
             }
         }
         public static void SendThermoProdPanelData(object prodPanelData)
@@ -466,7 +454,35 @@ namespace Thermo.Active.Listeners.SignalR
             }
         }
 
+        public static void SendThermoAxisInfoData(object axisInfoData)
+        {
+            Dictionary<int, DTOAxisInfoModel> currInfoAxes = axisInfoData as Dictionary<int, DTOAxisInfoModel>;
+            Dictionary<int, DTOAxisInfoModel> diffAxisData = new Dictionary<int, DTOAxisInfoModel>();
 
+            foreach (var item in currInfoAxes)
+            {
+                if (!LastAxisInfoData.ContainsKey(item.Key))
+                {
+                    diffAxisData.Add(item.Key, item.Value);
+                }
+                else
+                {
+                    // comparazione
+                    if (!item.Value.Equals(LastAxisInfoData[item.Key]))
+                    {
+                        diffAxisData.Add(item.Key, item.Value);
+                    }
+                }
+            }
+            // se ho differenze invio!
+            if (diffAxisData.Count > 0)
+            {
+                // salvo update CLONANDO
+                LastAxisInfoData= currInfoAxes.Keys.ToDictionary(_ => _, _ => currInfoAxes[_].Clone());
+                var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
+                context.Clients.Group("ncData").axisInfo(diffAxisData);
+            }
+        }
 
         public static void SetGatewayRebootStatus(object status)
         {
@@ -517,10 +533,8 @@ namespace Thermo.Active.Listeners.SignalR
             group.userSoftKeys(LastUserSoftKeysData);
             // Send heads data
             group.headsData(LastHeadsData);
-            // Send axesNames data
-            group.axesNames(LastAxesNamesData);
-            // Send positions
-            group.axesPositions(LastAxesPositions);
+            // Send Axis Info data
+            group.axisInfo(LastAxisInfoData);
             // Send active program data
             group.activeProgramData(LastProgramData);
             // Send magazine is active data
@@ -529,7 +543,7 @@ namespace Thermo.Active.Listeners.SignalR
             group.partProgramQueue(LastPartProgramQueue);
             // Send m156
             group.m156Data(LastM156Data);
-           
+
             // Send Scada
             group.scadaData(LastScadaData);
 

Thermo.Active/Listeners/SignalRStaticObjects.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Thermo.Active.Model.DTOModels;
 using Thermo.Active.Model.DTOModels.AlarmModels;
 using Thermo.Active.Model.DTOModels.Scada;
+using Thermo.Active.Model.DTOModels.ThAxes;
 using Thermo.Active.Model.DTOModels.ThModules;
 using Thermo.Active.Model.DTOModels.ThProd;
 using Thermo.Active.Model.DTOModels.ThRecipe;
@@ -22,8 +23,6 @@ namespace Thermo.Active.Listeners
         public static List<DTOUserSoftKeyModel> LastUserSoftKeysData = new List<DTOUserSoftKeyModel>();
         public static List<DTONcSoftKeyModel> LastNcSoftKeysData = new List<DTONcSoftKeyModel>();
         public static List<DTOHeadModel> LastHeadsData = new List<DTOHeadModel>();
-        public static DTOAxesModel LastAxesPositions = new DTOAxesModel();
-        public static List<DTOAxisNameModel> LastAxesNamesData = new List<DTOAxisNameModel>();
         public static DTOActiveProgramDataModel LastProgramData = new DTOActiveProgramDataModel();
         public static Dictionary<int, bool> LastNcMagazineIsActive = new Dictionary<int, bool>();
         public static List<DTOQueueModel> LastPartProgramQueue = new List<DTOQueueModel>();
@@ -33,9 +32,10 @@ namespace Thermo.Active.Listeners
         public static List<DTOM156InputModel> LastM156Data = new List<DTOM156InputModel>();
         public static List<DTOScadaModel> LastScadaData = new List<DTOScadaModel>();
 
-        // FIXME TODO inserire oggetti corretti per THERMO
+        // Oggetti specifici per THERMO (1° definizione)
         public static Dictionary<string, DTORecipeParam> LastRecipeFullData = new Dictionary<string, DTORecipeParam>();
         public static Dictionary<RecipeSection, RecipeCatStatus> LastRecipeOverData = new Dictionary<RecipeSection, RecipeCatStatus>();
+        public static bool? recipeHasChanged = null;
         public static Dictionary<int, DTOModulesBlock> LastModulesData = new Dictionary<int, DTOModulesBlock>();
         public static Dictionary<int, DTOWarmers> LastWarmersData = new Dictionary<int, DTOWarmers>();
         public static Dictionary<string, double> LastAreaData = new Dictionary<string, double>();
@@ -43,6 +43,8 @@ namespace Thermo.Active.Listeners
         public static ThermoModels.ProdCycleModel LastProdCycleData = new ThermoModels.ProdCycleModel();
         public static DTOProdInfo LastProdInfoData = new DTOProdInfo();
         public static DTOThermoPanelProd LastProdPanelData = new DTOThermoPanelProd();
+        // Oggetti per assi THERMO
+        public static Dictionary<int, DTOAxisInfoModel> LastAxisInfoData = new Dictionary<int, DTOAxisInfoModel>();
 
         public static bool LastIsNcConnected = false;
     }

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.14.80")]
+[assembly: AssemblyVersion("0.20.100")]

Thermo.Active/wwwroot/assets/styles/base/buttons.less

@@ -378,8 +378,9 @@ fieldset[disabled] .form-group.is-focused .togglebutton label {
   margin-left: 5px;
 
   &.error {
-    background-color: rgba(255, 0, 0, .7);
+    background-color: rgba(255, 0, 0, .7) !important;
     color: #222;
+    background-image: none !important;
   }
 }
 

Thermo.Active/wwwroot/assets/styles/base/card.less

@@ -309,7 +309,7 @@
     margin-right: 20px;
 
     .fa-arrow-up,
-    .fa-arrow-down { 
+    .fa-arrow-down {
       font-size: 24px;
     }
 
@@ -890,7 +890,7 @@
     .axes:last-child {
       margin-bottom: 16px;
     }
-    
+
     .tabs {
       min-height: 30px;
       width: 100%;
@@ -937,7 +937,7 @@
   border-radius: 2px;
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
 
-  .label-container{
+  .label-container {
     display: flex;
     justify-content: space-around;
     font-weight: 600;
@@ -962,6 +962,63 @@
 }
 
 .card-folder-path {
+
+  .context-menu {
+    position: relative;
+    width: 40px;
+
+    .context-area {
+      top: 50px;
+      display: none;
+      background-color: #fff;
+      box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
+      position: absolute;
+      width: 300px;
+      left: -150px + 24px;
+      padding-inline-start: 0;
+      padding-inline-end: 0;
+
+
+      &.show {
+        display: block !important;
+        z-index: 10;
+      }
+
+      li {
+        list-style-type: none;
+        height: 62px;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.5);
+        color: #545454;
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        padding: 0 28px;
+        font-weight: 500;
+        font-size: 18px;
+
+        cursor: pointer;
+
+        &:last-of-type {
+          border-bottom: none;
+        }
+      }
+
+      &:before {
+        content: "";
+        position: absolute;
+        top: -15px;
+        left: calc(~'50% - 8px');
+        display: block;
+        width: 0;
+        height: 0;
+        border-left: 15px solid transparent;
+        border-right: 15px solid transparent;
+        border-bottom: 15px solid #fff;
+      }
+    }
+
+  }
+
   width: auto;
   height: 64px;
   display: flex;
@@ -1555,7 +1612,7 @@
           padding-right: 8px;
           font-size: 20px;
           text-align: left;
-          padding-left: 8px; 
+          padding-left: 8px;
         }
       }
 
@@ -1930,7 +1987,7 @@
   background-color: @color-clear-blue-30;
   color: #002680;
 
-  .not-exist{
+  .not-exist {
     color: #d0021b !important;
   }
 
@@ -6104,4 +6161,4 @@
           }
         }
     }
-} */
+} */

Thermo.Active/wwwroot/assets/styles/base/dashboard.less

@@ -173,9 +173,10 @@
         }
 
         time {
-          font-size: 120px;
+          font-size: 100px;
           font-weight: 300;
           z-index: 1;
+          max-height: 140px;
         }
       }
 

Thermo.Active/wwwroot/assets/styles/base/footer.less

@@ -26,6 +26,9 @@ footer {
     display: flex;
     align-items: center;
     justify-content: space-evenly;
+    img {
+      margin: 0px 5px;
+    }
   }
 
   .container {

Thermo.Active/wwwroot/assets/styles/base/input.less

@@ -139,6 +139,25 @@ select:focus {
 
 }
 
+.input-select{
+  font-size: 18px;
+  font-weight: 500;
+  color: #6d6d6d;
+  min-width: 200px;
+  width: fit-content;
+  height: 48px;
+  border-radius: 2px;
+  box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
+  border: none;
+  display: flex;
+  flex-flow: row nowrap;
+  padding: 0 10px;
+  align-items: center;
+  justify-content: stretch;
+  padding-right: 25px;
+  position: relative;
+  cursor: pointer;
+}
 
 .input-area {
   width: 100%;

Thermo.Active/wwwroot/assets/styles/base/modals.less

@@ -216,6 +216,17 @@
       margin-left: auto;
     }
   }
+  .content-modal-showval {
+    display: flex;
+    align-items: center;
+
+    span {
+      word-wrap: break-word;
+      max-width: 700px;
+      font-size: 30px
+    }
+
+  }
 
   .content-btn {
     width: 592px;
@@ -1159,7 +1170,7 @@
   justify-content: center;
 
   &.nc {
-    z-index: 700;
+    z-index: 1002;
   }
 
   &.internal {
@@ -1493,7 +1504,6 @@
     .title_lbl,
     .description_lbl {
       margin-top: 22px;
-      margin-left: 24px;
       font-size: 14px;
       color: @color-warm-grey;
       margin-bottom: 4px;
@@ -2378,7 +2388,7 @@
           line-height: 4px;
 
           .title {
-            min-width: 110px;
+            min-width: 130px;
             text-align: right;
             color: @color-darkish-blue;
           }
@@ -2436,6 +2446,9 @@
             overflow: visible;
             position: relative;
             cursor: pointer;
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
 
             img {
               display: block;
@@ -2475,6 +2488,11 @@
           overflow-x: hidden;
           height: calc(~"100% - 360px");
           flex-flow: column;
+          
+          .key {
+            width: 200px;
+            font-weight: 800;
+          }
 
           .row {
             width: 99%;
@@ -3427,7 +3445,7 @@
   position: absolute;
   width: 100%;
   height: 100%;
-  background: #cccccc;
+  background: #ffffff;
   top: 0;
   display: block;
   overflow: hidden;
@@ -4118,8 +4136,7 @@
     display: flex;
     flex-flow: column;
 
-    .title_lbl,
-    .description_lbl {
+    .title_lbl {
       margin-top: 22px;
       margin-left: 24px;
       font-size: 14px;

Thermo.Active/wwwroot/assets/styles/base/processo.less

@@ -31,10 +31,8 @@
         border: none;
         border-radius: 2px;
         background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
-        display: grid;
-        grid-template-columns: 48px 101px;
-        grid-template-rows: 48px;
-
+        height: 48px;
+        
         span {
           margin: auto;
           font-size: 13px;

Thermo.Active/wwwroot/assets/styles/base/riscaldi.less

@@ -33,4 +33,11 @@
     }
   }
 
+  .icon{
+    font-size: 30px;
+    margin-left: 10px;
+  }
+
+
+
 }

Thermo.Active/wwwroot/assets/styles/base/saveas.less

@@ -1,32 +1,34 @@
 // out: false, sourceMap: false, main: ../style.less
 .modal.save-as {
-  width: 500px;
-  height: 300px;
-  top: calc(~'50% - 200px');
+  width: 600px;
+  height: 400px;
+  top: calc(~'50% - 250px');
+
+  section{
+    display: block !important;
+  }
+
+  label{    
+    margin-top: 22px;
+    font-size: 14px;
+    color: #878787;
+    margin-bottom: 4px;
+  }
 
   article {
 
-    label {
-      color: #002680;
-      font-size: 24px;
-      font-weight: 500;
-      overflow: hidden;
-      margin-bottom: 10px;
-    }
-
     input {
       padding: 5px;
       font-size: 18px;
       font-weight: 500;
       color: #6d6d6d;
-      width: 100%;
       height: 48px;
       border-radius: 2px;
       box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
       border: none;
       display: flex;
       flex-flow: row nowrap;
-      padding: 0 4px;
+      padding: 0 20px;
       align-items: center;
       justify-content: stretch;
     }

Thermo.Active/wwwroot/assets/styles/base/setup.less

@@ -12,6 +12,42 @@
   width: 100vw;
   height: 100vh;
 
+  .notes_textarea{
+    border-radius: 2px;
+    height: 97px;
+    box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
+    border: solid 1px #bbbcbc;
+    padding: 10px;
+    box-sizing: border-box;
+    resize: none;
+  }
+
+  .select_folder{    
+    height: 48px;
+    background-color: #fff;
+    padding: 0 20px;
+    font-size: 1rem;
+    font-weight: 500;
+    color: #6d6d6d;
+    border-radius: 2px;
+    box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
+    border: none;
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    justify-content: stretch;
+    padding-right: 25px;
+    position: relative;
+    cursor: pointer;
+  }
+
+  .description_lbl{    
+    margin-top: 22px;
+    font-size: 14px;
+    color: #878787;
+    margin-bottom: 4px;
+  }
+
   .tab-header {
     display: flex;
     flex-flow: row;
@@ -173,7 +209,7 @@
       }
 
       footer {
-        height: 82px;
+        height: 64px;
         display: flex;
         justify-content: flex-end;
         align-items: center;

Thermo.Active/wwwroot/assets/styles/style.css

@@ -10,6 +10,39 @@
   width: 100vw;
   height: 100vh;
 }
+.setup .notes_textarea {
+  border-radius: 2px;
+  height: 97px;
+  box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
+  border: solid 1px #bbbcbc;
+  padding: 10px;
+  box-sizing: border-box;
+  resize: none;
+}
+.setup .select_folder {
+  height: 48px;
+  background-color: #fff;
+  padding: 0 20px;
+  font-size: 1rem;
+  font-weight: 500;
+  color: #6d6d6d;
+  border-radius: 2px;
+  box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
+  border: none;
+  display: flex;
+  flex-flow: row nowrap;
+  align-items: center;
+  justify-content: stretch;
+  padding-right: 25px;
+  position: relative;
+  cursor: pointer;
+}
+.setup .description_lbl {
+  margin-top: 22px;
+  font-size: 14px;
+  color: #878787;
+  margin-bottom: 4px;
+}
 .setup .tab-header {
   display: flex;
   flex-flow: row;
@@ -144,7 +177,7 @@
   width: 100%;
 }
 .setup .modal section.body footer {
-  height: 82px;
+  height: 64px;
   display: flex;
   justify-content: flex-end;
   align-items: center;
@@ -548,6 +581,15 @@ article .box .body {
 .modal.m155 .content-real-showval input {
   margin-left: auto;
 }
+.modal.m155 .content-modal-showval {
+  display: flex;
+  align-items: center;
+}
+.modal.m155 .content-modal-showval span {
+  word-wrap: break-word;
+  max-width: 700px;
+  font-size: 30px;
+}
 .modal.m155 .content-btn {
   width: 592px;
   box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4);
@@ -1356,7 +1398,7 @@ article .box .body {
   justify-content: center;
 }
 .backdrop.nc {
-  z-index: 700;
+  z-index: 1002;
 }
 .backdrop.internal {
   height: calc(100vh - 80px);
@@ -1639,7 +1681,6 @@ article .box .body {
 .modal.create-maintenance .title .description_lbl,
 .modal.create-maintenance .description .description_lbl {
   margin-top: 22px;
-  margin-left: 24px;
   font-size: 14px;
   color: #878787;
   margin-bottom: 4px;
@@ -2523,7 +2564,7 @@ article .box .body {
 .modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-header .subtitle .title,
 .modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-header .subtitle .title,
 .modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-header .subtitle .title {
-  min-width: 110px;
+  min-width: 130px;
   text-align: right;
   color: #002680;
 }
@@ -2593,6 +2634,9 @@ article .box .body {
   overflow: visible;
   position: relative;
   cursor: pointer;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
 }
 .modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image .container img,
 .modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image .container img,
@@ -2639,6 +2683,13 @@ article .box .body {
   height: calc(100% - 360px);
   flex-flow: column;
 }
+.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .key,
+.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .key,
+.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .key,
+.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .key {
+  width: 200px;
+  font-weight: 800;
+}
 .modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row,
 .modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row,
 .modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .row,
@@ -3458,7 +3509,7 @@ article .box .body {
   position: absolute;
   width: 100%;
   height: 100%;
-  background: #cccccc;
+  background: #ffffff;
   top: 0;
   display: block;
   overflow: hidden;
@@ -4051,9 +4102,7 @@ article .box .body {
   flex-flow: column;
 }
 .modal.create-user .title .title_lbl,
-.modal.create-user .description .title_lbl,
-.modal.create-user .title .description_lbl,
-.modal.create-user .description .description_lbl {
+.modal.create-user .description .title_lbl {
   margin-top: 22px;
   margin-left: 24px;
   font-size: 14px;
@@ -4298,9 +4347,10 @@ article .box .body {
 .dashboard .first_col .timing-area .start time,
 .dashboard .first_col .timing-area .current time,
 .dashboard .first_col .timing-area .end time {
-  font-size: 120px;
+  font-size: 100px;
   font-weight: 300;
   z-index: 1;
+  max-height: 140px;
 }
 .dashboard .first_col .timing-area .start::before {
   background-image: url(/assets/svg/dashboard-top-left.svg);
@@ -4553,6 +4603,10 @@ article .box .body {
   font-weight: bold;
   color: #fff;
 }
+.warmers .icon {
+  font-size: 30px;
+  margin-left: 10px;
+}
 .slider {
   display: grid;
   grid-template-columns: 48px 1fr 48px;
@@ -5064,9 +5118,7 @@ article .box .body {
   border: none;
   border-radius: 2px;
   background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
-  display: grid;
-  grid-template-columns: 48px 101px;
-  grid-template-rows: 48px;
+  height: 48px;
 }
 .modal.processo-info header .tab-header button span {
   margin: auto;
@@ -5518,6 +5570,25 @@ select:focus {
   color: #002680;
   flex: 1;
 }
+.input-select {
+  font-size: 18px;
+  font-weight: 500;
+  color: #6d6d6d;
+  min-width: 200px;
+  width: fit-content;
+  height: 48px;
+  border-radius: 2px;
+  box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
+  border: none;
+  display: flex;
+  flex-flow: row nowrap;
+  padding: 0 10px;
+  align-items: center;
+  justify-content: stretch;
+  padding-right: 25px;
+  position: relative;
+  cursor: pointer;
+}
 .input-area {
   width: 100%;
   display: flex;
@@ -5981,8 +6052,9 @@ fieldset[disabled] .form-group.is-focused .togglebutton label {
   margin-left: 5px;
 }
 .togglebutton label .toggle.error {
-  background-color: rgba(255, 0, 0, 0.7);
+  background-color: rgba(255, 0, 0, 0.7) !important;
   color: #222;
+  background-image: none !important;
 }
 .togglebutton label .toggle,
 .togglebutton label input[type=checkbox][disabled] + .toggle {
@@ -6603,6 +6675,9 @@ footer .machine-area {
   align-items: center;
   justify-content: space-evenly;
 }
+footer .machine-area img {
+  margin: 0px 5px;
+}
 footer .container {
   display: flex;
   flex-direction: row;
@@ -10669,6 +10744,53 @@ footer .container button.big:before {
   margin: 4px 0 4px 5px;
   cursor: pointer;
 }
+.card-folder-path .context-menu {
+  position: relative;
+  width: 40px;
+}
+.card-folder-path .context-menu .context-area {
+  top: 50px;
+  display: none;
+  background-color: #fff;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
+  position: absolute;
+  width: 300px;
+  left: -126px;
+  padding-inline-start: 0;
+  padding-inline-end: 0;
+}
+.card-folder-path .context-menu .context-area.show {
+  display: block !important;
+  z-index: 10;
+}
+.card-folder-path .context-menu .context-area li {
+  list-style-type: none;
+  height: 62px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.5);
+  color: #545454;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 0 28px;
+  font-weight: 500;
+  font-size: 18px;
+  cursor: pointer;
+}
+.card-folder-path .context-menu .context-area li:last-of-type {
+  border-bottom: none;
+}
+.card-folder-path .context-menu .context-area:before {
+  content: "";
+  position: absolute;
+  top: -15px;
+  left: calc(50% - 8px);
+  display: block;
+  width: 0;
+  height: 0;
+  border-left: 15px solid transparent;
+  border-right: 15px solid transparent;
+  border-bottom: 15px solid #fff;
+}
 .card-folder-path:not(.disabled):active {
   background-color: rgba(0, 0, 0, 0.4);
   box-shadow: none;
@@ -23796,30 +23918,31 @@ footer .container button.big:before {
   color: #4b4b4b;
 }
 .modal.save-as {
-  width: 500px;
-  height: 300px;
-  top: calc(50% - 200px);
+  width: 600px;
+  height: 400px;
+  top: calc(50% - 250px);
 }
-.modal.save-as article label {
-  color: #002680;
-  font-size: 24px;
-  font-weight: 500;
-  overflow: hidden;
-  margin-bottom: 10px;
+.modal.save-as section {
+  display: block !important;
+}
+.modal.save-as label {
+  margin-top: 22px;
+  font-size: 14px;
+  color: #878787;
+  margin-bottom: 4px;
 }
 .modal.save-as article input {
   padding: 5px;
   font-size: 18px;
   font-weight: 500;
   color: #6d6d6d;
-  width: 100%;
   height: 48px;
   border-radius: 2px;
   box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
   border: none;
   display: flex;
   flex-flow: row nowrap;
-  padding: 0 4px;
+  padding: 0 20px;
   align-items: center;
   justify-content: stretch;
 }

Thermo.Active/wwwroot/src/@types/signalr.process.d.ts

@@ -38,6 +38,8 @@ declare module signalr_process {
     type: string;
     toDelete: boolean;
     toDisplay: boolean;
+    isM156: boolean;
+    id: number;
   }
 
 }

Thermo.Active/wwwroot/src/App.ts

@@ -58,7 +58,8 @@ export default class app extends Vue {
   loadingOperations = 0;
   HMIsrc = null;
   hub: Hub = null;
-  prioritizeWindowsButtons = false;
+  prioritizeWindowsButtons1 = false;
+  prioritizeWindowsButtons2 = false;
 
   beforeMount() {
     moment.locale((window.navigator as any).userLanguage || window.navigator.language);
@@ -66,11 +67,11 @@ export default class app extends Vue {
   mounted() {
     let ms = messageService;
 
-    window.oncontextmenu = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-      return false;
-    };
+    // window.oncontextmenu = function (event) {
+    //   event.preventDefault();
+    //   event.stopPropagation();
+    //   return false;
+    // };
 
     // if cms is connected
     if (typeof cmsClient != "undefined")
@@ -82,12 +83,12 @@ export default class app extends Vue {
 
     ms.subscribeToChannel("show-modal-login", args => {
       this.applyBlur = true;
-      this.prioritizeWindowsButtons = true;
+      this.prioritizeWindowsButtons1 = true;
     });
 
     ms.subscribeToChannel("hide-modal-login", args => {
       this.applyBlur = false;
-      this.prioritizeWindowsButtons = false;
+      this.prioritizeWindowsButtons1 = false;
     });
 
     ms.subscribeToChannel("hide-modal", args => {
@@ -96,10 +97,12 @@ export default class app extends Vue {
 
     ms.subscribeToChannel("show-modal-nc-called", args => {
       this.applyBlurNc = true;
+      this.prioritizeWindowsButtons2 = true;
     });
 
     ms.subscribeToChannel("hide-modal-nc-called", args => {
       this.applyBlurNc = false;
+      this.prioritizeWindowsButtons2 = false;
     });
 
     ms.subscribeToChannel("show-modal-internal", args => {
@@ -178,8 +181,13 @@ export default class app extends Vue {
     return this.$store.state.isShowPreDashboard;
   }
 
+  get prioritizeWindowsButtons() {
+    return this.prioritizeWindowsButtons1 || this.prioritizeWindowsButtons2;
+  }
+
   onmousedown() {
     KeyboardHelper.hideKeyboard();
+    messageService.publishToChannel('hideall');
   }
 
   @Watch("isMainViewLiftedUp")

Thermo.Active/wwwroot/src/App.vue

@@ -1,10 +1,10 @@
 <template>
 	<div class="container" @mousedown="onmousedown">
 		<div id="app">
-			<app-header :class="{'blur':applyBlur}"></app-header>
+			<app-header :class="{'blur':applyBlur || applyBlurNc}"></app-header>
 			<dashboard v-if="statusDashboard"></dashboard>
 			<predashboard v-if="statusPreDashboard"></predashboard>
-			<alarm-list :applyBlur="applyBlur"></alarm-list>
+			<alarm-list :applyBlur="applyBlur || applyBlurNc"></alarm-list>
 
 			<div
 				id="main-view"
@@ -23,7 +23,7 @@
 		<modal-container containerName="modal-login" name="modal-login"></modal-container>
 		<keyboard></keyboard>
 
-		<div class="window-buttons" :class="{prioritize: prioritizeWindowsButtons}">
+		<div class="window-buttons" :class="{prioritize: prioritizeWindowsButtons, 'blur':(applyBlurNc && !prioritizeWindowsButtons)}">
 			<button
 				class="gray square close"
 				@click="sendMessage('hide')"
@@ -35,7 +35,8 @@
 				:title="'header_tooltip_btn_close' | localize('Close the application')"
 			>&times;</button>
 		</div>
-		<modal-container name="modal"></modal-container>
+    	<modal-container name="modal"  :class="{'blur':applyBlurNc}"></modal-container>
+		<modal-nc-container name="modal-nc"></modal-nc-container>
 	</div>
 </template>
 <script src="./App.ts" lang="ts"></script>

Thermo.Active/wwwroot/src/app.business-logic.ts

@@ -39,7 +39,7 @@ messageService.subscribeToChannel("show-contact-info", () => { ModalHelper.ShowM
 
 // messageService.subscribeToChannel("show-axes-calibration", () => { ModalHelper.ShowNcModal(AxesCalibration); });
 // messageService.subscribeToChannel("hide-axes-calibration", () => { ModalHelper.HideNcModal(AxesCalibration); });
-// messageService.subscribeToChannel("show-m155-questions", () => { ModalHelper.ShowNextM155Modal(); });
+messageService.subscribeToChannel("show-m155-questions", () => { ModalHelper.ShowNextM155Modal(); });
 // messageService.subscribeToChannel("show-nochange-page", () => {
 //   ModalHelper.ShowMessage(
 //     Vue.filter('localize')("modal_nochangepage_title", "Operazione non possibile"),
@@ -61,6 +61,7 @@ async function loadMachineConfig() {
     machineStatusActions.setAreasConfg(store, result);
 
     let mcresult = await machine.getMachineConfiguration();
+    machineStatusActions.setWarmersParameters(store, mcresult.additionalParameters);
 
     await prodService.GetProdPanel();
 

Thermo.Active/wwwroot/src/app.routes.ts

@@ -6,6 +6,7 @@ import {
   // CardFolderPath,
   // ModalIframe,
   ModalLoadProgram,
+  Utilities,
   // ProgramManagement,
   // ModalJobAddParameter,
   // ModalEditJob,
@@ -27,7 +28,7 @@ function injectRoutes(mainRoute, childroutes) {
 
 export let routes = [
   // { path: "", component: Home, name: "home", meta: { title: "Dashboard" } },
-  // { path: "/utilities", component: Utilities, meta: { title: "Utilities", area: "utilities" } },
+  { path: "/utilities", component: Utilities, meta: { title: "Utilities", area: "utilities" } },
   // { path: "/card-utilities", component: CardUtilities, meta: { title: "Card-Utilities", area: "card-utilities" } },
   // { path: "/card-tool-depot", component: CardToolDepot, meta: { title: "Card-Tool-Depot", area: "card-tool-depot" } },
   // { path: "/softkeys-prefered", component: SoftKeysPrefered, meta: { title: "Softkeys-Prefered", area: "softkeys-prefered" } },
@@ -61,7 +62,7 @@ import { routes as ProgrPreriscaldoRoutes } from "@/app_modules_thermo/programma
 // import { routes as maintenance } from "./app_modules/maintenance/route";
 // import { routes as scada} from "./app_modules/scada/route";
 // import { routes as reports } from "./app_modules/reports/route";
-// import { routes as users } from "./app_modules/users/route";
+import { routes as users } from "./app_modules/users/route";
 
 injectRoutes(routes, alarmRoutes);
 injectRoutes(routes, productionRoutes);
@@ -71,7 +72,7 @@ injectRoutes(routes, ProgrPreriscaldoRoutes);
 // injectRoutes(routes, maintenance);
 // injectRoutes(routes, scada);
 // injectRoutes(routes, reports);
-// injectRoutes(routes, users);
+injectRoutes(routes, users);
 
 
 

Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.ts

@@ -0,0 +1,95 @@
+import { AppModel } from "src/store";
+import { Modal, ModalHelper } from "src/components/modals";
+import Component from "vue-class-component";
+import Vue from "vue";
+import { Hub } from "src/services";
+import { Factory, messageService } from "src/_base";
+import { Watch } from "vue-property-decorator";
+
+@Component({ components: { modal: Modal } })
+export default class M155Dialog extends Vue{
+  
+  data = null;
+  value = 0;
+
+  MULTIPLE_BUTTONS = "MULTIPLE_BUTTONS";
+  REAL = "REAL";
+  SHOW_VAL = "SHOW_VAL"
+  MODAL = "MODAL"
+
+  mounted(){
+    this.data = ModalHelper.M155ModalData.data;
+    this.value = -1;
+
+    // Populate translations
+    if(this.data.isM156) {
+      this.data.message = this.$options.filters.localize("m156_title_" + this.data.id, "Title");
+
+      for(const key in this.data.buttons){
+        this.data.buttons[key] = this.$options.filters.localize("m156_" + this.data.id + "_button_" + this.data.buttons[key], "Title");
+      }
+
+      if(this.data.buttons)
+        Object.keys(this.data.buttons).forEach(btn => {
+          btn = this.$options.filters.localize("m156_title_" + this.data.id, "Title");
+        }); 
+    }
+
+    messageService.subscribeToChannel("show-modal-nc", args => {
+      this.data = ModalHelper.M155ModalData.data;
+    });
+  }
+
+  get process(){
+    if(this.data)
+      return this.data.process;
+    return 0;
+  }
+
+  @Watch("data")
+  dataChanged(){
+    this.value = -1;
+  }
+  
+  ischecked(k){
+    return k == this.value;
+  }
+
+  check(k){
+    return this.value = k;
+  }
+
+  canSendAnswer(){
+    if(this.getType == this.MODAL)
+      return false
+    else if(this.getType == this.REAL)
+      return this.value != null && this.value != undefined;
+    else
+      return this.value && this.value != -1;
+  }
+
+  answerVisible(){
+    if(this.getType == this.MODAL)
+      return false
+    return true;
+  }
+
+  get getType(){
+    if(this.data)
+      return this.data.type
+    
+    return ""
+  }
+
+  hide() {
+    ModalHelper.M155ModalData.data.toDisplay = false;
+    ModalHelper.HideThisM155Modal(ModalHelper.M155ModalData.data.processId);
+  }
+
+  answer(){    
+    if(!this.data.isM156)
+      Hub.Current.WriteM155Response(this.data.process,this.value);
+    else 
+      Hub.Current.WriteM156Response(this.data.process,this.value);
+  }
+};

Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.vue

@@ -0,0 +1,37 @@
+<template>
+<modal :title="'modal_m155_standard' | localize('Message from the machine')" class="m155" :class="{'multiple': getType != REAL}" name="modal" >
+        <div v-if="data">   
+            <h2 v-if="getType != SHOW_VAL && getType != MODAL">{{data.message}}</h2>
+            <div class="content-real" v-if="getType == REAL">
+                <span>{{'modal_m155_value' | localize("Value: ")}}</span>
+                <input type="number" min="0" max="4294967295" v-model="value">
+            </div>  
+               
+            <div class="content-real-showval" v-if="getType == SHOW_VAL">
+                <span>{{data.message}}</span>   
+                <input type="number" min="0" max="4294967295" v-model="data.value" disabled="disabled">
+            </div>  
+
+            <div class="content-modal-showval" v-if="getType == MODAL" >
+                <span>{{data.message}}</span>   
+            </div>
+
+            <div v-if="getType == MULTIPLE_BUTTONS" >
+                <div class="content-btn" v-for="(t,k) in data.buttons" :key="'m155_'+k"  @click="check(k)">
+                    <input type="radio" name="radio-group" :checked="ischecked(k)" >
+                    <label for="datefixed">{{t}}</label>       
+                </div>
+            </div>
+        </div>
+        <footer >  
+            <div class="pull-left">
+                <button class="btn" @click="hide()">{{'modal_m155_hide_window' | localize("Hide")}}</button>
+            </div>
+            <div class="pull-right" v-if="answerVisible()" >
+                <button class="btn btn-success" @click="answer()" :disabled="!canSendAnswer()">{{'confirm_request_confirm' | localize("Confirm")}}</button>
+            </div>
+        </footer>
+  </modal>
+</template>
+<script src="./m155-dialog.ts" lang="ts"></script>
+

Thermo.Active/wwwroot/src/app_modules/machine/index.ts

@@ -13,5 +13,6 @@ export {
   ContactInfoDialog,
   UserInfoDialog,
   UserInfo,
-  CmsconnectInfoDialog
+  CmsconnectInfoDialog,
+  M155Questions
 }

Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/arch-interface.vue

@@ -1,45 +1,36 @@
 <template>
 	<div class="arch">
-		<div class="box-gauge">
+		<div class="box-gauge" v-if="gaugeData && gaugeData.power">
 			<gauge
 				:min="gaugeData.power.minVal"
 				:max="gaugeData.power.maxVal"
 				:value="gaugeData.power.value"
 			></gauge>
-			<div
-				v-if="gaugeData && gaugeData.power"
-				class="value"
-			>{{gaugeData.power.value | round(gaugeData.power.numDec)}}</div>
-			<div v-if="gaugeData && gaugeData.power">
+			<div class="value">{{gaugeData.power.value | round(gaugeData.power.numDec)}}</div>
+			<div>
 				<label>{{gaugeData.power.um}}</label>
 				<label>{{gaugeData.power.label | localize("Potenza")}}</label>
 			</div>
 		</div>
 
-		<div class="box-gauge">
+		<div class="box-gauge" v-if="gaugeData && gaugeData.air">
 			<gauge :min="gaugeData.air.minVal" :max="gaugeData.air.maxVal" :value="gaugeData.air.value"></gauge>
-			<div
-				v-if="gaugeData && gaugeData.air"
-				class="value"
-			>{{gaugeData.air.value | round(gaugeData.air.numDec)}}</div>
-			<div v-if="gaugeData && gaugeData.air">
+			<div class="value">{{gaugeData.air.value | round(gaugeData.air.numDec)}}</div>
+			<div>
 				<label>{{gaugeData.air.um}}</label>
 				<label>{{gaugeData.air.label | localize("Aria")}}</label>
 			</div>
 		</div>
 
-		<div class="box-gauge">
+		<div class="box-gauge" v-if="gaugeData && gaugeData.vacuum">
 			<gauge
 				:min="gaugeData.vacuum.minVal"
 				:max="gaugeData.vacuum.maxVal"
 				:value="gaugeData.vacuum.value"
 				:clockwise="false"
 			></gauge>
-			<div
-				v-if="gaugeData && gaugeData.vacuum"
-				class="value"
-			>{{gaugeData.vacuum.value | round(gaugeData.vacuum.numDec)}}</div>
-			<div v-if="gaugeData && gaugeData.vacuum">
+			<div class="value">{{gaugeData.vacuum.value | round(gaugeData.vacuum.numDec)}}</div>
+			<div>
 				<label>{{gaugeData.vacuum.um}}</label>
 				<label>{{gaugeData.vacuum.label | localize("Vuoto")}}</label>
 			</div>

Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.ts

@@ -2,6 +2,7 @@ import Component from "vue-class-component";
 import Vue from "vue";
 import { Prop } from "vue-property-decorator";
 import lottie from "lottie-web";
+import { messageService } from "@/_base";
 
 @Component({})
 export default class Combo extends Vue {
@@ -42,7 +43,7 @@ export default class Combo extends Vue {
   }
 
   mounted() {
-
+    messageService.subscribeToChannel('hideall', () => this.hideList());
   }
 
 }

Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue

@@ -9,7 +9,7 @@
 			<i v-if="opened" class="fa fa-chevron-up" />
 			<i v-else class="fa fa-chevron-down" />
 		</div>
-		<div class="droplist" v-if="opened">
+		<div class="droplist" v-if="opened" @mousedown.prevent.stop>
 			<div
 				class="droplist-item"
 				v-for="opt in options"

Thermo.Active/wwwroot/src/app_modules_thermo/components/keyboard.ts

@@ -24,9 +24,14 @@ export default class Keyboard extends Vue {
 
   set Value(v: number) {
     try {
-      let scale = Math.pow(10, this.actualValue.numDec);
-      this.actualValue.setpointHMI = Math.round(v * scale) / scale;
-    } catch{
+      let scale = Math.pow(10, this.actualValue.numDec ?? 0);
+      let result = Math.round(v * scale) / scale;
+
+      if (!Number.isNaN(result) && Number.isFinite(result))
+        this.actualValue.setpointHMI = result;
+      else
+        this.actualValue.setpointHMI = v;
+    } catch {
       this.actualValue.setpointHMI = v;
     }
   }

Thermo.Active/wwwroot/src/app_modules_thermo/components/numeric.ts

@@ -35,8 +35,12 @@ export default class Numeric extends Vue {
 
   set Value(v: number) {
     try {
-      let scale = Math.pow(10, this.value.numDec);
-      this.value.setpointHMI = Math.round(v * scale) / scale;
+      let scale = Math.pow(10, this.value.numDec ?? 0);
+      let result = Math.round(v * scale) / scale;
+      if (!Number.isNaN(result) && Number.isFinite(result))
+        this.value.setpointHMI = result;
+      else
+        this.value.setpointHMI = v;
     } catch {
       this.value.setpointHMI = v;
     }

Thermo.Active/wwwroot/src/app_modules_thermo/components/numeric.vue

@@ -12,7 +12,7 @@
 			:id="id"
 			:disabled="value.status && !value.status.enabled"
 		/>
-		<span v-if="value.unitMeasure">{{unitMeasure}}</span>
+		<span v-if="value && value.unitMeasure">{{value.unitMeasure}}</span>
 	</div>
 </template>
 <script src="./numeric.ts" lang="ts"></script>

Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.ts

@@ -6,6 +6,7 @@ import { store, MachineStatusModel } from "@/store";
 import { SoftKeysConfigurationModel, machineInfoStore } from "@/store/machineInfo.store";
 import { Hub, machineService } from "@/services";
 import { Watch } from "vue-property-decorator";
+import { messageService } from "@/_base";
 
 @Component({
   components: { softKey }
@@ -60,6 +61,7 @@ export default class Paddle extends Vue {
 
   async mounted() {
     this.loadData();
+    messageService.subscribeToChannel('hideall', () => { this.isOpen = false; this.openFull = false; })
   }
 
   @Watch("isOpen")

Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.vue

@@ -1,5 +1,9 @@
 <template>
-	<div class="paddle" :class="{'open-half': isOpen && !openFull, 'open-full': isOpen && openFull}">
+	<div
+		class="paddle"
+		:class="{'open-half': isOpen && !openFull, 'open-full': isOpen && openFull}"
+		@mousedown.prevent.stop
+	>
 		<nav class="paddleButton" @click="isOpen = !isOpen; openFull = false;sendKeyCancel()">
 			<div class="circles">
 				<div></div>

Thermo.Active/wwwroot/src/app_modules_thermo/components/slider.ts

@@ -38,6 +38,7 @@ export default class Slider extends Vue {
   incrementingStep: number;
 
   step: number = 1;
+  initalStep: number = 1;
   // get step() {
   // var s = ((this.value.range.max - this.value.range.min) / (this.lines + 1));
   // var m = Math.pow(10, this.decimal);
@@ -46,38 +47,45 @@ export default class Slider extends Vue {
   // };
 
   mounted() {
-    this.step = 1 / Math.pow(10, this.value.numDec);
+    this.initalStep = 1 / Math.pow(10, this.value.numDec);
+    this.step = this.initalStep;
     if (Number.isNaN(this.step)) this.step = 1;
   }
 
   startIncrement() {
     if (!this.value.status.enabled) return;
-    this.incrementing = setInterval(() => {
-      var v = this.value.setpointHMI;
-      if (v < this.value.range.max) {
-        v += Math.floor(this.step);
-        this.step += this.incrementingStep;
-      }
-      if (v > this.value.range.max) {
-        v = this.value.range.max;
-      }
-      this.actualvalue = v;
-    }, 50);
-  }
+    this.incrementValue();
+    this.incrementing = setInterval(this.incrementValue, 100);
+  } 
 
   startDecrement() {
-    if (!this.value.status.enabled) return;
-    this.incrementing = setInterval(() => {
-      var v = this.value.setpointHMI;
-      if (v > this.value.range.min) {
-        v -= Math.floor(this.step);
-        this.step += this.incrementingStep;
-      }
-      if (v < this.value.range.min) {
-        v = this.value.range.min;
-      }
-      this.actualvalue = v;
-    }, 50);
+    if (!this.value.status.enabled) return;    
+    this.decrementValue();
+    this.incrementing = setInterval(this.decrementValue, 100);
+  }
+  
+  decrementValue(){
+    var v = this.value.setpointHMI;
+    if (v < this.value.range.max) {
+      v -= this.step;
+      this.step += this.incrementingStep * this.initalStep;
+    }
+    if (v > this.value.range.max) {
+      v = this.value.range.max;
+    }
+    this.actualvalue = parseFloat(v.toFixed(this.value.numDec));
+  }
+
+  incrementValue(){
+    var v = this.value.setpointHMI;
+    if (v < this.value.range.max) {
+      v += this.step;
+      this.step += this.incrementingStep * this.initalStep;
+    }
+    if (v > this.value.range.max) {
+      v = this.value.range.max;
+    }
+    this.actualvalue = parseFloat(v.toFixed(this.value.numDec));
   }
 
   confirm() {
@@ -86,7 +94,7 @@ export default class Slider extends Vue {
       clearInterval(this.incrementing);
 
     this.incrementing = 0;
-    this.step = 1;
+    this.step = this.initalStep;
   };
 
 

Thermo.Active/wwwroot/src/app_modules_thermo/components/slider.vue

@@ -1,15 +1,13 @@
 <template>
 	<div class="slider-container">
 		<div class="slider">
-			<button
+			<button class="btn btn-info square"
 				@mousedown="startDecrement()"
 				v-on:touchstart="startDecrement()"
 				v-on:touchend="confirm()"
 				@mouseup="confirm()"
 				@mouseout="confirm()"
-			>
-				<img src="assets/icons/png/min.png" />
-			</button>
+			><i class="fa fa-minus" ></i></button>
 			<div class="control">
 				<input
 					:disabled="!this.value.status.enabled"
@@ -22,20 +20,18 @@
 					<span v-for="iter in lines" :key="iter" class="line"></span>
 				</div>
 				<div class="labels">
-					<small>{{`${this.value.range.min} ${this.value.unitMeasure}`}}</small>
-					<small>{{`${(this.value.range.max - this.value.range.min) / 2 + this.value.range.min} ${this.value.unitMeasure}`}}</small>
-					<small>{{`${this.value.range.max} ${this.value.unitMeasure}`}}</small>
+					<small>{{`${this.value.range.min.toFixed(this.value.numDec)} ${this.value.unitMeasure}`}}</small>
+					<small>{{`${((this.value.range.max - this.value.range.min) / 2 + this.value.range.min).toFixed(this.value.numDec)} ${this.value.unitMeasure}`}}</small>
+					<small>{{`${this.value.range.max.toFixed(this.value.numDec)} ${this.value.unitMeasure}`}}</small>
 				</div>
 			</div>
-			<button
+			<button class="btn btn-info square"
 				@mousedown="startIncrement()"
 				v-on:touchstart="startIncrement()"
 				v-on:touchend="confirm()"
 				@mouseup="confirm()"
 				@mouseout="confirm()"
-			>
-				<img src="assets/icons/png/max.png" />
-			</button>
+			><i class="fa fa-plus" ></i></button>
 		</div>
 		<button
 			class="submit"

Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts

@@ -159,7 +159,6 @@ export default class Dashboard extends Vue {
   }
 
   sendSoftKey(id: string) {
-    debugger
     var sk = this.allSoftKeys.find(s => s.refCallParam == id);
     if (sk)
       Hub.Current.sendUserSoftKey(sk.id);

Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue

@@ -95,7 +95,7 @@
 				</div>
 				<div class="current">
 					<small>{{'dashboard-timing-elapsed' | localize('tempo trascorso')}}</small>
-					<time>{{elapsed | date('HH:mm')}}</time>
+					<time>{{Math.floor(elapsed /1000 / 3600)}}:{{elapsed | date('mm:ss')}}</time>
 				</div>
 				<div class="end">
 					<small>{{'dashboard-timing-end' | localize('fine')}}</small>

Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.ts

@@ -114,17 +114,17 @@ export default class GanttComponent extends Vue {
 
   showModalStep(step: number, subcategory: string): Promise<number> {
     switch (step) {
-      case 0: return ModalHelper.ShowModalAsync(ShowFormatoInfo, { subcategory });
-      case 1: return ModalHelper.ShowModalAsync(ShowQuoteVelocitaInfo, { subcategory });
-      case 2: return ModalHelper.ShowModalAsync(ShowCicloInfo, { subcategory });
-      case 3: return ModalHelper.ShowModalAsync(ShowRiscaldamentoInfo, { subcategory });
-      case 4: return ModalHelper.ShowModalAsync(ShowPirometroInfo, { subcategory });
-      case 5: return ModalHelper.ShowModalAsync(ShowImbutituraInfo, { subcategory });
-      case 6: return ModalHelper.ShowModalAsync(ShowControstampoInfo, { subcategory });
-      case 7: return ModalHelper.ShowModalAsync(ShowRaffreddamentoInfo, { subcategory });
-      case 8: return ModalHelper.ShowModalAsync(ShowVuotoInfo, { subcategory });
-      case 9: return ModalHelper.ShowModalAsync(ShowEstrazioneInfo, { subcategory });
-      case 10: return ModalHelper.ShowModalAsync(ShowOpzioniInfo, { subcategory });
+      case 0: return ModalHelper.ShowModalAsync(ShowFormatoInfo, subcategory?.toLowerCase());
+      case 1: return ModalHelper.ShowModalAsync(ShowQuoteVelocitaInfo, subcategory?.toLowerCase());
+      case 2: return ModalHelper.ShowModalAsync(ShowCicloInfo, subcategory?.toLowerCase());
+      case 3: return ModalHelper.ShowModalAsync(ShowRiscaldamentoInfo, subcategory?.toLowerCase());
+      case 4: return ModalHelper.ShowModalAsync(ShowPirometroInfo, subcategory?.toLowerCase());
+      case 5: return ModalHelper.ShowModalAsync(ShowImbutituraInfo, subcategory?.toLowerCase());
+      case 6: return ModalHelper.ShowModalAsync(ShowControstampoInfo, subcategory?.toLowerCase());
+      case 7: return ModalHelper.ShowModalAsync(ShowRaffreddamentoInfo, subcategory?.toLowerCase());
+      case 8: return ModalHelper.ShowModalAsync(ShowVuotoInfo, subcategory?.toLowerCase());
+      case 9: return ModalHelper.ShowModalAsync(ShowEstrazioneInfo, subcategory?.toLowerCase());
+      case 10: return ModalHelper.ShowModalAsync(ShowOpzioniInfo, subcategory?.toLowerCase());
       // case 11: return ModalHelper.ShowModalAsync(AvvioProduzione);
     }
 

Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue

@@ -36,7 +36,11 @@
 					x="0"
 					y="0"
 				>
-					<div class="body-header" @click="openModal()">{{value.label | localize(value.label)}}</div>
+					<div
+						class="body-header"
+						@mousedown.stop.prevent
+						@click="openModal()"
+					>{{value.label | localize(value.label)}}</div>
 				</foreignObject>
 				<foreignObject
 					:width="(duration - (showStatus && recipeValue?statusDuration:0)) * ganttOptions.secondSize"

Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.ts

@@ -47,9 +47,8 @@ export default class Gantt extends Vue {
       (this.$refs.section3 as any).rowHeight;
   }
 
-  public print() {
+  public print(r) {
     this.ganttOptions.printing = true;
-
     this.$nextTick(() => {
 
 
@@ -61,7 +60,7 @@ export default class Gantt extends Vue {
 
       var svgBlob = new Blob([data], { type: 'image/svg+xml;charset=utf-8' });
       // var url = DOMURL.createObjectURL(svgBlob);
-      recipeService.UploadImage(svgBlob, this.panel.nomeRicetta.replace('.rcp', '') + ".svg");
+      recipeService.UploadImage(svgBlob, (r || this.panel.nomeRicetta).replace('.rcp', '') + ".svg");
       this.ganttOptions.printing = false;
       // window.open(url, '_blank')
     });
@@ -107,10 +106,22 @@ export default class Gantt extends Vue {
   }
 
   get PadY() {
+    if (this.follow) {
+      try {
+        let result = Math.min(...this.blocks.filter(b => !b.terminated).map(i => i.section));
+        switch (result) {
+          case 1: return 0; break;
+          case 2: return (this.$refs.section1 as any).rowHeight; break;
+          case 3: return (this.$refs.section1 as any).rowHeight + (this.$refs.section2 as any).rowHeight; break;
+        }
+      } catch { }
+
+    }
     return this.padY;
   }
   set PadY(value: number) {
-    this.padY = value;
+    if (!this.follow)
+      this.padY = value;
   }
 
   follow: boolean = false;
@@ -169,14 +180,15 @@ export default class Gantt extends Vue {
   doPan(event: MouseEvent | TouchEvent) {
     if (this.lastPosition)
       if (event.type == "touchmove" || (event.type == "mousemove" && (event as MouseEvent).buttons)) {
+        this.follow = false;
+
         let p = this.getSvgCoords(event)
 
         this.PadX = Math.min(this.PadX + p.x - this.lastPosition.x, 0);
         this.PadY = Math.max(Math.min(this.PadY + p.y - this.lastPosition.y, 0), -this.maxPaddingY);
-
-
-
         this.lastPosition = p;
+
+
       }
   }
 

Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.vue

@@ -14,7 +14,9 @@
 		:class="{follow:canFollow}"
 	>
 		<!-- <gantt-header :padding-horizontal="padX " /> -->
-		<g :transform="`translate(0 ${ganttOptions.stepDuration * ganttOptions.secondSize + PadY  })`">
+		<g
+			:transform="`translate(0 ${Math.min(ganttOptions.stepDuration * ganttOptions.secondSize + PadY,40)  })`"
+		>
 			<gantt-row
 				:section="1"
 				:blocks="blocks"

Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/printProcesso.ts

@@ -16,8 +16,8 @@ export default class PrintProcesso extends Vue {
   }
 
   mounted() {
-    messageService.subscribeToChannel("print", () => {
-      (this.$refs.gantt as any).print();
+    messageService.subscribeToChannel("print", (r) => {
+      (this.$refs.gantt as any).print(...r);
     })
   }
 }

Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/softkey.vue

@@ -1,6 +1,5 @@
 <template>
-	<button class="starred-softkey" @click="doclick()" :disabled="!active"  :class="{ active: value }">
-		<img src="assets/icons/png/star.png" />
+	<button class="btn starred-softkey" @click="doclick()" :disabled="!active"  :class="{ active: value }">
 		<span>{{title}}</span>
 	</button>
 </template>

Thermo.Active/wwwroot/src/app_modules_thermo/save/changeNotes.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="setup">
-		<modal type="save-as" :title="'save-as' | localize('Salva con nome')">
+		<modal type="save-as" :title="'modal_title_edit_note' | localize('Modifica Note')">
 			<div slot="header-buttons">
 				<button class="modal-close" @click="close()">
 					<i class="fa fa-remove"></i>
@@ -8,16 +8,17 @@
 			</div>
 			<section>
 				<article>
-					<label>{{'recipe_note' | localize('Note della ricetta')}}</label>
+					<label class="description_lbl">{{'modal_recipe_note' | localize('Note della ricetta')}}</label>
 					<textarea
 						rows="3"
 						v-model="Note"
-						:placeholder="'recipe_note' | localize('Note della ricetta')"
+						class="notes_textarea"
+						:placeholder="'modal_recipe_note' | localize('Note della ricetta')"
 					/>
 				</article>
 			</section>
 			<footer>
-				<button class="btn" @click="annulla()">{{'cancel' | localize("Annulla")}}</button>
+				<button class="btn" @click="close()">{{'cancel' | localize("Annulla")}}</button>
 				<button class="btn btn-success" @click="save()">{{'confirm' | localize("Conferma")}}</button>
 			</footer>
 		</modal>

Thermo.Active/wwwroot/src/app_modules_thermo/save/duplicate.ts

@@ -0,0 +1,87 @@
+import Vue from "vue";
+import Component from "vue-class-component";
+import modal from "@/components/modals/modal.vue";
+import { Deferred } from "@/services";
+import { Prop, Watch } from 'vue-property-decorator';
+import { messageService } from "@/_base";
+import { Modal, ModalHelper } from "@/components/modals";
+import * as iziToast from "izitoast";
+
+declare var cmsClient: any;
+
+@Component({ components: { modal: Modal } })
+export default class Duplicate extends Vue {
+
+
+  @Prop()
+  deferred: Deferred<string>;
+
+  @Prop()
+  value: any;
+
+  folder = "";  
+  name = "";
+  canDo = false;
+
+  folderlist = [];
+
+
+  mounted(){    
+    if (typeof cmsClient != "undefined") {
+      this.folderlist =  JSON.parse(cmsClient.getAllRecipeDirectories());
+    }
+    if(this.value.folder){
+      this.value.folder = this.value.folder.replace("C:\\CMS\\", "");
+      this.folder = this.value.folder;
+    }
+    if(this.value.name){
+      this.value.name = this.value.name.replace(".rcp", "");
+      this.name = this.value.name;
+    }
+  }
+
+  
+  @Watch('folder',{deep:true})
+  changedFolder(){    
+    if(this.value.folder && this.value.name){
+      this.canDo = (this.value.folder != this.folder) || (this.value.name != this.name);
+    }
+    else
+      this.canDo= true;
+  }
+  
+  @Watch('name',{deep:true})
+  changedName(){
+    if(this.value.folder && this.value.name){
+      this.canDo = (this.value.folder != this.folder) || (this.value.name != this.name);
+    }
+    else
+      this.canDo= true;
+  }
+
+  save(value: string) {
+    if (typeof cmsClient != "undefined") {
+      var res = cmsClient.duplicateRecipe(this.value.folder + "\\" + this.value.name,this.folder + "\\" +this.name);
+      if (res) {
+        var obj = JSON.parse(res);
+        if (obj.error) {
+          (iziToast as any).error({
+            title: "error",
+            message: obj.error,
+            theme: "dark",
+            timeout: 10000,
+            class: "t-error",
+            transitionOut: "fadeOut",
+          })
+        }
+      }
+    }
+    this.deferred.resolve(this.name)
+    ModalHelper.HideModal();
+  }
+
+  close() {
+    messageService.deleteChannel("esc_pressed");
+    ModalHelper.HideModal();
+  }
+}

Thermo.Active/wwwroot/src/app_modules_thermo/save/duplicate.vue

@@ -0,0 +1,28 @@
+<template>
+	<div class="setup">
+		<modal type="save-as" :title="'modal_title_duplicate_recipe' | localize('Duplica Ricetta')">
+			<div slot="header-buttons">
+				<button class="modal-close" @click="close()">
+					<i class="fa fa-remove"></i>
+				</button>
+			</div>
+			<section>
+				<article>
+					<label>{{'folder_name' | localize('Nuova Cartella')}}</label>
+					<select v-model="folder" class="select_folder" :placeholder="'folder_name' | localize('Nuova Cartella')" >
+						<option v-for="folder in folderlist">{{folder}}</option>
+					</select>
+				</article>
+				<article>
+					<label>{{'recipe_name' | localize('Nome della nuova ricetta')}}</label>
+					<input v-model="name" :placeholder="'recipe_name' | localize('Nome della ricetta')" />
+				</article>
+			</section>
+			<footer>
+				<button class="btn" @click="close()">{{'cancel' | localize("Annulla")}}</button>
+				<button class="btn btn-success" @click="save()" :disabled="!canDo">{{'confirm' | localize("Conferma")}}</button>
+			</footer>
+		</modal>
+	</div>
+</template>
+<script src="./duplicate.ts" lang="ts"></script>

Thermo.Active/wwwroot/src/app_modules_thermo/save/save.ts

@@ -16,20 +16,28 @@ export default class SaveAs extends Vue {
   value: string;
 
   recipeName: string = null;
+  canSave =true;
+  
+  mounted() {
+    if(this.value)
+      this.recipeName = this.value.replace(".rcp","");
+  }
+
   get RecipeName() {
-    return this.recipeName || this.value;
+    return this.recipeName;
   }
   set RecipeName(value: string) {
     this.recipeName = value;
+    this.canSave = this.recipeName && this.recipeName.trim() != "";
   }
 
   save(value: string) {
-    this.deferred.resolve(this.RecipeName);
+    this.deferred.resolve(this.RecipeName + ".rcp")
     ModalHelper.HideModal();
   }
 
   close() {
-    messageService.deleteChannel("esc_pressed");
+    messageService.deleteChannel("esc_pressed");  
     this.deferred.reject();
     ModalHelper.HideModal();
   }

Thermo.Active/wwwroot/src/app_modules_thermo/save/save.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="setup">
-		<modal type="save-as" :title="'save-as' | localize('Salva con nome')">
+		<modal type="save-as" :title="'modal_title_save_as' | localize('Salva Ricetta con nome')">
 			<div slot="header-buttons">
 				<button class="modal-close" @click="close()">
 					<i class="fa fa-remove"></i>
@@ -14,7 +14,7 @@
 			</section>
 			<footer>
 				<button class="btn" @click="close()">{{'cancel' | localize("Annulla")}}</button>
-				<button class="btn btn-success" @click="save()">{{'confirm' | localize("Conferma")}}</button>
+				<button class="btn btn-success" @click="save()" :disabled="!canSave">{{'confirm' | localize("Conferma")}}</button>
 			</footer>
 		</modal>
 	</div>

Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/axis-info.ts

@@ -0,0 +1,29 @@
+import Component from "vue-class-component";
+import Vue from "vue";
+import { Prop } from "vue-property-decorator";
+import PrintProcesso from "@/app_modules_thermo/processo/components/printProcesso";
+import { AppModel } from "@/store";
+
+@Component({})
+export default class AxisInfo extends Vue {
+
+  @Prop()
+  id: number;
+
+  @Prop({ default: 'axes' })
+  name: string;
+
+  @Prop({ default: 'axes-quote' })
+  quoteLabel: string;
+
+  @Prop({ default: 'axes-speed' })
+  speedLabel: string;
+
+  @Prop({ default: 'axes-load' })
+  loadLabel: string;
+
+
+  get axis() {
+    return (this.$store.state as AppModel).machineStatus.axisInfo[this.id];
+  }
+}

Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/axis-info.vue

@@ -0,0 +1,51 @@
+<template>
+	<div class="axis-info">
+		<table>
+			<thead>
+				<tr>
+					<th></th>
+					<th width="200">{{axis.name | localize(axis.name)}}</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<th>{{quoteLabel | localize(quoteLabel)}}</th>
+					<td>{{axis.position | round}} {{'axis-position-um' | localize("mm")}}</td>
+				</tr>
+				<tr>
+					<th>{{speedLabel | localize(speedLabel)}}</th>
+					<td>{{axis.speed| round}} {{'axis-speed-um' | localize("mm/s")}}</td>
+				</tr>
+				<tr>
+					<th>{{loadLabel | localize(loadLabel)}}</th>
+					<td>{{axis.load| round(1)}} %</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</template>
+<script src="./axis-info.ts" lang="ts"></script>
+<style scoped>
+.axis-info {
+	position: absolute;
+	top: 0;
+	right: 0;
+	min-width: 250px;
+	height: 80px;
+}
+
+td {
+	background-color: #1791ff33;
+	color: #002680;
+	text-align: right;
+}
+
+th {
+	font-weight: 400;
+	color: #999;
+}
+
+table {
+	width: 100%;
+}
+</style>

Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.ts

@@ -1,16 +1,18 @@
 import Vue from 'vue';
 import Component from 'vue-class-component';
 import { Prop } from 'vue-property-decorator';
-import Slider from "@/app_modules_thermo/components/slider.vue";
+
 import Scheda from "@/app_modules_thermo/components/scheda.vue";
 import Controstamposvg from "./SVG_Components/svgcontrostampo.vue";
-import Tastierino from "@/app_modules_thermo/components/tastierino.vue";
+
+import axes from "@/app_modules_thermo/setup/components/axis-info.vue";
 
 @Component({
   name: "controstampo",
   components: {
     scheda: Scheda,
-    svgcontrostampo: Controstamposvg
+    svgcontrostampo: Controstamposvg,
+    axes
   }
 })
 export default class Controstampo extends Vue {

Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue

@@ -98,6 +98,7 @@
 			<!-- <button class="btn btn-success absolute square bottom left">
 				<img src="assets/icons/png/w.png" />
 			</button>-->
+			<axes :id="5"></axes>
 		</article>
 	</section>
 </template>

Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.ts

@@ -1,11 +1,12 @@
 import Vue from "vue";
 import Component from "vue-class-component";
 import { Prop } from 'vue-property-decorator';
-import Slider from "@/app_modules_thermo/components/slider.vue";
-import QuoteVelocitaSVG from "./SVG_Components/quote-velocita.vue";
-import Tastierino from "@/app_modules_thermo/components/tastierino.vue";
 
-@Component({ name: "discesacornice", components: { quoteVelocitaSVG: QuoteVelocitaSVG } })
+import QuoteVelocitaSVG from "./SVG_Components/quote-velocita.vue";
+
+import axes from "@/app_modules_thermo/setup/components/axis-info.vue";
+
+@Component({ name: "discesacornice", components: { quoteVelocitaSVG: QuoteVelocitaSVG, axes } })
 export default class DiscesaCornice extends Vue {
 
 

Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue

@@ -82,6 +82,7 @@
 			<!-- <button class="btn btn-success absolute square bottom left">
 				<img src="assets/icons/png/w.png" />
 			</button>-->
+			<axes :id="13"></axes>
 		</article>
 	</section>
 </template>

Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts

@@ -1,11 +1,10 @@
 import Vue from "vue";
 import Component from "vue-class-component";
 import { Prop } from 'vue-property-decorator';
-import Slider from "@/app_modules_thermo/components/slider.vue"
 import StampoSVG from "./SVG_Components/stampo.vue";
-import Tastierino from "@/app_modules_thermo/components/tastierino.vue";
+import axes from "@/app_modules_thermo/setup/components/axis-info.vue";
 
-@Component({ name: "salita-stampo", components: { stampoSVG: StampoSVG } })
+@Component({ name: "salita-stampo", components: { stampoSVG: StampoSVG, axes } })
 export default class DiscesaCornice extends Vue {
 
 

Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue

@@ -103,6 +103,7 @@
 			<!-- <button class="btn btn-success absolute square bottom left">
 				<img src="assets/icons/png/w.png" />
 			</button>-->
+			<axes :id="1"></axes>
 		</article>
 	</section>
 </template>

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.ts

@@ -28,9 +28,11 @@ export default class Resistance extends Vue {
   selectedColorTo: number[];
 
   get currentStandardColor() {
-    return [this.colorFrom[0] - (this.colorFrom[0] - this.colorTo[0]) * this.channel.setpointHMI / 100,
-    this.colorFrom[1] - (this.colorFrom[1] - this.colorTo[1]) * this.channel.setpointHMI / 100,
-    this.colorFrom[2] - (this.colorFrom[2] - this.colorTo[2]) * this.channel.setpointHMI / 100];
+    //Not linear, but quadratic
+    var x = 1/100 * this.channel.setpointHMI * this.channel.setpointHMI;
+    return [this.colorFrom[0] - (this.colorFrom[0] - this.colorTo[0]) * x / 100,
+    this.colorFrom[1] - (this.colorFrom[1] - this.colorTo[1]) * x / 100,
+    this.colorFrom[2] - (this.colorFrom[2] - this.colorTo[2]) * x / 100];
   }
 
   get currentColor() {
@@ -39,8 +41,10 @@ export default class Resistance extends Vue {
   }
 
   get currentSelectedColor() {
-    return [this.selectedColorFrom[0] - (this.selectedColorFrom[0] - this.selectedColorTo[0]) * this.channel.setpointHMI / 100,
-    this.selectedColorFrom[1] - (this.selectedColorFrom[1] - this.selectedColorTo[1]) * this.channel.setpointHMI / 100,
-    this.selectedColorFrom[2] - (this.selectedColorFrom[2] - this.selectedColorTo[2]) * this.channel.setpointHMI / 100];
+    //Not linear, but quadratic
+    var x = 1/100 * this.channel.setpointHMI * this.channel.setpointHMI;
+    return [this.selectedColorFrom[0] - (this.selectedColorFrom[0] - this.selectedColorTo[0]) * x / 100,
+    this.selectedColorFrom[1] - (this.selectedColorFrom[1] - this.selectedColorTo[1]) * x / 100,
+    this.selectedColorFrom[2] - (this.selectedColorFrom[2] - this.selectedColorTo[2]) * x / 100];
   }
 }

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.ts

@@ -16,12 +16,10 @@ export default class RiscaldiInferiori extends Vue {
 
 
   selectedChannelIds: number[] = [];
-  _uniformChannelValue = 0;
+  uniformChannelValue = 0;
 
-  get uniformChannelValue() { return this._uniformChannelValue; }
-  set uniformChannelValue(v) {
-    this._uniformChannelValue = v;
-    for (const c of this.selectedChannels) c.setpointHMI = v;
+  beforeMount(){
+    this.uniformChannelValue = -1;
   }
 
   get selectedChannels(): Warmers.IChannel[] {
@@ -30,6 +28,10 @@ export default class RiscaldiInferiori extends Vue {
 
   selectionMethod = "none";
 
+  changedSelectValue(v){
+    if(this.uniformChannelValue>=0)
+      for (const c of this.selectedChannels) c.setpointHMI = this.uniformChannelValue;
+  }
 
   zoomIn() {
     (this.$refs.warmers as any).zoomIn();
@@ -38,6 +40,9 @@ export default class RiscaldiInferiori extends Vue {
   zoomOut() {
     (this.$refs.warmers as any).zoomOut();
   }
+  zoomReset() {
+    (this.$refs.warmers as any).zoomReset();
+  }
 
 
   add5() {
@@ -48,9 +53,17 @@ export default class RiscaldiInferiori extends Vue {
     for (const c of this.selectedChannels) c.setpointHMI = Math.min(Math.max(parseFloat(c.setpointHMI.toString()) - 5, 0), 100);
   }
 
+  add1() {
+    for (const c of this.selectedChannels) c.setpointHMI = Math.min(Math.max(parseFloat(c.setpointHMI.toString()) + 1, 0), 100);
+  }
+
+  remove1() {
+    for (const c of this.selectedChannels) c.setpointHMI = Math.min(Math.max(parseFloat(c.setpointHMI.toString()) - 1, 0), 100);
+  }
+
   selectionChanged(selected: number[]) {
     this.selectedChannelIds = []
-    this.uniformChannelValue = 0;
+    this.uniformChannelValue = -1;
     this.selectedChannelIds = selected;
   }