Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-09-24 18:00:17 +02:00
parent a74d2abb19 91fafd459b
commit c85ed17448
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.ts
+6 -5
View File
@@ -145,10 +145,10 @@ export default class Warmers extends Vue {
}
zoomReset() {
this.zoomController?.center();
this.zoomController?.fit();
this.zoomController?.center();
this.zoomController?.fit();
}
async mounted() {
let $this = this;
if (this.usePanZoom)
@@ -170,8 +170,6 @@ export default class Warmers extends Vue {
}
});
}, 500);
let config = await new machineService().getMachineConfiguration();
this.parameters = config.additionalParameters;
}
@@ -251,6 +249,9 @@ export default class Warmers extends Vue {
let result = new Map<number, Warmers.IResistance[]>();
for (const c of this.channels) c.setpointHMI = 0;
for (const row of this.rows) {
for (const cell of this.resistancesPerRow(row)) {
this.resistancePosition(row, cell, point1, point2, point3, point4);
Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.vue
+2 -2
View File
@@ -33,8 +33,8 @@
<rect
ref="piastra"
v-if="parameters"
:x="((parameters.warmerPlanSizeX - recipe.general_sizes_sheet_dim_x.setpointHMI)/2)"
:y="((parameters.warmerPlanSizeY- recipe.general_sizes_sheet_dim_y.setpointHMI)/2)"
: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)"
:width="recipe.general_sizes_sheet_dim_x.setpointHMI"
:height="recipe.general_sizes_sheet_dim_y.setpointHMI"
stroke="rgba(0,0,0,.8)"