calibrazione assi

Step/wwwroot/dist/0.build.js

@@ -26,7 +26,7 @@ eval("exports = module.exports = __webpack_require__(76)(true);\n// imports\n\n\
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n\nvar _baseComponents = __webpack_require__(55);\n\nexports.default = {\n  components: { keypad: _baseComponents.Keypad }\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkwLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtZW1wdHkudnVlP2M2ZjIiXSwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxuICA8ZGl2IGNsYXNzPVwidGVzdC1lbXB0eVwiPlxuICAgIDxrZXlwYWQ+PC9rZXlwYWQ+XG4gIDwvZGl2PlxuPC90ZW1wbGF0ZT5cbjxzY3JpcHQ+XG5pbXBvcnQgeyBLZXlwYWQgfSBmcm9tIFwic3JjL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IHtcbiAgY29tcG9uZW50czogeyBrZXlwYWQ6IEtleXBhZCB9XG59O1xuPC9zY3JpcHQ+XG48c3R5bGU+XG4gIC50ZXN0LWVtcHR5e1xuICAgIGRpc3BsYXk6IGZsZXg7XG4gICAgYWxpZ24taXRlbXM6IGNlbnRlcjtcbiAgICBqdXN0aWZ5LWNvbnRlbnQ6IGNlbnRlcjtcbiAgICB3aWR0aDogMTAwJTtcbiAgICBoZWlnaHQ6IDEwMCU7XG4gIH1cbjwvc3R5bGU+XG5cblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyB0ZXN0LWVtcHR5LnZ1ZT82MTExNDNiOCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBTUE7QUFDQTs7QUFHQTtBQURBOzs7O0EiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///590\n");
+eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n\nvar _baseComponents = __webpack_require__(50);\n\nexports.default = {\n  components: { keypad: _baseComponents.Keypad }\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkwLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtZW1wdHkudnVlP2M2ZjIiXSwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxuICA8ZGl2IGNsYXNzPVwidGVzdC1lbXB0eVwiPlxuICAgIDxrZXlwYWQ+PC9rZXlwYWQ+XG4gIDwvZGl2PlxuPC90ZW1wbGF0ZT5cbjxzY3JpcHQ+XG5pbXBvcnQgeyBLZXlwYWQgfSBmcm9tIFwic3JjL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IHtcbiAgY29tcG9uZW50czogeyBrZXlwYWQ6IEtleXBhZCB9XG59O1xuPC9zY3JpcHQ+XG48c3R5bGU+XG4gIC50ZXN0LWVtcHR5e1xuICAgIGRpc3BsYXk6IGZsZXg7XG4gICAgYWxpZ24taXRlbXM6IGNlbnRlcjtcbiAgICBqdXN0aWZ5LWNvbnRlbnQ6IGNlbnRlcjtcbiAgICB3aWR0aDogMTAwJTtcbiAgICBoZWlnaHQ6IDEwMCU7XG4gIH1cbjwvc3R5bGU+XG5cblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyB0ZXN0LWVtcHR5LnZ1ZT82MTExNDNiOCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBTUE7QUFDQTs7QUFHQTtBQURBOzs7O0EiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///590\n");
 
 /***/ }),
 

Step/wwwroot/dist/4.build.js

@@ -12,7 +12,7 @@ eval("Object.defineProperty(__webpack_exports__, \"__esModule\", { value: true }
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n\nvar _baseComponents = __webpack_require__(55);\n\nexports.default = {\n  components: { loader: _baseComponents.Loader }\n\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg2LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtbG9hZGVyLnZ1ZT8yOGU1Il0sInNvdXJjZXNDb250ZW50IjpbIjx0ZW1wbGF0ZT5cbiAgPGRpdj5cbiAgICA8bG9hZGVyIHRpdGxlPVwiQXR0ZW5kZXJlIHByZWdvXCIgbWVzc2FnZT1cIkF6emVyYW1lbnRvIGFzc2kgLi4uLlwiIDpwZXJjZW50PVwiNTBcIiA6aXNWaXNpYmxlPVwidHJ1ZVwiPjwvbG9hZGVyPlxuICA8L2Rpdj5cbjwvdGVtcGxhdGU+XG48c2NyaXB0PlxuaW1wb3J0IHsgTG9hZGVyIH0gZnJvbSBcIi4uL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XG5leHBvcnQgZGVmYXVsdCB7XG4gIGNvbXBvbmVudHM6eyBsb2FkZXI6IExvYWRlcn1cblxufVxuPC9zY3JpcHQ+XG5cblxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIHRlc3QtbG9hZGVyLnZ1ZT82ZDdhNjYwNiJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBTUE7QUFDQTs7QUFHQTtBQUNBO0FBSEE7Ozs7QSIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///586\n");
+eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n\nvar _baseComponents = __webpack_require__(50);\n\nexports.default = {\n  components: { loader: _baseComponents.Loader }\n\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg2LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtbG9hZGVyLnZ1ZT8yOGU1Il0sInNvdXJjZXNDb250ZW50IjpbIjx0ZW1wbGF0ZT5cbiAgPGRpdj5cbiAgICA8bG9hZGVyIHRpdGxlPVwiQXR0ZW5kZXJlIHByZWdvXCIgbWVzc2FnZT1cIkF6emVyYW1lbnRvIGFzc2kgLi4uLlwiIDpwZXJjZW50PVwiNTBcIiA6aXNWaXNpYmxlPVwidHJ1ZVwiPjwvbG9hZGVyPlxuICA8L2Rpdj5cbjwvdGVtcGxhdGU+XG48c2NyaXB0PlxuaW1wb3J0IHsgTG9hZGVyIH0gZnJvbSBcIi4uL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XG5leHBvcnQgZGVmYXVsdCB7XG4gIGNvbXBvbmVudHM6eyBsb2FkZXI6IExvYWRlcn1cblxufVxuPC9zY3JpcHQ+XG5cblxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIHRlc3QtbG9hZGVyLnZ1ZT82ZDdhNjYwNiJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBTUE7QUFDQTs7QUFHQTtBQUNBO0FBSEE7Ozs7QSIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///586\n");
 
 /***/ }),
 

Step/wwwroot/src/@types/signalr.alarms.d.ts

@@ -15,19 +15,19 @@ declare module signalr_alarms {
     process: number,
   }
 
-  interface alarmMessage{
+  interface alarmMessage {
     NcAlarms: Array<genericAlarm>,
     PlcAlarms: Array<genericAlarm>,
     ProcessAlarms: Array<processAlarm>,
   }
 
-  interface powerItemValue{
+  interface powerItemValue {
     Id: number,
     Active: boolean,
     Clickable: boolean
   }
 
-  interface prePowerOnMessage{
+  interface prePowerOnMessage {
     AirPressure: powerItemValue;
     EmergencyButtons: powerItemValue;
     PowerOn: powerItemValue;
@@ -36,12 +36,16 @@ declare module signalr_alarms {
     StartingKey: powerItemValue;
   }
 
-  interface postPowerOnMessage{
+  interface postPowerOnMessage {
     AxisReset: powerItemValue;
     WaterjetPump: powerItemValue;
   }
 
-  interface powerMessage{
+  interface powerMessage {
+    AxisReset: {
+      IsActive: boolean,
+      Percentage: number
+    }
     PostPowerOn: postPowerOnMessage;
     PrePowerOn: prePowerOnMessage;
   }

Step/wwwroot/src/modules/axes-calibration-dialog.vue

@@ -1,12 +1,19 @@
 <template>
-<loader title="Azzeramento degli assi"
-        message="Azzeramento degli assi in corso ..." percent="30"></loader>
+<loader :title="'axes_reset_title' | localize('Azzeramento degli assi')"
+        :message="'axes_reset_message' | localize('Azzeramento degli assi in corso ...')" :percent="progress"></loader>
 </template>
 
 <script>
 import Loader from "./base-components/loader.vue";
+import { AppModel } from "src/store";
 export default {
-  components: { loader: Loader }
+  components: { loader: Loader },
+  computed: {
+    progress() {
+
+      return this.$store.state.machineStatus.resetAxesProgress;
+    }
+  }
 };
 </script>
 <style>

Step/wwwroot/src/services/hub.ts

@@ -8,6 +8,7 @@ import { Factory, MessageService } from "src/_base";
 import { signalr_alarms } from "src/@types/signalr.alarms";
 import { processModelActions } from "src/store/runningProcess.store";
 import { machineService } from "src/services/machineService";
+import { ModalHelper } from "../modules/base-components";
 
 declare let $: any;
 
@@ -54,6 +55,8 @@ export class Hub {
     this._hub.client.logout = this.logout;
 
     $.connection.hub.start();
+
+    this.checkShowAxes();
   }
 
   private logout(e) {
@@ -137,6 +140,9 @@ export class Hub {
     // Receiving messages so NC is connected
     Hub.manageNcStatus({ connected: true });
 
+
+    machineStatusActions.setResetAxes(store, { reset: power.AxisReset.IsActive, progress: power.AxisReset.Percentage });
+
     // Pre-power on
     machineStatusActions.setAirPressureAlarm(store, power.PrePowerOn.AirPressure);
     machineStatusActions.setPowerAlarm(store, power.PrePowerOn.PowerOn);
@@ -150,6 +156,22 @@ export class Hub {
     machineStatusActions.setWaterJet1Alarm(store, power.PostPowerOn.WaterjetPump);
   }
 
+  _axesVisible: boolean = false;
+  private checkShowAxes() {
+    store.watch(s => (s as AppModel).machineStatus.resetAxes, (n, o) => {
+      if (n != o) {
+        if (n && !this._axesVisible) {
+          Factory.Get(MessageService).publishToChannel("show-axes-calibration");
+          this._axesVisible = true;
+        }
+        else if (!n && this._axesVisible) {
+          ModalHelper.HideModal();
+          this._axesVisible = false;
+        }
+      }
+    });
+  }
+
   public sendPowerCommand(id: number) {
     this._hub.server.putPowerOnData(id);
   }

Step/wwwroot/src/store/machineStatus.store.ts

@@ -24,6 +24,9 @@ export interface MachineStatusModel {
 
   ncReady: boolean,
 
+  resetAxes: boolean,
+  resetAxesProgress: number,
+
   areasConfiguration: Array<AreaModel>,
   functions: Array<AreaModel>
 }
@@ -35,6 +38,7 @@ export interface buttonStatus {
 }
 
 export interface MachineStatusActions {
+  setResetAxes(context, status: { reset: boolean, progress: number });
   setPowerAlarm(context, status: buttonStatus),
   setAirPressureAlarm(context, status: buttonStatus),
   setProtectionsAlarm(context, status: buttonStatus),
@@ -67,6 +71,9 @@ export const machineStatusStore = {
 
     ncReady: false,
 
+    resetAxes: false,
+    resetAxesProgress: 0,
+
     _functions: new Map<string, signalr_security.securityFunction>(),
     functions: [],
     areasConfiguration: []
@@ -86,7 +93,7 @@ export const machineStatusStore = {
         state.waterJet1Alarm.Active ||
         state.waterJet2Alarm.Active;
     },
-    securityFunction: state => id =>{
+    securityFunction: state => id => {
       return state._functions.get[id];
     }
   },
@@ -105,6 +112,9 @@ export const machineStatusStore = {
     }
   },
   actions: {
+    setResetAxes(context, status: { reset: boolean, progress: number }) {
+      context.commit('UpdateMachineStatus', { resetAxes: status.reset, resetAxesProgress: status.progress });
+    },
     setPowerAlarm(context, status: buttonStatus) {
       context.commit('UpdateMachineStatus', { powerOnAlarm: status });
     },
@@ -179,7 +189,7 @@ export const machineStatusStore = {
       }
       return false;
     },
-    setSecurityFunction(context, securityFunctions: Array<signalr_security.securityFunction>){
+    setSecurityFunction(context, securityFunctions: Array<signalr_security.securityFunction>) {
       securityFunctions.forEach(element => {
         context.commit("SetSecurityFunction", element);
       });