From 07aa8d5d52ebb99ae1bf64d7097a09b15e681751 Mon Sep 17 00:00:00 2001
From: Paolo Possanzini <paolo@teamdev.it>
Date: Tue, 27 Mar 2018 14:52:28 +0200
Subject: [PATCH] axes list & axes selection from submenu

---
 Step/wwwroot/src/@types/signalr.process.d.ts  |  6 +++++
 .../src/modules/under-the-hood/jog-menu.vue   | 11 +++++----
 Step/wwwroot/src/services/hub.ts              | 11 ++++++++-
 .../wwwroot/src/store/runningProcess.store.ts | 23 +++++++++++++------
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/Step/wwwroot/src/@types/signalr.process.d.ts b/Step/wwwroot/src/@types/signalr.process.d.ts
index 70e48cc6..a68e195f 100644
--- a/Step/wwwroot/src/@types/signalr.process.d.ts
+++ b/Step/wwwroot/src/@types/signalr.process.d.ts
@@ -16,4 +16,10 @@ declare module signalr_process {
     Reps: number;
   }
 
+  interface AxisData{
+    Id:number;
+    Name: string;
+
+  }
+
 }
diff --git a/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue b/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
index a5505812..4b5c11ee 100644
--- a/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
@@ -18,10 +18,7 @@
 
     <div class="axes-menu-container" v-if="showAxesMenu">
       <div class="menu">
-        <button @click="setAxes(24)">X</button>
-        <button @click="setAxes(24)">Y</button>
-        <button @click="setAxes(24)">Z</button>
-        <button @click="setAxes(24)">A</button>
+        <button @click="setAxes(a.Id)" v-for="a in axes" :key="a.Id">{{a.Name}}</button>
       </div>
     </div>
 
@@ -44,11 +41,17 @@ export default {
       showAxesMenu: false
     };
   },
+  computed: {
+    axes: function(){
+      this.$store.state.process.axes;
+    }
+  },
 
   methods: {
     setAxes(id) {
       this.showIncrMenu = false;
       this.showAxesMenu = false;
+      Hub.Current.selectAxis(id);
     },
     ncClick(id) {
       Hub.Current.ncSoftKeyClick(id);
diff --git a/Step/wwwroot/src/services/hub.ts b/Step/wwwroot/src/services/hub.ts
index f84ed60d..0a4089b0 100644
--- a/Step/wwwroot/src/services/hub.ts
+++ b/Step/wwwroot/src/services/hub.ts
@@ -60,6 +60,7 @@ export class Hub {
     this._hub.client.userSoftKeys = Hub.userSoftKeyChanged;
     this._hub.client.headsData = Hub.headsDataChanged;
     this._hub.client.processesData = Hub.processDataChanged;
+    this._hub.client.axesNames = Hub.axesNamesDataChanged;
 
     this._hub.client.logout = this.logout;
 
@@ -85,6 +86,10 @@ export class Hub {
       appModelActions.CheckLogoff(store, e.id);
   }
 
+  private static axesNamesDataChanged(data){
+    processModelActions.setAxes(store, data);
+  }
+
   private static processDataChanged(data) {
     let processes = data.processes;
 
@@ -95,6 +100,7 @@ export class Hub {
 
     processModelActions.isRunning(store, data.isRunning);
     processModelActions.selectProcess(store, data.selectedProcess);
+    processModelActions.selectAxis(store, data.selectedAxis);
     processModelActions.checkRemove(store, processes.map(i => i.Id));
   }
 
@@ -114,7 +120,6 @@ export class Hub {
     }
   }
 
-
   private static headsDataChanged(status) {
     for (const k in status) {
       if (status.hasOwnProperty(k)) {
@@ -289,6 +294,10 @@ export class Hub {
     this._hub.server.selectProcess(id);
   }
 
+  public selectAxis(id:number){
+    this._hub.server.selectAxis(id);
+  }
+
   public Hello() {
     this._hub.server.hello();
   }
diff --git a/Step/wwwroot/src/store/runningProcess.store.ts b/Step/wwwroot/src/store/runningProcess.store.ts
index e936051d..e5a9a715 100644
--- a/Step/wwwroot/src/store/runningProcess.store.ts
+++ b/Step/wwwroot/src/store/runningProcess.store.ts
@@ -1,5 +1,6 @@
 export interface RunningProcessModel {
   process: Array<signalr_process.ProcessData>,
+  axes: Array<signalr_process.AxisData>,
   running: boolean,
   selectedProcess: number,
   selectedAxis: number
@@ -11,6 +12,8 @@ export interface ProcessModelActionsInterface {
   isRunning(context, status: boolean);
   checkRemove(context, keys: Array<number>);
   selectProcess(context, processId: number);
+  selectAxis(context, axisId: number);
+  setAxes(context, data: signalr_process.AxisData[]);
 }
 
 
@@ -19,20 +22,17 @@ export const processStore = {
   state: {
     _process: new Map<number, signalr_process.ProcessData>(),
     process: [],
+    axes: [],
     running: false,
     selectedProcess: 0,
     selectedAxis: 0
   } as RunningProcessModel,
   mutations: {
+    SetAxes(store, data: signalr_process.AxisData[]){
+      store.axes = data;
+    },
     AddProcess(store, process: signalr_process.ProcessData) {
-
-      // if (!store._process.has(process.Id)) {
       store._process.set(process.Id, process);
-      // }
-      // else{
-      //   store._process.
-      // }
-
       store.process = Array.from(store._process.values());
     },
     RemoveProcess(store, process: signalr_process.ProcessData) {
@@ -62,6 +62,9 @@ export const processStore = {
     },
     selectProcess(store, processId: number){
       store.selectedProcess = processId;
+    },
+    selectAxis(store, axisId: number){
+      store.selectedAxis = axisId;
     }
   },
   actions: {
@@ -82,6 +85,12 @@ export const processStore = {
     },
     selectProcess(context, processId: number){
       context.commit("selectProcess", processId);
+    },
+    selectAxis(context, axisId: number){
+      context.commit("selectAxis", axisId);
+    },
+    setAxes(context, data: signalr_process.AxisData[]){
+      context.commit("SetAxes", data);
     }
 
   } as ProcessModelActionsInterface