This commit is contained in:
=
2020-09-17 17:23:43 +02:00
parent 7fd2b6ca30
commit 23af55e1e1
3 changed files with 56 additions and 12 deletions
@@ -5,6 +5,8 @@ import { warmersService } from "@/services/warmersService";
import { Prop, Watch } from "vue-property-decorator";
import resistance from "./resistance.vue";
import svgPanZoom from "svg-pan-zoom";
import { machineService } from "@/services";
import ShowControstampoInfo from "@/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info";
@Component({
components: {
@@ -13,7 +15,7 @@ import svgPanZoom from "svg-pan-zoom";
})
export default class Warmers extends Vue {
width = 180;
width = 100;
height = 48;
@Prop()
@@ -25,12 +27,41 @@ export default class Warmers extends Vue {
@Prop({ default: true })
usePanZoom: boolean;
scaleFactorX() {
if (this.$refs.warmer && this.parameters) {
let result = (this.$refs.warmer as SVGElement).clientWidth / parseFloat(this.parameters.warmerPlanSizeX.toString());
console.log('scaleX', result)
return result;
}
return 1;
}
scaleFactorY() {
if (this.$refs.warmer && this.parameters) {
let result = (this.$refs.warmer as SVGElement).clientHeight / parseFloat(this.parameters.warmerPlanSizeY.toString());
console.log('scaleY', result)
return result;
}
return 1
}
selectionPoints: selectionPoint[] = []
selectedChannels: number[] = []
selectionMethod: SelectionMethod = SelectionMethod.none;
parameters: {
warmerPlanSizeX: number,
warmerPlanSizeY: number,
warmerAutocompStartValue: number,
warmerAutocompStep: number
} = null;
get channels() {
return store.state.warmers.channels.filter(i => i.idReflector == this.idReflector);
}
@@ -113,7 +144,7 @@ export default class Warmers extends Vue {
this.zoomController?.zoomOut();
}
mounted() {
async mounted() {
let $this = this;
if (this.usePanZoom)
setTimeout(() => {
@@ -134,7 +165,11 @@ export default class Warmers extends Vue {
return true;
}
});
}, 500)
}, 500);
let config = await new machineService().getMachineConfiguration();
this.parameters = config.additionalParameters;
}
startSelection(event: MouseEvent) {
@@ -200,8 +235,10 @@ export default class Warmers extends Vue {
}
automate(max: number = 100, min: number = 20) {
automate() {
var min = this.parameters.warmerAutocompStartValue;
var max = 100;
let lazo = this.$refs.piastra as SVGRectElement;
let point1 = (this.$refs.warmer as SVGSVGElement)?.createSVGPoint();
let point2 = (this.$refs.warmer as SVGSVGElement)?.createSVGPoint();
@@ -229,11 +266,11 @@ export default class Warmers extends Vue {
let dv = max - min;
for (const i of Array.from(result.keys())) {
let rv = max - (((i - mink) * dv) / dk);
let rv = Math.round(max - (((i - mink) * dv) / dk));
rv = rv - rv % this.parameters.warmerAutocompStep;
for (const res of result.get(i)) {
let channel = this.channels.find(c => c.idChannel == res.idChannel);
channel.setpointHMI = Math.round(rv);
channel.setpointHMI = rv;
}
}
@@ -32,10 +32,11 @@
<g>
<rect
ref="piastra"
:x="10"
:y="10"
:width="recipe.general_sizes_sheet_dim_x.setpointHMI"
:height="recipe.general_sizes_sheet_dim_y.setpointHMI"
v-if="parameters"
:x="((parameters.warmerPlanSizeX - recipe.general_sizes_sheet_dim_x.setpointHMI)/2) * scaleFactorX()"
:y="((parameters.warmerPlanSizeY- recipe.general_sizes_sheet_dim_y.setpointHMI)/2) * scaleFactorY()"
:width="recipe.general_sizes_sheet_dim_x.setpointHMI * scaleFactorX()"
:height="recipe.general_sizes_sheet_dim_y.setpointHMI * scaleFactorY()"
stroke="rgba(0,0,0,.3)"
stroke-width="6"
rx="3"
@@ -2,7 +2,7 @@ import { baseRestService } from "@/_base/baseRestService";
import { AreaModel } from "@/store/machineStatus.store";
import { store, machineInfoActions, MachineInfoModel } from "@/store";
import { Factory, messageService } from "@/_base";
import {CONFIGURATION} from "@/config";
import { CONFIGURATION } from "@/config";
export class machineService extends baseRestService {
@@ -59,6 +59,12 @@ export interface ClientConfigurationModel {
mgiOption: boolean,
cmsConnectReady: boolean,
siemensKeyboardOption: boolean
additionalParameters: {
warmerPlanSizeX: number,
warmerPlanSizeY: number,
warmerAutocompStartValue: number,
warmerAutocompStep: number
}
}
export interface ContactConfigurationModel {