axes list & axes selection from submenu

This commit is contained in:
Paolo Possanzini
2018-03-27 14:52:28 +02:00
parent 41421cb425
commit 07aa8d5d52
4 changed files with 39 additions and 12 deletions
+6
View File
@@ -16,4 +16,10 @@ declare module signalr_process {
Reps: number;
}
interface AxisData{
Id:number;
Name: string;
}
}
@@ -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);
+10 -1
View File
@@ -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();
}
+16 -7
View File
@@ -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