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

fix regex osai

Browse Source
This commit is contained in:
Paolo Possanzini
2018-09-21 10:09:48 +02:00
parent f909ba2a9a
commit 48a60d3022
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/src/components/job-editor.ts
+14 -14
View File
@@ -41,23 +41,23 @@ const siemensJobItems = [
// Da controllare comandi e regex
const osaiJobItems = [
{ title: 'job_item_part_program', layout: "big", command: 'M198 %s', rx: /M198 (.+);(.*)|M198 (.+);?/, order: 0 },
{ title: 'job_item_macro_cms', layout: "big", command: 'M98 P%s', rx: /M98 P(.+);(.*)|M98 P(.+);?/, order: 0 },
{ title: 'job_item_text', layout: "big", command: "%s", rx: /(.+);(.*)|(.+);?/, order: 100 },
{ title: 'job_item_pause', layout: "small", command: "M0", rx: /^M0;(.*)|^M0;?/, order: 0 },
{ title: 'job_item_delay', layout: "small", command: "G04 X%s;", rx: /G04 X(.+);(.*)|G04 X(.+);?/, order: 0 },
{ title: 'job_item_origin', layout: "small", command: "G54 P%s", rx: /G54 P(.+);(.*)|G54 P(.+);?/, order: 0 },
{ title: 'job_item_end_program', layout: "small", command: "M30;", rx: /M30;(.*)|M30;?/, order: 0 },
{ title: 'job_item_part_program', layout: "big", command: 'M198 %s;%s', rx: /M198 (.+);(.*)|M198 (.+);?/, order: 0 },
{ title: 'job_item_macro_cms', layout: "big", command: 'M98 P%s;%s', rx: /M98 P(.+);(.*)|M98 P(.+);?/, order: 0 },
{ title: 'job_item_text', layout: "big", command: "%s;%s", rx: /(.+);(.*)|(.+);?/, order: 100 },
{ title: 'job_item_pause', layout: "small", command: "M0;%s", rx: /^M0;(.*)|^M0;?/, order: 0 },
{ title: 'job_item_delay', layout: "small", command: "G04 X%s;%s", rx: /G04 X(.+);(.*)|G04 X(.+);?/, order: 0 },
{ title: 'job_item_origin', layout: "small", command: "G54 P%s;%s", rx: /G54 P(.+);(.*)|G54 P(.+);?/, order: 0 },
{ title: 'job_item_end_program', layout: "small", command: "M30;%s", rx: /M30;(.*)|M30;?/, order: 0 },
];
// Da controllare comandi e regex
const fanucJobItems = [
{ title: 'job_item_part_program', layout: "big", command: 'CALL "%s"', rx: /M198 (.+);?.*/, order: 0 },
{ title: 'job_item_macro_cms', layout: "big", command: 'PCALL /_N_CMA_DIR/%s', rx: /M98 P(.+);?.*/, order: 0 },
{ title: 'job_item_text', layout: "big", command: "%s", rx: /(.+);?.*/, order: 100 },
{ title: 'job_item_pause', layout: "small", command: "M0", rx: /^M0;?.*/, order: 0 },
{ title: 'job_item_delay', layout: "small", command: "G04 F%s;", rx: /G04 X(.+);?.*/, order: 0 },
{ title: 'job_item_origin', layout: "small", command: "G%s", rx: /G54 P(.+);?.*/, order: 0 },
{ title: 'job_item_end_program', layout: "small", command: "M30", rx: /M30;?.*/, order: 0 },
{ title: 'job_item_part_program', layout: "big", command: '(CLT,%s);%s', rx: /\(CLT,(.+)\);(.*)|\(CLT,(.+)\);?/, order: 0 },
{ title: 'job_item_macro_cms', layout: "big", command: '(CLD,%s);%s', rx: /\(CLD,(.+)\);(.*)|\(CLD,(.+)\);?/, order: 0 },
{ title: 'job_item_text', layout: "big", command: "%s", rx: /(.+);(.*)|(.+);?/, order: 100 },
{ title: 'job_item_pause', layout: "small", command: "M0;%s", rx: /^M0;(.*)|^M0;?/, order: 0 },
{ title: 'job_item_delay', layout: "small", command: "(DLY,%s);%s", rx: /\(DLY,(.+)\);(.*)|\(DLY,(.+)\);?/, order: 0 },
{ title: 'job_item_origin', layout: "small", command: "(UAO,%s);%s", rx: /\(UAO,(.+)\);(.*)|\(UAO,(.+)\);?/, order: 0 },
{ title: 'job_item_end_program', layout: "small", command: "M30;%s", rx: /M30;(.*)|M30;?/, order: 0 },
];