Merge branch 'master' of http://gitlab.topibd.net/scott.sun/scott

config_ats.js

@@ -267,6 +267,8 @@
 				}
 			],
 			"tl_name": [
+				{"orig_name" : ["top_enig"], "tl_name" : "top_enig" }, 
+				{"orig_name" : ["bot_enig"], "tl_name" : "bot_enig" }, 
 				{"orig_name" : ["^spt$","^past_top$"], "tl_name" : "past_top" }, 
 				{"orig_name" : ["^spb$","^past_botm$"], "tl_name" : "past_botm" },
 				{"orig_name" : ["^sst$","^silk_top$"], "tl_name" : "silk_top" },
@@ -547,6 +549,7 @@
 		}
 	},
 	"data_format": [
+		{"tl_name":"top_enig" , "new_name":"top_enig" , "attr":{ "context":"board", "type":"mixed" }},
 		{"tl_name":"past_top" , "new_name":"past_top" , "attr":{ "context":"board", "type":"solder_paste" }},
 		{"tl_name":"silk_top" , "new_name":"silk_top" , "attr":{ "context":"board", "type":"silk_screen" }},
 		{"tl_name":"sm_top" , "new_name":"sm_top" , "attr":{ "context":"board", "type":"solder_mask" }},
@@ -556,6 +559,7 @@
 		{"tl_name":"sm_botm" , "new_name":"sm_botm" , "attr":{ "context":"board", "type":"solder_mask" }},
 		{"tl_name":"silk_bot" , "new_name":"silk_bot" , "attr":{ "context":"board", "type":"silk_screen" }},
 		{"tl_name":"past_botm" , "new_name":"past_botm" , "attr":{ "context":"board", "type":"solder_paste" }},
+		{"tl_name":"bot_enig" , "new_name":"bot_enig" , "attr":{ "context":"board", "type":"mixed" }},
 		{"tl_name":"d_(\\d+)-(\\d+)","new_name":"d($1)-($2)" ,"attr":{"context":"board","type":"drill"}},
 		{"tl_name":"drill","new_name":"drill" ,"attr":{"context":"board","type":"drill"}},
 		{"tl_name":"rout","new_name":"rout" ,"attr":{"context":"board","type":"rout"}},

test/scott_test.js

@@ -62,17 +62,34 @@ try {
     if(!GEN.isJobExists({job:job})){ throw "job "+ job+ " is not exist" }
     if(!GEN.isJobOpen({job:job})){GEN.openJob({job:job})}
     
-
 	var matrix = GEN.getMatrix({job:job})
-	var signalLayers = Object.keys(matrix).filter(function(v){return matrix[v].layer_type == "signal"})
+	var signalLayers = Object.keys(matrix).filter(function(v){
+		var val = matrix[v]
+		return val.layer_type == "signal" && val.context == "board"
+	})
 	var step = "cad"
 	GEN.openStep({job:job, name:step})
     var copper_percent_pcs = signalLayers.map(function(v){
 		var tmp = {layer:v}
-		tmp.copper_percent = GEN.copperArea({layer1:v}).percent + "%"
+		tmp.card_copper_distribution = GEN.copperArea({layer1:v}).percent + "%"
+		return tmp
+	})
+
+    console.log("==================================>card copper_percent_pcs:"+_.toString(copper_percent_pcs))
+
+	var arr_step = "stp"
+	GEN.openStep({job:job, name:arr_step})
+
+    var copper_percent_stp = signalLayers.map(function(v){
+		var tmp = {layer:v}
+		tmp.array_copper_distribution = GEN.copperArea({layer1:v}).percent + "%"
 		return tmp
 	})
-    console.log("==================================>copper_percent_pcs:"+_.toString(copper_percent_pcs))
+	
+    console.log("==================================>card copper_percent_stp:"+_.toString(copper_percent_stp))
+
+
+
 
     QDfm.updateRow({
 		table: "pdm_aimdfm_task",