s

ats/scott_test/analysis_test.js

@@ -1862,7 +1862,10 @@ function min_symbols_anal(props){  // 分析最 symbols
     var tmp_layer = layer.signalL + "_tmp_1"
     selCopyLayer({job:job,layer:tmp_layer})
     // 留下pitch最小的bga 如果pitch都一样大 就跳过
-    res.min_bga_pitch = (bgaPitch({job:job,step:step,layer:tmp_layer})-0) + (symbols.size-0)
+    var min_pitch = bgaPitch({job:job,step:step,layer:tmp_layer})
+    if(min_pitch){
+        res.min_bga_pitch = (min_pitch-0) + (symbols.size-0)
+    }
     // 分析数据
     GEN.clearLayers()
     // 尺寸
@@ -2066,9 +2069,6 @@ function bgaPitch(props){
     var job = props.job
     var step = props.step
     var layer = props.layer
-
-    
-
     var ck = "tmp_chk"
     if(GEN.isChklistExists({job:job,step:step,chklist:ck})){
         GEN.COM("chklist_delete", { chklist: ck })
@@ -2133,17 +2133,18 @@ function bgaPitch(props){
     //     // todo 如何找到线距离最小的pad 删除其他的
     // }
     var features = GEN.getFeatures({job:job,step:step,layer:tmp_layer})
-    console.log("---------features:", _.toString(features))
+    if(features && features.length){
         var tmp = features.map(function(v){
             var num = Math.sqrt((v.xe-v.xs)*(v.xe-v.xs) + (v.ye-v.ys)*(v.ye-v.ys))*1000
             return num.toFixed(4)
         })
         var res = tmp.sort(function(a,b){return a-b})[0]
+        return res
+    }
     GEN.deleteLayer({job:job,layer:tmp_layer})
     GEN.deleteLayer({job:job,layer:tmp_layer1})
     GEN.deleteLayer({job:job,layer:tmp_layer2})
     // 矩阵
-    return res
 }
 
 

ats/scott_test/format_test.js

@@ -301,7 +301,7 @@ function setDrill(props){   // 设置钻孔
 	}
     function doDrill(drills){  // 分析钻孔层
         return drills.map(function(v){
-            if(v.name == "drill" || v.name=="rout" || v.name=="outline"){
+            if(v.tl_name == "drill" || v.tl_name=="rout" || v.tl_name=="outline"){
                 return {start:findSignal(1), end:findSignal(layerCount), layer:v.name}
             } else {
                 var tmp = /(\d+)-(\d+)/ig.exec(v.tl_name);

config_ats.js

@@ -802,20 +802,22 @@
 				}
 			],
 			"tl_name": [
-				{"orig_name" : ["assytop.art","past_top"], "tl_name" : "past_top" },
-				{"orig_name" : ["assybot.art","past_botm"], "tl_name" : "past_botm" },
-				{"orig_name" : ["pleg.art","^ss_top","silk_top"], "tl_name" : "silk_top" },
-				{"orig_name" : ["sleg.art","^ss_bot","silk_bot"], "tl_name" : "silk_bot" },
-				{"orig_name" : ["ssm.art","sm_top"], "tl_name" : "sm_top" },
-				{"orig_name" : ["psm.art","sm_bot"], "tl_name" : "sm_botm" },
+				{"orig_name" : ["SoldPasteTop\.ger","past_top"], "tl_name" : "past_top" },
+				{"orig_name" : ["SoldPasteBot\.ger","past_botm"], "tl_name" : "past_botm" },
+				{"orig_name" : ["^smt\.art$","\.ssa$","SilkScrnTop\.ger","silk_top"], "tl_name" : "silk_top" },
+				{"orig_name" : ["^smb\.art$","\.ssb$","SilkScrnBot\.ger","silk_bot"], "tl_name" : "silk_bot" },
+				{"orig_name" : ["\.sma$","SoldMask1Top\.ger","sm_top"], "tl_name" : "sm_top" },
+				{"orig_name" : ["\.smb$","SoldMask1Bot\.ger","sm_bot"], "tl_name" : "sm_botm" },
 				{"orig_name" : ["^top$","^top.art$"], "tl_name" : "top" },
-				{"orig_name" : ["^0(\\d+).*ccp_ms","^s(\\d+)\.art","lay(\\d+)\\.art","layer_(\\d+)"], "tl_name" : "l_($1)"},
+				{"orig_name" : ["^s(\\d+)\.art$","\.l(\\d+)$","Copper(\\d+)\.ger$","^layer_(\\d+)"], "tl_name" : "l_($1)"},
 				{"orig_name" : ["^bottom$","^bottom.art$"], "tl_name" : "bottom" },
-				{"orig_name" : ["-(\\d+)-(\\d+)\.drl$","(\\d+)-(\\d+)-laser\.drl$","d(\\d+)-(\\d+)"], "tl_name" : "d_($1)-($2)"},
+				{"orig_name" : ["\.d(\\d+)$"], "tl_name" : "d_($1)-($1+1)"},
+				{"orig_name" : ["ThruHolePlated_(\\d+)_(\\d+)\.ncd$","d(\\d+)-(\\d+)"], "tl_name" : "d_($1)-($2)"},
+				{"orig_name" : ["ThruHoleNonPlated\.ncd$","^drill$"], "tl_name" : "drill" },
 				{"orig_name" : ["\\.rou$","^rout$"], "tl_name" : "rout" },
 				{"orig_name" : "fab.art", "tl_name" : "fab.art" },
 				{"orig_name" : ["multipack.art","^array$"], "tl_name" : "array" },
-				{"orig_name" : ["^outline"], "tl_name" : "outline" },
+				{"orig_name" : ["PnlContourNonPlated\.ger","^outline"], "tl_name" : "outline" },
 				{"orig_name" : ["top-enig","enig_top"], "tl_name" : "enig_top" },
 				{"orig_name" : ["bot-enig","enig_bot"], "tl_name" : "enig_bot" },
 			]