jtg

jtg/JTG_NET_set_drill_attribute_aim.js

@@ -125,12 +125,19 @@ try {
 			var layerSymsHist = GEN.getLayerSymsHist({job:job,step:step,layer:layer});
 			var via_symbol = Object.keys(layerSymsHist).map(function(v){return layerSymsHist[v]})
 			via_symbol = via_symbol.filter(function(item){
+				if(!item.size && item.width){
+					var max_tmp = item.width > item.height ? item.width : item.height
+					item.size = max_tmp
+				}
+				if(!item.size){item.size = 0}
 				return Number(item.size) <= max_via_size
 			})
 			// 排除少于min_via_num数量的钻孔
 			via_symbol = via_symbol.filter(function(item){
+				if(item.pad == 0){return false}
 				return item.pad >= Number(par.min_via_num)
 			})
+			console.log("via_symbols================================:"+_.toString(via_symbol))
 			if(via_symbol.length){
 				// 如果via_symbol存在
 				GEN.selClearFeature()
@@ -222,8 +229,11 @@ try {
 				GEN.workLayer({name:layer,display_number:2,clear_before:'yes'})
 				GEN.selRefFeat({layers:layer_tmp,use:'filter',mode:'touch'})
 				// 设置选中的via孔属性
-				GEN.selAddAttr({attribute:'.drill',option:'via'})
-				GEN.selClearFeature()
+				if(GEN.getSelectCount() > 0){
+					GEN.COM("cur_atr_set,attribute=.drill,option=via")
+                    GEN.COM("sel_change_atr,mode=add")
+					GEN.selClearFeature()
+				}
 				// 删除辅助层
 				var deleLayers = [tmp_layer1, tmp_layer2, tmp_layer2_tmp, layer_tmp]
 				deleLayers.forEach(function(v){

jtg/config/sort_rename_config.js

+[          
+    {"orig_name" : ["^sa.art$","^gto$"], "tl_name" : "gto" ,"sort": 0},
+    {"orig_name" : ["^sb.art$","^gbo$"], "tl_name" : "gbo" ,"sort": 1},
+    {"orig_name" : ["^ra.art$","^gts$"], "tl_name" : "gts" ,"sort": 2},
+    {"orig_name" : ["^rb.art$","^gbs$"], "tl_name" : "gbs" ,"sort": 3},
+    {"orig_name" : ["^gtl$","^top$","^top.art$"], "tl_name" : "gtl" ,"sort": 4},
+    {"orig_name" : ["^l(\\d+)_\\wgnd\\.art$","^l(\\d+)$"], "tl_name" : "l($1)", "pg":"1","sort": 5},
+    {"orig_name" : ["^l(\\d+).*\\.art$","^l(\\d+)$"], "tl_name" : "l($1)","sort": 6},
+    {"orig_name" : ["^gbl$","^bottom$","^bottom.art$"], "tl_name" : "gbl" ,"sort": 7},
+    {"orig_name" : ["^drill-\\d+-\\d+\\.drl$","^drl$"], "tl_name" : "drl" ,"sort": 8},
+    {"orig_name" : ["^gm1\\.art$","^gko$"], "tl_name" : "gko" ,"sort": 9},
+]
+
+[
+    {"tl_name":"^gto$" , "new_name":"gto" , "attr":{ "context":"board", "type":"silk_screen" }},
+    {"tl_name":"^gts$" , "new_name":"gts" , "attr":{ "context":"board", "type":"solder_mask", "polarity":"positive" }},
+    {"tl_name":"^gtl$" , "new_name":"gtl" , "attr":{ "context":"board", "type":"signal", "polarity":"positive" }},
+    {"tl_name":"l(\\d+)","new_name":"l($1)" ,"attr":{"context":"board","type":"signal", "polarity":"positive"}},
+    {"tl_name":"^gbl$","new_name":"gbl" ,"attr":{"context":"board","type":"signal", "polarity":"positive"}},
+    {"tl_name":"^gbs$" , "new_name":"gbs" , "attr":{ "context":"board", "type":"solder_mask", "polarity":"positive" }},
+    {"tl_name":"^gbo$" , "new_name":"gbo" , "attr":{ "context":"board", "type":"silk_screen" }},
+    {"tl_name":"^drl$","new_name":"drl" ,"attr":{"context":"board","type":"drill","polarity":"positive"}},
+    {"tl_name":"^gko$","new_name":"gko" ,"attr":{"context":"board","type":"rout"}},
+]
\ No newline at end of file

jtg/JTG_ORG_create_outline_aim.js → jtg/input原稿/JTG_ORG_create_outline_aim.js

@@ -162,14 +162,6 @@ try {
 		GEN.checkInout({job:job,mode:"in"})
 	}
 
-	if(/yes/ig.test(par.auto_save)){
-		GEN.checkInout({job:job,mode:"out"})  // 结束保存料号 关闭料号
-		GEN.saveJob({ job: job });
-		GEN.checkInout({job:job,mode:"in"})
-		GEN.closeJob({job:job})
-	} else {
-		GEN.checkInout({job:job,mode:"in"})
-	}
 
     QDfm.updateRow({
 		table: "pdm_aimdfm_task",

jtg/JTG_layer_rename_and_sort_aim.js → jtg/input原稿/JTG_layer_rename_and_sort_aim.js

@@ -336,20 +336,21 @@ function setDrill(props){   // 设置钻孔
 	
     // 获取所有的钻孔层
     var drillLayer = matrix.filter(function(v){
-        return (v.attr.type == "drill" || v.attr.type == "rout") && v.attr.context == "board"
+        return (v.attr.type == "drill" ||v.attr.type == "rout") && v.attr.context == "board"
     })
     // 获取所有single层
     var signalLayer = matrix.filter(function(v){
         return (v.attr.type == "signal" || v.attr.type == "power_ground") && v.attr.context == "board"
-	})
-	var layerCount = matrix.length
+    })
+    
+	var layerCount = signalLayer.length
     // findSignal 根据传入的数字找到对应的signal层 如 1 => top ; 2 => layer_2 
     function findSignal(num){
         return signalLayer[Number(num-1)].name
 	}
     function doDrill(drills){  // 分析钻孔层
         return drills.map(function(v){
-            if(v.name == "drill" || v.name=="rout" || v.name=="outline" || v.name=="drl"){
+            if(v.tl_name == "drill" || v.tl_name=="rout" || v.tl_name=="outline" || v.tl_name=="drl" || v.tl_name=="gko"){
                 return {start:findSignal(1), end:findSignal(layerCount), layer:v.name}
             } else {
                 var tmp = /(\d+)-(\d+)/ig.exec(v.tl_name);
@@ -364,6 +365,7 @@ function setDrill(props){   // 设置钻孔
         })
     }
 	var drillSetList = doDrill(drillLayer);   // 分析得到钻孔设置结果
+    
 	drillSetList = drillSetList.filter(function(v){return v!==0})
     drillSetList.forEach(function(v){
         GEN.matrixLayerDrill({job:job,layer:v.layer,start:v.start ,end:v.end})