scott

ats/topcam/ATS_AIM_data_format.js

@@ -439,9 +439,10 @@ try {
 					GEN.workLayer({name:"outline",display_number:2,clear_before:'yes'})
 					GEN.selAllFeat()
 					if(GEN.getSelectCount() > 0) {
-						// GEN.COM("sel_create_profile,create_profile_with_holes=no")
-						// cutting data
-						createOutline({job:job, step:tmp_step,  profileRule:["^outline$"]})
+						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$"]})
+						}
 					}
 					else { createOutline({job:job, step:tmp_step,  profileRule:profileRule}) }
 				} else if (contours.length) {  
@@ -458,9 +459,7 @@ try {
 					GEN.selAllFeat()
 					if(GEN.getSelectCount() > 0) { GEN.COM("sel_create_profile,create_profile_with_holes=no") }
 				} 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") }
+					createOutline({job:job, step:tmp_step,  profileRule:["^array$"]})
 				}else if(all_layer.indexOf("top") >= 0) {
 					GEN.selClearFeature()
 					GEN.workLayer({name:"top",display_number:2,clear_before:'yes'})
@@ -505,7 +504,7 @@ try {
 							GEN.COM("sel_create_profile,create_profile_with_holes=no")
 						}
 					}
-				}
+				} 
 				if(!hasProfle({job:job, step:tmp_step})){
 					createOutline({job:job, step:tmp_step,  profileRule:profileRule})
 				}
@@ -1027,8 +1026,7 @@ function createOutline(props){
 			return a
 		}, ["outline"])
 	}
-	
-    var tmp_outline
+    var tmp_outline;
     if(outlines.length){
         if( outlines.length){
 			for(var i =0;i<outlines.length;i++){

ats/topcam/ATS_AIM_data_input.js

@@ -230,7 +230,6 @@ try {
 	var importOk = false;  // 是否成功导入
 
 	script_info({ progress: 10 })
-
 	if(/odb/ig.test(jobInfo.type)){  // odb导入
 		script_info({ msg: "Import odb++", result_severity:"error" });
 		global._ERRORMAG = "Fail to import odb++";
@@ -683,7 +682,7 @@ function changePath2(filePath){
     for(var i = tmp.length-1;i>=0;i--){
         var newFileName = tmp[i].fileName.replace(/\s*/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);
         list.push(file);   
     }

ats/topcam/config_ats.js

@@ -829,18 +829,18 @@
 			"tl_name": [
 				{"orig_name" : ["^comp_+_top$"], "tl_name" : "comp_+_top" },
 				{"orig_name" : ["^comp_+_bot$"], "tl_name" : "comp_+_bot" },
-				{"orig_name" : ["^pmt\\.art$","\\.pma$|\\.spa$","paste.?top|soldPasteTop|pastemask.?top","past_top"], "tl_name" : "past_top" },
-				{"orig_name" : ["^pmb\\.art$","\\.pmb$|\\.spb$","paste.?bot|soldPasteBot|pastemask.?bot","past_botm"], "tl_name" : "past_botm" },
-				{"orig_name" : ["tsilk|silktop","^sst\\.art$","\\.ssa$","silkscrntop|silkscreentop","silk.top|silk-top"], "tl_name" : "silk_top" },
-				{"orig_name" : ["bsilk|silkbot","^ssb\\.art$","\\.ssb$","silkscrnbot|silkscreenbot","silk.bot|silk-bot"], "tl_name" : "silk_bot" },
-				{"orig_name" : ["tmask","^smt\\.art$","\\.sma$","soldmask1top|soldermask.?top","sm.top|solder.top"], "tl_name" : "sm_top" },
-				{"orig_name" : ["bmask","^smb\\.art$","\\.smb$","soldmask1bot|soldermask.?bot","sm.bot|solder.bot"], "tl_name" : "sm_botm" },
+				{"orig_name" : ["^spt$|^pmt\\.art$","\\.pma$|\\.spa$","paste.?top|soldPasteTop|pastemask.?top","past_top"], "tl_name" : "past_top" },
+				{"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" : ["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" : ["\\.bsm$|bmask|^smb$","^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" : ["_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" : ["\\.d(\\d+)$"], "tl_name" : "d_($1)-($1+1)"},
-				{"orig_name" : ["(\\d+)-(\\d+)plated\\.ncd","thruHolePlated_(\\d+)_(\\d+)\\.ncd","(\\d+)-(\\d+)\\.drl$","^drill(\\d+)-(\\d+)$","^d_(\\d+)-(\\d+)$"], "tl_name" : "d_($1)-($2)"},
-				{"orig_name" : ["(\\d+)-(\\d+)-np\\.drl$","ThruHoleNonPlated\\.ncd$","^drill$"], "tl_name" : "drill" },
+				{"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" : ["\\.rou$","^rout$"], "tl_name" : "rout" },
 				{"orig_name" : "fab.art", "tl_name" : "fab.art" },
 				{"orig_name" : ["multipack\\.art","^array$"], "tl_name" : "array" },
@@ -878,7 +878,7 @@
 				{
 					"valid": function(props){
 						var file = props.file;
-						return /\.gbr$|\.gdo$|\.pho$|^line$|^ftdrill/ig.test(file.name)
+						return /\.pho|\.gbr$|\.gdo$|\.pho$|^line$|^ftdrill/ig.test(file.name)
 					},  
 					"type": "Gerber274x",		
 					"format": "Gerber274x_4"