fix delay disegno riscaldi

This commit is contained in:
=
2020-09-28 10:11:01 +02:00
parent cead2275eb
commit 39f5be6d9c
4 changed files with 36 additions and 21 deletions
@@ -61,6 +61,7 @@ async function loadMachineConfig() {
machineStatusActions.setAreasConfg(store, result);
let mcresult = await machine.getMachineConfiguration();
machineStatusActions.setWarmersParameters(store, mcresult.additionalParameters);
await prodService.GetProdPanel();
@@ -46,21 +46,9 @@ export default class Warmers extends Vue {
selectionMethod: SelectionMethod = SelectionMethod.none;
parameters: {
warmerPlanSizeX: number,
warmerPlanSizeY: number,
warmerAutocompStartValue: number,
warmerAutocompStep: number,
resistSizeX: number,
resistSizeY: number,
} = {
warmerPlanSizeX: 0,
warmerPlanSizeY: 0,
warmerAutocompStartValue: 30,
warmerAutocompStep: 5,
resistSizeX: 100,
resistSizeY: 48,
};
get parameters() {
return store.state.machineStatus.warmersParameters;
}
get channels() {
return store.state.warmers.channels.filter(i => i.idReflector == this.idReflector);
@@ -156,7 +144,6 @@ export default class Warmers extends Vue {
$this.zoomController = svgPanZoom(this.$refs.warmer as SVGElement, {
zoomEnabled: true,
controlIconsEnabled: false,
fit: true,
center: true,
beforePan: function () {
var z = this.getZoom();
@@ -170,8 +157,6 @@ export default class Warmers extends Vue {
}
});
}, 500);
let config = await new machineService().getMachineConfiguration();
this.parameters = config.additionalParameters;
}
startSelection(event: MouseEvent) {
@@ -33,8 +33,8 @@
<rect
ref="piastra"
v-if="parameters"
:x="Math.max((parameters.warmerPlanSizeX - recipe.general_sizes_sheet_dim_x.setpointHMI)/2,0)"
:y="Math.max((parameters.warmerPlanSizeY- recipe.general_sizes_sheet_dim_y.setpointHMI)/2,0)"
:x="(parameters.warmerPlanSizeX - recipe.general_sizes_sheet_dim_x.setpointHMI)/2"
:y="(parameters.warmerPlanSizeY- recipe.general_sizes_sheet_dim_y.setpointHMI)/2"
:width="recipe.general_sizes_sheet_dim_x.setpointHMI"
:height="recipe.general_sizes_sheet_dim_y.setpointHMI"
stroke="rgba(0,0,0,.8)"
@@ -66,6 +66,14 @@ export interface MachineStatusModel {
axisInfo: { [id: number]: { is: number, name: string, type: string, position: number, speed: number } }
cycleProd: { mode: number, status: number, timeAdv: number }
warmersParameters: {
warmerPlanSizeX: number,
warmerPlanSizeY: number,
warmerAutocompStartValue: number,
warmerAutocompStep: number,
resistSizeX: number,
resistSizeY: number,
}
}
export interface buttonStatus {
@@ -75,6 +83,7 @@ export interface buttonStatus {
}
export interface MachineStatusActions {
setWarmersParameters(context, model);
setAxisInfo(context, model);
setCycleProd(context, status: any);
setResetAxes(context, status: { reset: boolean, progress: number });
@@ -132,7 +141,16 @@ export const machineStatusStore = {
_functions: new Map<string, signalr_security.securityFunction>(),
functions: [],
areasConfiguration: []
areasConfiguration: [],
warmersParameters: {
warmerPlanSizeX: 0,
warmerPlanSizeY: 0,
warmerAutocompStartValue: 30,
warmerAutocompStep: 5,
resistSizeX: 100,
resistSizeY: 48,
}
} as MachineStatusModel,
getters: {
@@ -175,6 +193,14 @@ export const machineStatusStore = {
}
},
mutations: {
SetWarmersParameters(store, model) {
for (const key in model) {
if (Object.prototype.hasOwnProperty.call(model, key)) {
const element = model[key];
Vue.set(store.warmersParameters, key, element);
}
}
},
SetAxisInfo(store, model) {
for (const key in model) {
if (Object.prototype.hasOwnProperty.call(model, key)) {
@@ -238,6 +264,9 @@ export const machineStatusStore = {
}
},
actions: {
setWarmersParameters(context, model) {
context.commit('SetWarmersParameters', model);
},
setAxisInfo(context, model) {
context.commit("SetAxisInfo", model);
},