Skip to content

S
Scott
Commit 09227f67 authored by Scott Sun's avatar Scott Sun
Browse files
Options

scott

parent f7696dfa
Expand all Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 53 deletions
GUI测试/test.js
View file @ 09227f67
This diff is collapsed.
ats/topcam/ATS_AIM_customer_data_analysis.js
View file @ 09227f67
...@@ -487,6 +487,14 @@ try { ...@@ -487,6 +487,14 @@ try {
var type = (v=="enig_top") ? "top" : "bot" var type = (v=="enig_top") ? "top" : "bot"
return {name:v, type:type} return {name:v, type:type}
}) })
} else {
gold_fingers = Object.keys(tmp_matrix).filter(function(v){return /^past_top$|^past_botm$/ig.test(v)})
if(gold_fingers.length){
gold_fingers = gold_fingers.map(function(v){
var type = (v=="past_top") ? "top" : "bot"
return {name:v, type:type}
})
}
} }
ALL.gold_fingers = gold_fingers ALL.gold_fingers = gold_fingers
GEN.closeStep() GEN.closeStep()
...@@ -899,7 +907,7 @@ try { ...@@ -899,7 +907,7 @@ try {
GEN.COM("clip_area_end,layers_mode=layer_name,layer="+tmp_area_layer+",area=profile,area_type=rectangle,inout=outside,contour_cut=yes,margin=0,feat_types=line\;pad\;surface\;arc\;text") GEN.COM("clip_area_end,layers_mode=layer_name,layer="+tmp_area_layer+",area=profile,area_type=rectangle,inout=outside,contour_cut=yes,margin=0,feat_types=line\;pad\;surface\;arc\;text")
// var tmp_info = GEN.copperArea({layer1:tmp_gold_info[layer_gold_type],resolution_value:1}) // var tmp_info = GEN.copperArea({layer1:tmp_gold_info[layer_gold_type],resolution_value:1})
// var tmp_info = GEN.exposedArea({layer1:item.signalL,mask1:tmp_gold_info[layer_gold_type],resolution_value:1}) // var tmp_info = GEN.exposedArea({layer1:item.signalL,mask1:tmp_gold_info[layer_gold_type],resolution_value:1})
var tmp_info = GEN.exposedArea({mask1:item.signalL,layer1:tmp_gold_info[layer_gold_type],resolution_value:1}) var tmp_info = GEN.exposedArea({layer1:item.signalL,mask1:tmp_gold_info[layer_gold_type],resolution_value:1})
var tmp_data = {} var tmp_data = {}
if(layer_gold_type == "top") { if(layer_gold_type == "top") {
tmp_data.sf_area_ref_layer_front = tmp_gold_info[layer_gold_type] tmp_data.sf_area_ref_layer_front = tmp_gold_info[layer_gold_type]
...@@ -925,7 +933,7 @@ try { ...@@ -925,7 +933,7 @@ try {
} }
if(item.solderL){ if(item.solderL){
// var tmp_info = GEN.copperArea({layer1:item.solderL,resolution_value:1}) // var tmp_info = GEN.copperArea({layer1:item.solderL,resolution_value:1})
var tmp_info = GEN.exposedArea({mask1:item.signalL,layer1:item.solderL,resolution_value:1}) var tmp_info = GEN.exposedArea({layer1:item.signalL,mask1:item.solderL,resolution_value:1})
// var tmp_info = GEN.exposedArea({layer1:item.signalL,mask1:item.solderL,resolution_value:1}) // var tmp_info = GEN.exposedArea({layer1:item.signalL,mask1:item.solderL,resolution_value:1})
// {"area":"0.73817","percent":"8.986"} // {"area":"0.73817","percent":"8.986"}
var tmp_area = tmp_info.area var tmp_area = tmp_info.area
...@@ -940,7 +948,7 @@ try { ...@@ -940,7 +948,7 @@ try {
layer: item.signalL, layer: item.signalL,
layerinfohash: { layerinfohash: {
ref_layer: item.solderL, ref_layer: item.solderL,
exposed_area: (tmp_area * 1.1 * 645.16 / 10000).toFixed(4) exposed_area: (tmp_area * 645.16 / 10000).toFixed(4)
} }
}) })
} }
...@@ -1962,27 +1970,26 @@ function analysis(props){ ...@@ -1962,27 +1970,26 @@ function analysis(props){
return "_todo" return "_todo"
} }
T_m_p.prototype.analysis_gold_finger = function(){ // T_m_p.prototype.analysis_gold_finger = function(){ //
if(!ALL.gold_fingers){return "no"} return "no"
return ALL.gold_fingers.length > 0 ? "yes" : "no"
} }
T_m_p.prototype.analysis_glod_finger_area = function(){ // T_m_p.prototype.analysis_glod_finger_area = function(){ //
if(ALL.gold_fingers.length > 0){ // if(ALL.gold_fingers.length > 0){
GEN.openStep({job:this.job, name:this.pcs_step}) // GEN.openStep({job:this.job, name:this.pcs_step})
var gold_finger_area = {} // var gold_finger_area = {}
var res = 0; // var res = 0;
ALL.gold_fingers.forEach(function(item){ // ALL.gold_fingers.forEach(function(item){
var tmp = GEN.copperArea({layer1:item.name,resolution_value:1}).percent // var tmp = GEN.copperArea({layer1:item.name,resolution_value:1}).percent
res += Number(tmp) // res += Number(tmp)
// var tmp = GEN.copperArea({layer1:item.name}).percent + "%" // // var tmp = GEN.copperArea({layer1:item.name}).percent + "%"
// var key = item.type == "top" ? "sf_area_gold_area_front" : "sf_area_gold_area_back" // // var key = item.type == "top" ? "sf_area_gold_area_front" : "sf_area_gold_area_back"
// gold_finger_area[key] = tmp // // gold_finger_area[key] = tmp
}) // })
GEN.closeStep() // GEN.closeStep()
if(res){ // if(res){
return String(res.toFixed(4)) + "%" // return String(res.toFixed(4)) + "%"
} // }
} // }
return "_todo" return "_todo"
} }
T_m_p.prototype.analysis_ATS_sm_side = function(){ // 检查防焊层所在面次 T_m_p.prototype.analysis_ATS_sm_side = function(){ // 检查防焊层所在面次
......
ats/topcam/ATS_AIM_data_format.js
View file @ 09227f67
...@@ -424,9 +424,10 @@ try { ...@@ -424,9 +424,10 @@ try {
GEN.workLayer({name:"outline",display_number:2,clear_before:'yes'}) GEN.workLayer({name:"outline",display_number:2,clear_before:'yes'})
GEN.selAllFeat() GEN.selAllFeat()
if(GEN.getSelectCount() > 0) { if(GEN.getSelectCount() > 0) {
// GEN.COM("sel_create_profile,create_profile_with_holes=no") // GEN.COM("sel_create_profile,create_profile_with_holes=no");
// cutting data // if(!hasProfle({job:job, step:tmp_step})){
createOutline({job:job, step:tmp_step, profileRule:["^outline$"]}) createOutline({job:job, step:tmp_step, profileRule:["^outline$"]});
// }
} }
else { createOutline({job:job, step:tmp_step, profileRule:profileRule}) } else { createOutline({job:job, step:tmp_step, profileRule:profileRule}) }
} else { } else {
...@@ -439,10 +440,10 @@ try { ...@@ -439,10 +440,10 @@ try {
GEN.workLayer({name:"outline",display_number:2,clear_before:'yes'}) GEN.workLayer({name:"outline",display_number:2,clear_before:'yes'})
GEN.selAllFeat() GEN.selAllFeat()
if(GEN.getSelectCount() > 0) { if(GEN.getSelectCount() > 0) {
GEN.COM("sel_create_profile,create_profile_with_holes=no"); // GEN.COM("sel_create_profile,create_profile_with_holes=no");
if(!hasProfle({job:job, step:tmp_step})){ // if(!hasProfle({job:job, step:tmp_step})){
createOutline({job:job, step:tmp_step, profileRule:["^outline$"]}) createOutline({job:job, step:tmp_step, profileRule:["^outline$"]})
} // }
} }
else { createOutline({job:job, step:tmp_step, profileRule:profileRule}) } else { createOutline({job:job, step:tmp_step, profileRule:profileRule}) }
} else if (contours.length) { } else if (contours.length) {
...@@ -459,7 +460,15 @@ try { ...@@ -459,7 +460,15 @@ try {
GEN.selAllFeat() GEN.selAllFeat()
if(GEN.getSelectCount() > 0) { GEN.COM("sel_create_profile,create_profile_with_holes=no") } if(GEN.getSelectCount() > 0) { GEN.COM("sel_create_profile,create_profile_with_holes=no") }
} else if(all_layer.indexOf("array") >= 0) { } else if(all_layer.indexOf("array") >= 0) {
GEN.workLayer({name:"array",display_number:2,clear_before:'yes'})
GEN.selAllFeat()
if(GEN.getSelectCount() > 0) {
// GEN.COM("sel_create_profile,create_profile_with_holes=no");
// if(!hasProfle({job:job, step:tmp_step})){
createOutline({job:job, step:tmp_step, profileRule:["^array$"]}) createOutline({job:job, step:tmp_step, profileRule:["^array$"]})
// }
}
else { createOutline({job:job, step:tmp_step, profileRule:profileRule}) }
}else if(all_layer.indexOf("top") >= 0) { }else if(all_layer.indexOf("top") >= 0) {
GEN.selClearFeature() GEN.selClearFeature()
GEN.workLayer({name:"top",display_number:2,clear_before:'yes'}) GEN.workLayer({name:"top",display_number:2,clear_before:'yes'})
...@@ -501,7 +510,10 @@ try { ...@@ -501,7 +510,10 @@ try {
if(GEN.GEN_TYPE == "genesis"){ if(GEN.GEN_TYPE == "genesis"){
GEN.selCreateProfile() GEN.selCreateProfile()
} else { } else {
GEN.COM("sel_create_profile,create_profile_with_holes=no") // GEN.COM("sel_create_profile,create_profile_with_holes=no")
// if(!hasProfle({job:job, step:tmp_step})){
createOutline({job:job, step:tmp_step, profileRule:["^outline$"]})
// }
} }
} }
} }
...@@ -1173,5 +1185,5 @@ function sendEmail(msg) { ...@@ -1173,5 +1185,5 @@ function sendEmail(msg) {
function hasProfle(props) { function hasProfle(props) {
var now_profile = GEN.getProfile({job:props.job, step:props.step}) var now_profile = GEN.getProfile({job:props.job, step:props.step})
return now_profile.match(/\n/ig).length != 1 return now_profile && now_profile.match(/\n/ig) && now_profile.match(/\n/ig).length != 1
} }
\ No newline at end of file
ats/topcam/ATS_AIM_data_input.js
View file @ 09227f67
...@@ -229,7 +229,9 @@ try { ...@@ -229,7 +229,9 @@ try {
throw "file error"} throw "file error"}
var importOk = false; // 是否成功导入 var importOk = false; // 是否成功导入
script_info({ progress: 10 }) script_info({ progress: 10 });
script_info({ result_severity: "ok" })
if(/odb/ig.test(jobInfo.type)){ // odb导入 if(/odb/ig.test(jobInfo.type)){ // odb导入
script_info({ msg: "Import odb++", result_severity:"error" }); script_info({ msg: "Import odb++", result_severity:"error" });
global._ERRORMAG = "Fail to import odb++"; global._ERRORMAG = "Fail to import odb++";
...@@ -310,8 +312,38 @@ try { ...@@ -310,8 +312,38 @@ try {
if(/gerber/ig.test(jobInfo.type)){ // gerber导入 if(/gerber/ig.test(jobInfo.type)){ // gerber导入
script_info({ msg: "Import gerber", result_severity:"error" }); script_info({ msg: "Import gerber", result_severity:"error" });
global._ERRORMAG = "Fail to import gerber"; global._ERRORMAG = "Fail to import gerber";
GEN.createJob({name:job,db:custCfg.db}) GEN.createJob({name:job,db:custCfg.db});
GEN.createStep({job:job,name:step}) // GEN.COM("new_job,name="+job+",db="+custCfg.db+",customer=,disp_name=,notes=,attributes=")
GEN.createStep({job:job,name:step});
// GEN.renameStep({job:job,name:'org',new_name:'cad'})
// GEN.COM("disp_on")
// GEN.COM("origin_on")
// GEN.COM("check_inout,mode=out,type=job,job="+job)
// GEN.COM("check_inout,mode=out,type=job,job="+job)
// GEN.COM("open_job,job="+job+",open_win=yes,disk_map=,job_map=")
// GEN.COM("check_inout,job="+job+",mode=out,ent_type=job")
// GEN.AUX("set_group,group=99")
// GEN.COM("set_step,name=org")
// GEN.COM("open_group,job="+job+",step=org,is_sym=no")
// GEN.AUX("set_group,group=0")
// GEN.COM("open_entity,job="+job+",type=step,name=org,iconic=no")
// GEN.COM("set_subsystem,name=ReadIn")
// GEN.COM("input_create,path=/incam_db/"+custCfg.db+"/jobs/"+job+"/input")
// GEN.COM("open_job,job="+job+",open_win=yes,disk_map=,job_map=")
// GEN.COM("disp_on")
// GEN.COM("origin_on")
// GEN.COM("disp_on")
// GEN.COM("origin_on")
// GEN.COM("create_entity,job="+job+",name="+step+",db=,is_fw=no,type=step,fw_type=form")
// GEN.COM("disp_on")
// GEN.COM("origin_on")
// GEN.COM("disp_on")
// GEN.COM("origin_on")
// GEN.COM("show_tab,tab=Script,show=yes")
jobInfo.data = jobInfo.data.filter(function(v){
return v.format
})
var gerberInfo = jobInfo.data.map(function(item){ var gerberInfo = jobInfo.data.map(function(item){
var gerberCfg = JSON.parse(JSON.stringify(item.format)); var gerberCfg = JSON.parse(JSON.stringify(item.format));
var file = item.file var file = item.file
...@@ -347,6 +379,8 @@ try { ...@@ -347,6 +379,8 @@ try {
} }
if(!importOk){ throw "import error"} if(!importOk){ throw "import error"}
script_info({ progress: 20 }) script_info({ progress: 20 })
script_info({ result_severity: "ok" })
global._ERRORMAG = null; global._ERRORMAG = null;
reNameStep(job) reNameStep(job)
if(/2171/.test(par.customer)){ if(/2171/.test(par.customer)){
...@@ -401,6 +435,8 @@ try { ...@@ -401,6 +435,8 @@ try {
// name type date user // name type date user
resultData.push({type: "info",title:"导入资料列表",detail: [{ desc: import_html }] }) resultData.push({type: "info",title:"导入资料列表",detail: [{ desc: import_html }] })
script_info({ msg: "Data Readin" }) script_info({ msg: "Data Readin" })
script_info({ result_severity: "ok" })
if (mode === "aimdfm") { if (mode === "aimdfm") {
$.QDfm.updateRow({ $.QDfm.updateRow({
table: "pdm_aimdfm_task", table: "pdm_aimdfm_task",
...@@ -610,7 +646,7 @@ function decompression(path, zips) { ...@@ -610,7 +646,7 @@ function decompression(path, zips) {
var files = fs.listDir(path) var files = fs.listDir(path)
var count = 0; var count = 0;
var zipfiles = files.filter(function(item){ var zipfiles = files.filter(function(item){
if (item.suffix == "zip" || item.suffix == "rar" || item.suffix=="7z" || item.suffix == "ZIP") { if (/zip/ig.test(item.suffix) || item.suffix == "rar" || item.suffix=="7z" || item.suffix == "ZIP") {
inputState.push(item.suffix); inputState.push(item.suffix);
console.log("--->path:" + item.path) console.log("--->path:" + item.path)
if(zips.indexOf(item.path) < 0){ if(zips.indexOf(item.path) < 0){
...@@ -621,7 +657,7 @@ function decompression(path, zips) { ...@@ -621,7 +657,7 @@ function decompression(path, zips) {
fs.rename(item.path, item.dir + "/" + mvname); fs.rename(item.path, item.dir + "/" + mvname);
item.path = item.dir + "/" + mvname item.path = item.dir + "/" + mvname
} }
var dir_name = item.path.replace(/\.(zip|7z|rar)$/ig, ""); var dir_name = item.path.replace(/\.(zipx|zip|7z|rar)$/ig, "");
autoUn(item.path, dir_name); autoUn(item.path, dir_name);
return true return true
} }
...@@ -678,12 +714,14 @@ function changePath2(filePath){ ...@@ -678,12 +714,14 @@ function changePath2(filePath){
tmp.push(obj); tmp.push(obj);
} }
} }
var list = [];
for(var i = tmp.length-1;i>=0;i--){ for(var i = tmp.length-1;i>=0;i--){
var newFileName = tmp[i].fileName.replace(/\s*/g,'');//去除文件名中空格 var newFileName = tmp[i].fileName.replace(/\s*/g,'');//去除文件名中空格
newFileName = newFileName.replace(/\?/g,'');//去除文件名中? newFileName = newFileName.replace(/\?/g,'');//去除文件名中?
var newPath = tmp[i].path.replace(/^(.*)\/[^\/]*$/,"$1"); var newPath = tmp[i].path.replace(/^(.*)\/[^\/]*$/,"$1");
var file = fs.rename(tmp[i].path,newPath+'/'+newFileName); if(tmp[i].path != (newPath+'/'+newFileName)){
list.push(file); fs.rmdir(newPath+'/'+newFileName)
fs.rename(tmp[i].path,newPath+'/'+newFileName);
}
} }
} }
\ No newline at end of file
ats/topcam/config_ats.js
View file @ 09227f67
...@@ -603,15 +603,15 @@ ...@@ -603,15 +603,15 @@
{"orig_name" : ["^pm_bot","spps\\.gbr$|paste.sec|secpaste|solderpaste_bottom","spst\\.art|spb\\.art","assy[_-]?bott?o?m?\\.art","past_bot","paste_bot|spb"], "tl_name" : "past_botm" }, {"orig_name" : ["^pm_bot","spps\\.gbr$|paste.sec|secpaste|solderpaste_bottom","spst\\.art|spb\\.art","assy[_-]?bott?o?m?\\.art","past_bot","paste_bot|spb"], "tl_name" : "past_botm" },
{"orig_name" : ["silk.pri","pleg\\.art|sst\\.art","^ss_top|sscs\\.gbr$","silk_top|sst"], "tl_name" : "silk_top" }, {"orig_name" : ["silk.pri","pleg\\.art|sst\\.art","^ss_top|sscs\\.gbr$","silk_top|sst"], "tl_name" : "silk_top" },
{"orig_name" : ["silk.sec","sleg\\.art|ssb\\.art","^ss_bot|ssps\\.gbr$","silk_bot|ssb"], "tl_name" : "silk_bot" }, {"orig_name" : ["silk.sec","sleg\\.art|ssb\\.art","^ss_bot|ssps\\.gbr$","silk_bot|ssb"], "tl_name" : "silk_bot" },
{"orig_name" : ["\\.st$|\\.tsm$|soldermask_top","mask.top\\.art|smt\\.art","mask.pri\\.art|smcs\\.gbr$","psm\\.art","sm_top|smt"], "tl_name" : "sm_top" }, {"orig_name" : ["^tm\\.art$|\\.st$|\\.tsm$|soldermask_top","mask.top\\.art|smt\\.art","mask.pri\\.art|smcs\\.gbr$","psm\\.art","sm_top|^smt"], "tl_name" : "sm_top" },
{"orig_name" : ["\\.sb$|\\.bsm$|soldermask_bottom","mask.bot\\.art|smb\\.art","mask.sec\\.art|smps\\.gbr$","ssm\\.art","sm_bot|smb"], "tl_name" : "sm_botm" }, {"orig_name" : ["^bm\\.art$|\\.sb$|\\.bsm$|soldermask_bottom","mask.bot\\.art|smb\\.art","mask.sec\\.art|smps\\.gbr$","ssm\\.art","sm_bot|^smb"], "tl_name" : "sm_botm" },
{"orig_name" : ["^(?:(?!assy|enig|pm|past|ss|silk|sm|soldermask).)+_top\.art$","^top$","^top.art$"], "tl_name" : "top" }, {"orig_name" : ["^(?:(?!assy|enig|pm|past|ss|silk|sm|soldermask).)+_top\.art$","^top$","^top.art$"], "tl_name" : "top" },
{"orig_name" : ["^(?:(?!assy|enig|pm|past|ss|silk|sm|soldermask).)+_bottom\.art$","^bot\\.art$","^bottom$","^bottom\\.art$"], "tl_name" : "bottom" }, {"orig_name" : ["^(?:(?!assy|enig|pm|past|ss|silk|sm|soldermask).)+_bottom\.art$","^bot\\.art$","^bottom$","^bottom\\.art$"], "tl_name" : "bottom" },
{"orig_name" : ["int(\\d+)\\.art"], "tl_name" : "l_($1+1)"}, {"orig_name" : ["int(\\d+)\\.art"], "tl_name" : "l_($1+1)"},
{"orig_name" : ["^(?:signal|plane|layer)_(\\d+)$","^l(\\d+)$","_l(\\d+)-.{3}\\.art$","lay(\\d+)\\.art$","l(\\d+).*\\.gbr$","^0?(\\d+)[\\D].*\\.art$","\\.p(\\d+)p?$","\\.l(\\d+)$","^l(\\d+).*\\.art$","^l(\\d+)\\.art$","^0(\\d+).*ccp_ms","^s(\\d+)\\.art","laye?r?(\\d+)","layer_(\\d+)"], "tl_name" : "l_($1)"}, {"orig_name" : ["lay-(\\d+)\\.art$","^(?:signal|plane|layer)_(\\d+)$","^l(\\d+)$","_l(\\d+)-.{3}\\.art$","lay(\\d+)\\.art$","l(\\d+).*\\.gbr$","^0?(\\d+)[\\D].*\\.art$","\\.p(\\d+)p?$","\\.l(\\d+)$","^l(\\d+).*\\.art$","^l(\\d+)\\.art$","^0(\\d+).*ccp_ms","^s(\\d+)\\.art","laye?r?(\\d+)","layer_(\\d+)"], "tl_name" : "l_($1)"},
{"orig_name" : ["(\\d+)-(\\d+)-((?:(?!laser)[a-zA-Z])+)\\.drl$","\\.d(\\d+)-(\\d+)((?:(?!laser)[a-zA-Z])+)$"], "tl_name" : "d($1)-($2)-($3)"}, {"orig_name" : ["(\\d+)-(\\d+)-((?:(?!laser)[a-zA-Z])+)\\.drl$","\\.d(\\d+)-(\\d+)((?:(?!laser)[a-zA-Z])+)$"], "tl_name" : "d($1)-($2)-($3)"},
{"orig_name" : ["_l?(\\d+)_l?(\\d+)$","\\.ncd(\\d)-(\\d)$","\\.d(\\d+)-(\\d+)$","-(\\d+)-(\\d+)\\.drl$","(\\d+)-(\\d+)-laser\\.drl$","d(\\d+)-(\\d+)"], "tl_name" : "d_($1)-($2)"}, {"orig_name" : ["_l?(\\d+)_l?(\\d+)$","\\.ncd(\\d)-(\\d)$","\\.d(\\d+)-(\\d+)$","-(\\d+)-(\\d+)\\.drl$","(\\d+)-(\\d+)-laser\\.drl$","d(\\d+)-(\\d+)"], "tl_name" : "d_($1)-($2)"},
{"orig_name" : ["^drill$","\\.ncdthru$"], "tl_name" : "drill" }, {"orig_name" : ["^nth_layer$","^drill$","\\.ncdthru$"], "tl_name" : "drill" },
{"orig_name" : ["\\.rou$","^rout$"], "tl_name" : "rout" }, {"orig_name" : ["\\.rou$","^rout$"], "tl_name" : "rout" },
{"orig_name" : "fab.art", "tl_name" : "fab.art" }, {"orig_name" : "fab.art", "tl_name" : "fab.art" },
{"orig_name" : ["multipack.art","^array$"], "tl_name" : "array" }, {"orig_name" : ["multipack.art","^array$"], "tl_name" : "array" },
...@@ -833,20 +833,20 @@ ...@@ -833,20 +833,20 @@
{"orig_name" : ["^spb$|^pmb\\.art$","\\.pmb$|\\.spb$","paste.?bot|soldPasteBot|pastemask.?bot","past_botm"], "tl_name" : "past_botm" }, {"orig_name" : ["^spb$|^pmb\\.art$","\\.pmb$|\\.spb$","paste.?bot|soldPasteBot|pastemask.?bot","past_botm"], "tl_name" : "past_botm" },
{"orig_name" : ["sst|tsilk|silktop","^sst\\.art$","\\.ssa$","silkscrntop|silkscreentop","silk.top|silk-top"], "tl_name" : "silk_top" }, {"orig_name" : ["sst|tsilk|silktop","^sst\\.art$","\\.ssa$","silkscrntop|silkscreentop","silk.top|silk-top"], "tl_name" : "silk_top" },
{"orig_name" : ["ssb|bsilk|silkbot","^ssb\\.art$","\\.ssb$","silkscrnbot|silkscreenbot","silk.bot|silk-bot"], "tl_name" : "silk_bot" }, {"orig_name" : ["ssb|bsilk|silkbot","^ssb\\.art$","\\.ssb$","silkscrnbot|silkscreenbot","silk.bot|silk-bot"], "tl_name" : "silk_bot" },
{"orig_name" : ["\\.tsm$|tmask|^smt$","^smt\\.art$","\\.sma$","soldmask1top|soldermask.?top","sm.top|solder.top"], "tl_name" : "sm_top" }, {"orig_name" : ["^soldtop","\\.tsm$|tmask|^smt$|^smtop","^smt\\.art$","\\.sma$","soldmask1top|soldermask.?top","sm.top|solder.top"], "tl_name" : "sm_top" },
{"orig_name" : ["\\.bsm$|bmask|^smb$","^smb\\.art$","\\.smb$","soldmask1bot|soldermask.?bot","sm.bot|solder.bot"], "tl_name" : "sm_botm" }, {"orig_name" : ["^soldbot","\\.bsm$|bmask|^smb$|^smbot","^smb\\.art$","\\.smb$","soldmask1bot|soldermask.?bot","sm.bot|solder.bot"], "tl_name" : "sm_botm" },
{"orig_name" : ["^top\\.(pho|art)$","^(?:(?!assy|export|enig|pm|past|paste|silk|mask).)+top\\.(pho|art)$","^top$","^top\\.art$"], "tl_name" : "top" }, {"orig_name" : ["^top\\.(pho|art)$","^(?:(?!assy|export|enig|pm|past|paste|silk|mask|sm|sold).)+top\\.(pho|art)$","^top$","^top\\.art$"], "tl_name" : "top" },
{"orig_name" : ["\\.p(\\d+)p$","^m(\\d+)$","_s(\\d+)\\.art$","^(?:(?!ref).)+l(\\d+)\\.art$","-(\\d+)l\\.pho$","^l(\\d+).*\\.art$","^v(\\d+)\\.art$","^g(\\d+)\\.art$","^s(\\d+)\\.art$","\\.l(\\d+)$","Copper(\\d+)\\.ger$","^laye?r?_?(\\d+)"], "tl_name" : "l_($1)"}, {"orig_name" : ["\\.p(\\d+)p$","^m(\\d+)$","_s(\\d+)\\.art$","^(?:(?!ref).)+l(\\d+)\\.art$","-(\\d+)l\\.pho$","^l(\\d+).*\\.art$","^v(\\d+)\\.art$","^g(\\d+)\\.art$","^s(\\d+)\\.art$","\\.l(\\d+)$","Copper(\\d+)\\.ger$","^laye?r?_?(\\d+)"], "tl_name" : "l_($1)"},
{"orig_name" : ["^bottom\\.(pho|art)$","^(?:(?!assy|view|enig|pm|past|paste|silk|mask).)+bot(tom)?\\.(pho|art)$","^bot\\.art$","^bottom$","^bottom.art$"], "tl_name" : "bottom" }, {"orig_name" : ["^bottom\\.(pho|art)$","^(?:(?!assy|view|enig|pm|past|paste|silk|mask|sm|sold).)+bot(tom)?\\.(pho|art)$","^bot\\.art$","^bottom$","^bottom.art$"], "tl_name" : "bottom" },
{"orig_name" : ["\\.d(\\d+)$"], "tl_name" : "d_($1)-($1+1)"}, {"orig_name" : ["\\.d(\\d+)$"], "tl_name" : "d_($1)-($1+1)"},
{"orig_name" : ["\\.ncd(\\d+)-(\\d+)$","(\\d+)-(\\d+)plated\\.ncd","thruHolePlated_(\\d+)_(\\d+)\\.ncd","(\\d+)-(\\d+)\\.drl$","^drill(\\d+)-(\\d+)$","^d_(\\d+)-(\\d+)$"], "tl_name" : "d_($1)-($2)"}, {"orig_name" : ["\\.ncd(\\d+)-(\\d+)$","(\\d+)-(\\d+)plated\\.ncd","thruHolePlated_(\\d+)_(\\d+)\\.ncd","(\\d+)[-_](\\d+)\\.drl$","^drill(\\d+)-(\\d+)$","^d_(\\d+)-(\\d+)$"], "tl_name" : "d_($1)-($2)"},
{"orig_name" : ["\\.ncdthru$","(\\d+)-(\\d+)-np\\.drl$","ThruHoleNonPlated\\.ncd$","^drill$"], "tl_name" : "drill" }, {"orig_name" : ["\\.ncdthru$","(\\d+)-(\\d+)-np\\.drl$","ThruHoleNonPlated\\.ncd$","^drill$"], "tl_name" : "drill" },
{"orig_name" : ["\\.rou$","^rout$"], "tl_name" : "rout" }, {"orig_name" : ["\\.rou$","^rout$"], "tl_name" : "rout" },
{"orig_name" : "fab.art", "tl_name" : "fab.art" }, {"orig_name" : "fab.art", "tl_name" : "fab.art" },
{"orig_name" : ["multipack\\.art","^array$"], "tl_name" : "array" }, {"orig_name" : ["multipack\\.art","^array$"], "tl_name" : "array" },
{"orig_name" : ["p_outline\\.art","panel\\.(art|pho)$","panel-?outline\\.pho","outline\\.art$","\\.bol$","PnlContourNonPlated\\.ger","^outline"], "tl_name" : "outline" }, {"orig_name" : ["p_outline\\.art","panel\\.(art|pho)$","panel-?outline\\.pho","outline\\.art$","\\.bol$","PnlContourNonPlated\\.ger","^outline"], "tl_name" : "outline" },
{"orig_name" : ["topside-golden","top-enig","enig_top"], "tl_name" : "enig_top" }, {"orig_name" : ["gold_t","topside-golden","top-enig","enig_top"], "tl_name" : "enig_top" },
{"orig_name" : ["botside-golden","bot-enig","enig_bot"], "tl_name" : "enig_bot" }, {"orig_name" : ["gold_b","botside-golden","bot-enig","enig_bot"], "tl_name" : "enig_bot" },
], ],
"mergerule" : { "mergerule" : {
profile:["silk_top","past_top"], profile:["silk_top","past_top"],
...@@ -918,8 +918,8 @@ ...@@ -918,8 +918,8 @@
{"orig_name" : ["fab\\.art|fab\\.gbr"], "tl_name" : "fab.art" }, {"orig_name" : ["fab\\.art|fab\\.gbr"], "tl_name" : "fab.art" },
{"orig_name" : ["pcb-set\\.gdo","^pcb-set\\.pho$","^pcb-set$","^array$"], "tl_name" : "array" }, {"orig_name" : ["pcb-set\\.gdo","^pcb-set\\.pho$","^pcb-set$","^array$"], "tl_name" : "array" },
{"orig_name" : ["^outline"], "tl_name" : "outline" }, {"orig_name" : ["^outline"], "tl_name" : "outline" },
{"orig_name" : ["au[_-]mask[_-]bot","enig_top"], "tl_name" : "enig_top" }, {"orig_name" : ["au[_-]mask[_-]top","enig_top"], "tl_name" : "enig_top" },
{"orig_name" : ["au[_-]mask[_-]top","enig_bot"], "tl_name" : "enig_bot" }, {"orig_name" : ["au[_-]mask[_-]bot","enig_bot"], "tl_name" : "enig_bot" },
{"orig_name" : ["cavitytop","cavity_top"], "tl_name" : "cavity_top" }, {"orig_name" : ["cavitytop","cavity_top"], "tl_name" : "cavity_top" },
{"orig_name" : ["cavitybottom","cavity_bot"], "tl_name" : "cavity_bot" }, {"orig_name" : ["cavitybottom","cavity_bot"], "tl_name" : "cavity_bot" },
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment