diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index 2d19ab93..1c2c4f2a 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Model/DTOModels/DTOProcessDataModel.cs b/Step.Model/DTOModels/DTOProcessDataModel.cs index 14c8fb58..e1c4640b 100644 --- a/Step.Model/DTOModels/DTOProcessDataModel.cs +++ b/Step.Model/DTOModels/DTOProcessDataModel.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using CMS_CORE_Library.Models; +using System.Collections.Generic; using System.Linq; using static CMS_CORE_Library.Models.DataStructures; @@ -18,6 +19,12 @@ namespace Step.Model.DTOModels public bool CanLoadProgram; public string ProcessMessage; + public byte RapidOverride; + public byte WorkOverride; + + public OffsetModel offsetData; + + public DTOProcessesDataModel() { ProcessMessage = ""; @@ -59,13 +66,25 @@ namespace Step.Model.DTOModels if (ActiveOrigin != item.ActiveOrigin) return false; - if (ProcessMessage != item.ProcessMessage) + if (ProcessMessage != item.ProcessMessage) return false; if (UnitMeasure != item.UnitMeasure) return false; if (CanLoadProgram != item.CanLoadProgram) + return false; + + if (RapidOverride != item.RapidOverride) + return false; + + if (WorkOverride != item.WorkOverride) + return false; + + if (offsetData.RealLength != item.offsetData.RealLength) + return false; + + if (offsetData.RealRadius != item.offsetData.RealRadius) return false; return true; diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index 89b3048e..3867f860 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -113,7 +113,7 @@ namespace Step.NC return cmsError; } - public CmsError GetAxesPositionsByProcess(ushort processNum, out DTOAxesModel axes) + public CmsError GetAxesPositionsByProcess(ushort processNum, out DTOAxesModel axes) { axes = new DTOAxesModel(); @@ -432,6 +432,12 @@ namespace Step.NC processesData.ActiveOffsetId = selectedData.ActiveOffsetId; processesData.ProcessMessage = selectedData.ProcessMessage; + // Overrides + processesData.RapidOverride = selectedData.RapidOverride; + processesData.WorkOverride = selectedData.WorkOverride; + + processesData.offsetData = selectedData.OffsetData; + // Measure processesData.UnitMeasure = UMeas; diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml index 413bc8f7..a7be7507 100644 --- a/Step.Utils/languages/IT.xml +++ b/Step.Utils/languages/IT.xml @@ -1,5 +1,5 @@ - + Italiano Effettuare manutenzione @@ -141,7 +141,7 @@ Modifica Offset n. %d Modifica Tagliente n. %d Creazione nuovo Tagliente - Associazionie nuovo Offset + Associazione nuovo Offset Gestione Codoli Seleziona un Codolo: Crea un nuovo Codolo @@ -453,6 +453,26 @@ Radio Probe 2 - Ricevitore 2 Radio Probe 3 - Ricevitore 2 Radio Probe 4 - Ricevitore 2 + Disco ultrasuoni amplitude 10% + Disco ultrasuoni amplitude 20% + Disco ultrasuoni amplitude 30% + Disco ultrasuoni amplitude 40% + Disco ultrasuoni amplitude 50% + Disco ultrasuoni amplitude 60% + Disco ultrasuoni amplitude 70% + Disco ultrasuoni amplitude 80% + Disco ultrasuoni amplitude 90% + Disco ultrasuoni amplitude 100% + Lama ultrasuoni amplitude 10% + Lama ultrasuoni amplitude 20% + Lama ultrasuoni amplitude 30% + Lama ultrasuoni amplitude 40% + Lama ultrasuoni amplitude 50% + Lama ultrasuoni amplitude 60% + Lama ultrasuoni amplitude 70% + Lama ultrasuoni amplitude 80% + Lama ultrasuoni amplitude 90% + Lama ultrasuoni amplitude 100% Richiesta di conferma Ok Annulla @@ -520,9 +540,14 @@ NC Prod Softkey Preferite + Interp. Absol. To-Go Prog. + Rapid: + Work: + Lunghezza reale: + Raggio reale: Origine attiva: Correttore attivo: Tagliente attivo: diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml index ccb44091..5201e09f 100644 --- a/Step.Utils/languages/en.xml +++ b/Step.Utils/languages/en.xml @@ -1,5 +1,5 @@ - + English Maintenance request @@ -453,6 +453,26 @@ Radio Probe 2 - Reciever 2 Radio Probe 3 - Reciever 2 Radio Probe 4 - Reciever 2 + Ultrasound disk amplitude 10% + Ultrasound disk amplitude 20% + Ultrasound disk amplitude 30% + Ultrasound disk amplitude 40% + Ultrasound disk amplitude 50% + Ultrasound disk amplitude 60% + Ultrasound disk amplitude 70% + Ultrasound disk amplitude 80% + Ultrasound disk amplitude 90% + Ultrasound disk amplitude 100% + Ultrasound blade amplitude 10% + Ultrasound blade amplitude 20% + Ultrasound blade amplitude 30% + Ultrasound blade amplitude 40% + Ultrasound blade amplitude 50% + Ultrasound blade amplitude 60% + Ultrasound blade amplitude 70% + Ultrasound blade amplitude 80% + Ultrasound blade amplitude 90% + Ultrasound blade amplitude 100% Confirm Operation Ok Cancel @@ -520,9 +540,14 @@ NC Prod Favorite Softkey + Interp. Absol. To-Go Prog. + Rapid: + Work: + Real length: + Real radius: Active origin: Active offset: Active Cutting-edge: diff --git a/Step.Utils/languages/fr.xml b/Step.Utils/languages/fr.xml index 22375c07..eb65a388 100644 --- a/Step.Utils/languages/fr.xml +++ b/Step.Utils/languages/fr.xml @@ -1,5 +1,5 @@ - + Français Procéder à la maintenance @@ -520,9 +520,14 @@ NC Prod. Touches Favorites + Interp. Absol. To-Go Prog. + Rapid: + Work: + Longueur réelle: + Rayon réel: Origine active : Correcteur actif : Tranchant actif : diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less index 45ff5c56..01631a48 100644 --- a/Step/wwwroot/assets/styles/base/card.less +++ b/Step/wwwroot/assets/styles/base/card.less @@ -760,21 +760,23 @@ } .card-axes-production { - height: 558px; + height: 562px; width: 232px; - border-radius: 2px; - box-shadow: 0 1px 2px 0 @color-black-40; + //border-radius: 2px; + //box-shadow: 0 1px 2px 0 @color-black-40; background-color: @color-background-white; display: flex; flex-flow: column; - .first-box-axes, - .second-box-axes { - height: 264px; + .first-box-axes { + height: 294px; width: 100%; display: flex; flex-flow: column; overflow: auto; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + margin-top: 8px; .axes { min-height: 32px; @@ -874,12 +876,7 @@ .axes:last-child { margin-bottom: 16px; } - } - - .second-box-axes { - width: 100%; - height: 294px; - + .tabs { min-height: 30px; width: 100%; @@ -918,6 +915,15 @@ } } +.override-box { + height: 260px; + width: 232px; + display: block; + margin: auto; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); +} + .card-folder-path { width: auto; height: 64px; diff --git a/Step/wwwroot/assets/styles/base/production.less b/Step/wwwroot/assets/styles/base/production.less index d07bec04..8a0d40a8 100644 --- a/Step/wwwroot/assets/styles/base/production.less +++ b/Step/wwwroot/assets/styles/base/production.less @@ -131,7 +131,7 @@ height: 353px; width: 232px; border-radius: 2px; - margin-top: 8px; + margin-top: 12px; margin-bottom: 16px; box-shadow: 0 1px 2px 0 @color-black-40; button:nth-child(odd),button:nth-child(even){ diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 562f8714..2d5273d5 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -7673,24 +7673,23 @@ footer .container button.big:before { color: #002680; } .card-axes-production { - height: 558px; + height: 562px; width: 232px; - border-radius: 2px; - box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); background-color: #fff; display: flex; flex-flow: column; } -.card-axes-production .first-box-axes, -.card-axes-production .second-box-axes { - height: 264px; +.card-axes-production .first-box-axes { + height: 294px; width: 100%; display: flex; flex-flow: column; overflow: auto; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + margin-top: 8px; } -.card-axes-production .first-box-axes .axes, -.card-axes-production .second-box-axes .axes { +.card-axes-production .first-box-axes .axes { min-height: 32px; width: 100%; display: flex; @@ -7699,20 +7698,16 @@ footer .container button.big:before { justify-content: space-between; margin-top: 8px; } -.card-axes-production .first-box-axes .axes._7, -.card-axes-production .second-box-axes .axes._7 { +.card-axes-production .first-box-axes .axes._7 { min-height: 26px; } -.card-axes-production .first-box-axes .axes._8, -.card-axes-production .second-box-axes .axes._8 { +.card-axes-production .first-box-axes .axes._8 { min-height: 22px; } -.card-axes-production .first-box-axes .axes._9, -.card-axes-production .second-box-axes .axes._9 { +.card-axes-production .first-box-axes .axes._9 { min-height: 18px; } -.card-axes-production .first-box-axes .axes .variable, -.card-axes-production .second-box-axes .axes .variable { +.card-axes-production .first-box-axes .axes .variable { font-size: 48px; width: 75px; line-height: 0; @@ -7720,24 +7715,19 @@ footer .container button.big:before { color: #4b4b4b; text-align: right; } -.card-axes-production .first-box-axes .axes .variable._7, -.card-axes-production .second-box-axes .axes .variable._7 { +.card-axes-production .first-box-axes .axes .variable._7 { font-size: 42px; } -.card-axes-production .first-box-axes .axes .variable._8, -.card-axes-production .second-box-axes .axes .variable._8 { +.card-axes-production .first-box-axes .axes .variable._8 { font-size: 36px; } -.card-axes-production .first-box-axes .axes .variable._9, -.card-axes-production .second-box-axes .axes .variable._9 { +.card-axes-production .first-box-axes .axes .variable._9 { font-size: 29px; } -.card-axes-production .first-box-axes .axes .variable.more9, -.card-axes-production .second-box-axes .axes .variable.more9 { +.card-axes-production .first-box-axes .axes .variable.more9 { width: 69px; } -.card-axes-production .first-box-axes .axes .number, -.card-axes-production .second-box-axes .axes .number { +.card-axes-production .first-box-axes .axes .number { width: 135px; height: 32px; border-radius: 2px; @@ -7749,79 +7739,74 @@ footer .container button.big:before { padding-right: 8px; font-size: 20px; } -.card-axes-production .first-box-axes .axes .number._7, -.card-axes-production .second-box-axes .axes .number._7 { +.card-axes-production .first-box-axes .axes .number._7 { height: 26px; } -.card-axes-production .first-box-axes .axes .number._8, -.card-axes-production .second-box-axes .axes .number._8 { +.card-axes-production .first-box-axes .axes .number._8 { height: 22px; } -.card-axes-production .first-box-axes .axes .number._9, -.card-axes-production .second-box-axes .axes .number._9 { +.card-axes-production .first-box-axes .axes .number._9 { height: 18px; font-size: 18px; } -.card-axes-production .first-box-axes .axes .number.more9, -.card-axes-production .second-box-axes .axes .number.more9 { +.card-axes-production .first-box-axes .axes .number.more9 { margin-right: 5px; } -.card-axes-production .first-box-axes .axes .umeasure, -.card-axes-production .second-box-axes .axes .umeasure { +.card-axes-production .first-box-axes .axes .umeasure { width: 32px; margin-left: 5px; text-align: left; } -.card-axes-production .first-box-axes .axes:nth-child(odd) .number, -.card-axes-production .second-box-axes .axes:nth-child(odd) .number { +.card-axes-production .first-box-axes .axes:nth-child(odd) .number { background-color: #f3f3f3; } -.card-axes-production .first-box-axes .axes:nth-child(even) .number, -.card-axes-production .second-box-axes .axes:nth-child(even) .number { +.card-axes-production .first-box-axes .axes:nth-child(even) .number { background-color: rgba(23, 145, 255, 0.3); } -.card-axes-production .first-box-axes .axes:first-child, -.card-axes-production .second-box-axes .axes:first-child { +.card-axes-production .first-box-axes .axes:first-child { margin-top: 16px; } -.card-axes-production .first-box-axes .axes:last-child, -.card-axes-production .second-box-axes .axes:last-child { +.card-axes-production .first-box-axes .axes:last-child { margin-bottom: 16px; } -.card-axes-production .second-box-axes { - width: 100%; - height: 294px; -} -.card-axes-production .second-box-axes .tabs { +.card-axes-production .first-box-axes .tabs { min-height: 30px; width: 100%; background-color: #e7e7e7; display: flex; flex-direction: row; } -.card-axes-production .second-box-axes .tabs button { +.card-axes-production .first-box-axes .tabs button { visibility: hidden; border: none; } -.card-axes-production .second-box-axes .tabs .tab { +.card-axes-production .first-box-axes .tabs .tab { visibility: visible; width: 77px; border-right: solid 1px #979797; } -.card-axes-production .second-box-axes .tabs .tab.active { +.card-axes-production .first-box-axes .tabs .tab.active { background-color: #fff; border-top: solid 2px #1791ff !important; } -.card-axes-production .second-box-axes .tabs .tab:last-child { +.card-axes-production .first-box-axes .tabs .tab:last-child { border: none; } -.card-axes-production .second-box-axes .content-box { +.card-axes-production .first-box-axes .content-box { height: calc(100% - 30px); width: 100%; display: flex; flex-flow: column; overflow: auto; } +.override-box { + height: 260px; + width: 232px; + display: block; + margin: auto; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); +} .card-folder-path { width: auto; height: 64px; @@ -18462,7 +18447,7 @@ footer .container button.big:before { height: 353px; width: 232px; border-radius: 2px; - margin-top: 8px; + margin-top: 12px; margin-bottom: 16px; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); } diff --git a/Step/wwwroot/src/app_modules/production/components/card-axes-production.vue b/Step/wwwroot/src/app_modules/production/components/card-axes-production.vue index eb85b492..caeb6adf 100644 --- a/Step/wwwroot/src/app_modules/production/components/card-axes-production.vue +++ b/Step/wwwroot/src/app_modules/production/components/card-axes-production.vue @@ -1,8 +1,21 @@ + diff --git a/Step/wwwroot/src/components/doughnut-chart/index.js b/Step/wwwroot/src/components/doughnut-chart/index.js index 5befbd2a..559c66cc 100644 --- a/Step/wwwroot/src/components/doughnut-chart/index.js +++ b/Step/wwwroot/src/components/doughnut-chart/index.js @@ -1,5 +1,7 @@ import DoughnutChart from "./doughnut-chart.vue"; +import DoughnutChartAnimated from "./doughnut-chart-animated.vue"; export { - DoughnutChart + DoughnutChart, + DoughnutChartAnimated } \ No newline at end of file diff --git a/Step/wwwroot/src/services/hub.ts b/Step/wwwroot/src/services/hub.ts index 977b5387..1537136f 100644 --- a/Step/wwwroot/src/services/hub.ts +++ b/Step/wwwroot/src/services/hub.ts @@ -192,7 +192,7 @@ export class Hub { } private static processDataChanged(data) { - +console.log(data) let processes = data.processes; for (const key in processes) { let process = processes[key]; @@ -210,6 +210,9 @@ export class Hub { processModelActions.selectProcess(store, data.selectedProcess); processModelActions.selectAxis(store, data.selectedAxis); processModelActions.checkRemove(store, processes.map(i => i.id)); + processModelActions.setOverrides(store, data.rapidOverride, data.workOverride); + + processModelActions.setOffsetData(store, data.offsetData); } private static ncSoftKeyChanged(status) { diff --git a/Step/wwwroot/src/store/runningProcess.store.ts b/Step/wwwroot/src/store/runningProcess.store.ts index e59c9bfa..56256430 100644 --- a/Step/wwwroot/src/store/runningProcess.store.ts +++ b/Step/wwwroot/src/store/runningProcess.store.ts @@ -13,6 +13,9 @@ export interface RunningProcessModel { processMessage: string, unitMeasure: string, canLoadProgram: boolean, + offsetData: server.Offset + rapidOverride: number, + workOverride: number } export interface ProcessModelActionsInterface { removeAllProcess(context); @@ -36,9 +39,10 @@ export interface ProcessModelActionsInterface { setProcessMessage(context, message: string); setUnitMeasure(context, Id: number); setCanLoadProgram(context, Id: number); + setOverrides(context, rapidOverride: number, workOverride: number); + setOffsetData(context, offsetData: server.Offset) } - export const processStore = { state: { @@ -60,7 +64,10 @@ export const processStore = { activeOrigin: 0, processMessage: "", unitMeasure: "mm", - canLoadProgram: false + canLoadProgram: false, + workOverride:0, + rapidOverride:0, + offsetData : null } as RunningProcessModel, mutations: { SetCurrentOrigin(store, Id){ @@ -166,6 +173,13 @@ export const processStore = { } store.m155messages = Array.from(store._m155messages.values()); + }, + setOverrides(store, data){ + store.rapidOverride = data.rapidOverride; + store.workOverride = data.workOverride; + }, + SetOffsetData(store, data){ + store.offsetData = data } }, getters: { @@ -237,6 +251,13 @@ export const processStore = { setUnitMeasure(context, data){ context.commit("SetUnitMeasure", data); }, + setOverrides(context, rapidOverride, workOverride){ + context.commit("setOverrides", {rapidOverride: rapidOverride, workOverride: workOverride}); + }, + setOffsetData(context, offsetData: server.Offset) + { + context.commit("SetOffsetData", offsetData) + } } as ProcessModelActionsInterface }