From 39f5be6d9c0cce76412263b321ec0e25abf07f5f Mon Sep 17 00:00:00 2001
From: = <paolo@teamdev.it>
Date: Mon, 28 Sep 2020 10:11:01 +0200
Subject: [PATCH] fix delay disegno riscaldi

---
 .../wwwroot/src/app.business-logic.ts         |  1 +
 .../components/base-components/warmers.ts     | 21 ++-----------
 .../components/base-components/warmers.vue    |  4 +--
 .../wwwroot/src/store/machineStatus.store.ts  | 31 ++++++++++++++++++-
 4 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index e4d86b91..a6e2e8ba 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -61,6 +61,7 @@ async function loadMachineConfig() {
     machineStatusActions.setAreasConfg(store, result);
 
     let mcresult = await machine.getMachineConfiguration();
+    machineStatusActions.setWarmersParameters(store, mcresult.additionalParameters);
 
     await prodService.GetProdPanel();
 
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.ts
index 30302351..0f834e32 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.ts
@@ -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) {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.vue
index f1d21d4e..79eb7817 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.vue
@@ -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)"
diff --git a/Thermo.Active/wwwroot/src/store/machineStatus.store.ts b/Thermo.Active/wwwroot/src/store/machineStatus.store.ts
index 0aa32c61..22eb377f 100644
--- a/Thermo.Active/wwwroot/src/store/machineStatus.store.ts
+++ b/Thermo.Active/wwwroot/src/store/machineStatus.store.ts
@@ -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);
     },