fix problemi di rendering

This commit is contained in:
=
2020-07-17 15:41:09 +02:00
parent 00a9634b76
commit ad6e349d1f
10 changed files with 69 additions and 19 deletions
@@ -35,12 +35,14 @@ export default class gauge extends Vue {
var largeArcFlag = endAngle - startAngle <= 180 ? "0" : "1";
var d = [
"M", start.x, start.y,
"A", radius, radius, 0, largeArcFlag, 0, end.x, end.y
].join(" ");
var d = [];
if (Number.isFinite(start.x) && Number.isFinite(end.y))
d = [
"M", start.x, start.y,
"A", radius, radius, 0, largeArcFlag, 0, end.x, end.y
];
return d;
return d.join(" ");
}
get actualValue() {
@@ -14,7 +14,7 @@
<article class="scrollable">
<template v-for="(b,idx) in Favourites">
<soft-key
v-if="getSoftKeyStatus(b.id).visible"
v-if="getSoftKeyStatus(b.id) && getSoftKeyStatus(b.id).visible"
:key="`f_${idx}`"
:title="'softkey_' + b.id | localize('softkey_' + b.id)"
:type="b.type"
@@ -54,7 +54,7 @@
<article class="scrollable">
<template v-for="(b,idx) in allSoftKeys">
<soft-key
v-if="getSoftKeyStatus(b.id).visible"
v-if="getSoftKeyStatus(b.id) && getSoftKeyStatus(b.id).visible"
:key="idx"
:title="'softkey_' + b.id | localize('softkey_' + b.id)"
:type="b.type"
@@ -54,11 +54,15 @@ export default class GanttComponent extends Vue {
}
get actualDelay() {
return this.value.actualDelay * this.delayDuration / Math.max(this.value.estimatedDelay, this.value.actualDelay);
let result = this.value.actualDelay * this.delayDuration / Math.max(this.value.estimatedDelay, this.value.actualDelay);
if (Number.isFinite(result)) return result;
return 0;
}
get actualDuration() {
return this.value.actualDuration * this.duration / Math.max(this.value.estimatedDuration, this.value.actualDuration);
let result = this.value.actualDuration * this.duration / Math.max(this.value.estimatedDuration, this.value.actualDuration);
if (Number.isFinite(result)) return result;
return 0;
}
get statusDuration() {
@@ -33,15 +33,19 @@
<foreignObject :width="duration * ganttOptions.secondSize" height="44" x="0" y="0">
<div class="body-header">{{value.label | localize(value.label)}}</div>
</foreignObject>
<foreignObject :width="duration * ganttOptions.secondSize" height="26" x="0" y="44">
<foreignObject
:width="(duration - (showStatus && recipeValue?statusDuration:0)) * ganttOptions.secondSize"
height="26"
x="0"
y="44"
>
<div class="body-footer">{{value.estimatedDuration | round(1)}}s</div>
</foreignObject>
<line
v-if="showStatus && recipeValue"
class="vertical-line"
:x1="duration * ganttOptions.secondSize"
:x2="duration * ganttOptions.secondSize"
:y1="44"
:x1="(duration - (showStatus && recipeValue?statusDuration:0)) * ganttOptions.secondSize"
:x2="(duration - (showStatus && recipeValue?statusDuration:0)) * ganttOptions.secondSize"
:y1="0"
:y2="70"
/>
</g>
@@ -69,7 +69,9 @@ export default class GanttRow extends Vue {
}
get rowHeight() {
return Math.max(...this.blocksInSection.map(b => this.verticalPosition(b) + this.ganttOptions.elementHeight + this.ganttOptions.elementPadding * 2)) * this.zoomFactor;
let result = Math.max(...this.blocksInSection.map(b => this.verticalPosition(b) + this.ganttOptions.elementHeight + this.ganttOptions.elementPadding * 2)) * this.zoomFactor;
if (!Number.isNaN(result) && Number.isFinite(result)) return result;
return 0;
}
}
@@ -0,0 +1,7 @@
import Vue from "vue";
import Component from "vue-class-component";
@Component({})
export default class SaveAs extends Vue {
}
@@ -0,0 +1,28 @@
<template>
<div class="setup">
<modal type="save-as" :title="'save-as' | localize('Salva con nome')">
<div slot="header-buttons">
<button class="modal-close" @click="close()">
<i class="fa fa-remove"></i>
</button>
</div>
<section>
<article>
<div class="input-area mb-10">
<label>{{'recipe_name' | localize('Nome della ricetta')}}</label>
<input
class="custom"
v-model="searchText"
:placeholder="'recipe_name' | localize('Nome della ricetta')"
/>
</div>
</article>
</section>
<footer>
<button class="btn" @click="annulla()">{{'cancel' | localize("Annulla")}}</button>
<button class="btn btn-success" @click="save()">{{'confirm' | localize("Conferma")}}</button>
</footer>
</modal>
</div>
</template>
<script src="./save.ts" lang="ts"></script>
@@ -9,9 +9,9 @@ Vue.filter("localize", function (key: string, defaultValue: string, ...args): st
let isSiemens = (store.state as AppModel).machineInfo.isSiemens;
let isRadius = (store.state as AppModel).tooling.radiusMetricType;
if(!isRadius)
key = key.replace("radius", "diameter").replace("Radius", "Diameter");
if (!isRadius)
key = key.replace("radius", "diameter").replace("Radius", "Diameter").toLowerCase();
let value = labels[isSiemens == true ? "siemens_" + key : key];
let dvalue = ""
if (!value)
@@ -154,6 +154,9 @@
<button v-if="p.visible && !mainStatus" class="save-circle"></button>
<button v-if="p.visible && !mainStatus" class="dot-circle"></button>
</div>
<button class="over blue" :title="'recipe_save' | localize('save')">
<i class="fa fa-save"></i>
</button>
<archinterface></archinterface>
<user-info></user-info>
</header>
@@ -41,7 +41,7 @@ export const localizationStore = {
// cambio solo le lables presenti,
// lascio le vecchie labels se non aggiornate dalla nuova lingua.
for (const key in labels) {
store.labels[key] = labels[key];
store.labels[key.toLowerCase()] = labels[key];
}
VuexPersistance.Persist(store, "localizationStore");