s

src/cam_workflow/ZDA_10Export_drl.js

@@ -113,12 +113,13 @@ var default_par = {
 for(var key in default_par){ if (!par.hasOwnProperty(key) || par[key] == ""){ par[key] = default_par[key] }}
 var job = Job;
 var info = {};
-var new_name = "new_test";
+var new_name = job;
 if(!fs.exists(par.out_dir)){
 	IKM.msg("导出路径不存在");
 	return "Canel"
 }
 par.out_dir += '/' + new_name;
+var outDir = par.out_dir
 fs.mkdir(par.out_dir);
 var Step;
 try {
@@ -155,7 +156,8 @@ try {
 		PAR.profile_limits.xc = PAR.profile_limits.xsize/2-Math.abs(PAR.profile_limits.xmin);
 		PAR.profile_limits.yc = PAR.profile_limits.ysize/2-Math.abs(PAR.profile_limits.ymin);
 		PAR.sr = GEN.getSRLimits({job:job,step:step,units:'mm'});
-		
+		par.out_dir = outDir + "/" + step;
+		fs.mkdir(par.out_dir) 
 		work_layers.forEach(function(layer){
 			//钻孔输出
 			var output_layer = job+'-'+layer+'-ori';   // Job.'-'.$layer.'-ori'
@@ -171,7 +173,7 @@ try {
 			// 分割文件内容
 			edit_nc_file({layer:layer,output_file:PAR.out_dir+'/'+output_layer,new_file:new_file,x:PAR.scale[layer].x,y:PAR.scale[layer].y});//drl_type:$drl_type
 			//删除钻孔输出的临时文件
-			// fs.unlink(PAR.out_dir+'/'+output_layer);
+			fs.unlink(PAR.out_dir+'/'+output_layer);
 			//回读钻孔程式
 			if( PAR.reread_layer =~ /yes/i){
 				var new_layer_2 = new_layer;
@@ -179,8 +181,6 @@ try {
 			}
 		})
 
-
-
 	})
 	
 	// 保存 
@@ -538,20 +538,26 @@ function convert_new_program(info){
 	})
 
 	head_tmp.sort(function(a,b){
-		var a_tmp_value = (a.value==2.1 || a.value==0.7) ? -a.value : a.value;
-		var b_tmp_value = (b.value==2.1 || b.value==0.7) ? -b.value : b.value;
+		var a_tmp_value = (Math.abs(a.value-3.176)<=0.001 || Math.abs(a.value-3.151)<=0.001 || Math.abs(a.value-0.699)<=0.001) ? -a.value : a.value;
+		var b_tmp_value = (Math.abs(a.value-3.176)<=0.001 || Math.abs(a.value-3.151)<=0.001 || Math.abs(a.value-0.699)<=0.001) ? -b.value : b.value;
+        if(a_tmp_value >= 0){
             if(/\.\d\d1$/.test(a_tmp_value)){
                 a_tmp_value = a_tmp_value + 10000;
             }
-		if(/\.\d\d1$/.test(b_tmp_value)){
-			b_tmp_value = b_tmp_value + 10000;
-		}
             if(/\.\d\d2$/.test(a_tmp_value)){
                 a_tmp_value = a_tmp_value + 20000;
             }
+        }
+        if(b_tmp_value >= 0){
+            if(/\.\d\d1$/.test(b_tmp_value)){
+                b_tmp_value = b_tmp_value + 10000;
+            }
+            
             if(/\.\d\d2$/.test(b_tmp_value)){
                 b_tmp_value = b_tmp_value + 20000;
             }
+        }
+		
 		return a_tmp_value - b_tmp_value;
 	})
 	head_tmp = head_tmp.map(function(v){return v.name})

src/cam_workflow/ZDA_10Export_gerber.js

@@ -93,8 +93,6 @@ try {
 		var reg = new RegExp(par.step,"ig")
 		return reg.test(step)
 	})
-
-
 	var matrix = GEN.getMatrix({job:job});
 	stepList.forEach(function(step){
 		var excellon = [];
@@ -102,13 +100,16 @@ try {
 		fs.mkdir(par.export_path + "/" + step)
 		for (var key in matrix) {
 			var info = matrix[key];
-			if(!GEN.isLayerEmpty({job:job,step:step,layer:key})){
+			GEN.workLayer({name:key,display_number:2,clear_before:'yes'})
+			GEN.selAllFeat()
+			if(GEN.getSelectCount() > 0){
 				if(info.layer_type == "drill"){
 					excellon.push(key)
 				} else {
 					gerber.push(key)
 				}
 			}
+			GEN.selClearFeature()
 		}
 		if(gerber.length){
 			GEN.COM("output_layer_reset")