From ac77686c63e5ccc7bfe4986edf6e5cdc1d4b4338 Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Fri, 27 Apr 2018 10:38:38 +0200
Subject: [PATCH] Client: Siemens-Tested and fixed HMI-commands

---
 Client/View/MainForm.cs                       |  2 +-
 Client/View/NcWindow.cs                       |  2 +-
 Step.Utils/languages/IT.xml                   | 10 ++---
 .../modules/under-the-hood/nc-hmi-menu.vue    | 42 ++++++++++---------
 4 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/Client/View/MainForm.cs b/Client/View/MainForm.cs
index 3bf81407..d0554b96 100644
--- a/Client/View/MainForm.cs
+++ b/Client/View/MainForm.cs
@@ -588,7 +588,7 @@ namespace CMS_Client.View
         public void keyPressedHandler(bool altPressed, bool ctrlPressed, bool shiftPressed, int key)
         {
             //Work only if is a Developer mode
-            if (Config.ClientConfig.DeveloperMode)
+            if (Config.ClientConfig.DeveloperMode && altPressed)
             {
                 if (key == (int)Keys.F1)
                     Browser.GoBack();
diff --git a/Client/View/NcWindow.cs b/Client/View/NcWindow.cs
index 224e40e2..e644b21c 100644
--- a/Client/View/NcWindow.cs
+++ b/Client/View/NcWindow.cs
@@ -837,7 +837,7 @@ namespace CMS_Client.View
             if (KeybPID == MainProcessPID || KeybPID == NcProcessPID)
             {
                 //Filter if is keydown
-                if (wParam == HWND_KEYUP)
+                if (wParam == HWND_SYSKEYDOWN)
                     mainFrm.keyPressedHandler(altPressed, ctrlPressed, shiftPressed, Key);
             }
 
diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml
index 1001dbd9..286c483f 100644
--- a/Step.Utils/languages/IT.xml
+++ b/Step.Utils/languages/IT.xml
@@ -98,12 +98,12 @@
   <hmi_cmd_demo_9>Utensili</hmi_cmd_demo_9>
   
   <!-- HMI Command SIEMENS -->
-  <hmi_cmd_siemens_1>Machine</hmi_cmd_siemens_1>
-  <hmi_cmd_siemens_2>Parameter</hmi_cmd_siemens_2>
-  <hmi_cmd_siemens_3>Program</hmi_cmd_siemens_3>
+  <hmi_cmd_siemens_1>Macchina</hmi_cmd_siemens_1>
+  <hmi_cmd_siemens_2>Parametri</hmi_cmd_siemens_2>
+  <hmi_cmd_siemens_3>Programma</hmi_cmd_siemens_3>
   <hmi_cmd_siemens_4>Prog. Manager</hmi_cmd_siemens_4>
-  <hmi_cmd_siemens_5>Diagnostics</hmi_cmd_siemens_5>
-  <hmi_cmd_siemens_6>Setup</hmi_cmd_siemens_6>
+  <hmi_cmd_siemens_5>Diagnostica</hmi_cmd_siemens_5>
+  <hmi_cmd_siemens_6>Messa in serv.</hmi_cmd_siemens_6>
   
   <!-- HMI Command FANUC -->
   <hmi_cmd_fanuc_1>Pos</hmi_cmd_fanuc_1>
diff --git a/Step/wwwroot/src/modules/under-the-hood/nc-hmi-menu.vue b/Step/wwwroot/src/modules/under-the-hood/nc-hmi-menu.vue
index cb9aeecd..88da675a 100644
--- a/Step/wwwroot/src/modules/under-the-hood/nc-hmi-menu.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/nc-hmi-menu.vue
@@ -1,9 +1,9 @@
 <template>
-  <span id="nc-buttons-container" v-if="commandCount">
+  <span id="nc-buttons-container" v-if="getNumofCommands()">
     <span class="container">
       <header>
-        <button @click="sendCommands(command)" v-for="command in commandCount" :key="command" :title="'hmi_cmd_'+ ncname +'_' + command | localize('hmi_cmd_'+ ncname +'_' + command)">
-          {{'hmi_cmd_'+ ncname +'_' + command | localize('cmd hmi' +' ' + command)}}
+        <button @click="sendCommands(command)" v-for="command in getNumofCommands()" :key="command" :title="'hmi_cmd_'+ getNcName() +'_' + command | localize('hmi_cmd_'+ ncname +'_' + command)">
+          {{'hmi_cmd_'+ getNcName() +'_' + command | localize('cmd hmi' +' ' + command)}}
         </button>
       </header>
     </span>
@@ -15,31 +15,33 @@
 export default {
   data: function() {
     return {
-      commandCount:0,
-      ncname : 'demo'
     };
   },
   mounted: function() {
-
-    //Setup Number of Commands
-    if (typeof cmsClient != "undefined") 
-      this.commandCount = cmsClient.getHMICommandCount();
-    else
-      this.commandCount = 0;
-
-    //Setup Nc Name
-    if(this.$store.state.machineInfo.isOsai)
-      ncname : 'osai'
-    else if(this.$store.state.machineInfo.isFanuc)
-      ncname : 'fanuc'
-    else if(this.$store.state.machineInfo.isSiemens)
-      ncname : 'siemens'
   },
   methods: {
     sendCommands: function(id){
       if (typeof cmsClient != "undefined") 
         cmsClient.sendHMICommand(id);
-    }
+    },
+    getNumofCommands: function(){
+      //get Number of Commands
+      if (typeof cmsClient != "undefined") 
+        return cmsClient.getHMICommandCount();
+      else
+        return 0;
+    },
+    getNcName: function(){
+      //get Nc Name
+      if(this.$store.state.machineInfo.isOsai)
+        return 'osai';
+      else if(this.$store.state.machineInfo.isFanuc)
+        return 'fanuc';
+      else if(this.$store.state.machineInfo.isSiemens)
+        return 'siemens';
+      else
+        return 'demo';
+    },
   }
 };
 </script>