Commit 2014f1f6 authored by Scott Sun's avatar Scott Sun

scott

parent 861f24fb
...@@ -176,6 +176,7 @@ var gui = new NewGUI(GUI); ...@@ -176,6 +176,7 @@ var gui = new NewGUI(GUI);
if(!par.outline_size){ if(!par.outline_size){
par.outline_size = par.units == 'inch' ? 7.87 : 200; par.outline_size = par.units == 'inch' ? 7.87 : 200;
} }
var work_layer;
try { try {
if(_.isEmpty(job)){throw "参数job不存在"} else { job = job.toLowerCase() } if(_.isEmpty(job)){throw "参数job不存在"} else { job = job.toLowerCase() }
if(!GEN.isJobExists({job:job})){throw "料号"+job+"不存在"} if(!GEN.isJobExists({job:job})){throw "料号"+job+"不存在"}
...@@ -185,20 +186,31 @@ try { ...@@ -185,20 +186,31 @@ try {
var workstep = getWorkStep() var workstep = getWorkStep()
if(!Array.isArray(workstep)){throw "工作step错误"} if(!Array.isArray(workstep)){throw "工作step错误"}
work_layer = getLayer({layer_type:"silk_screen", context: "board"})
if(/yes/ig.test(par.select_lyr)){
var matrix = GEN.getMatrix({job:job});
var layers = Object.keys(matrix).map(function(key){
var tmp ={};
tmp[key] = key;
return tmp
})
work_layer = gui.selectMultiple({title: "请先择工作层",list: layers,defaultvalue: work_layer,columns: 4,gen: GEN})
}
if(work_layer.length == 0 ) {throw "没有先择layer"}
var err = createCoverLayer({workstep:workstep}) // 创建套层 var err = createCoverLayer({workstep:workstep}) // 创建套层
if (err) {throw err} if (err) {throw err}
GEN.PAUSE("createCoverLayer end; please check") GEN.PAUSE("createCoverLayer end; please check")
var err = ssFrameSeparate({workstep:workstep}) // 分离文字和文字框 var err = ssFrameSeparate({workstep:workstep}) // 分离文字和文字框
if (err) {throw err} if (err) {throw err}
GEN.PAUSE("ssFrameSeparate end; please check")
var err = slBoxOptimize({workstep:workstep}) // 文字框优化 var err = slBoxOptimize({workstep:workstep}) // 文字框优化
if (err) {throw err} if (err) {throw err}
var err = slOptimize({workstep:workstep}) // 文字优化 var err = slOptimize({workstep:workstep}) // 文字优化
if (err) {throw err} if (err) {throw err}
GEN.PAUSE("slOptimize end; please check")
...@@ -221,18 +233,7 @@ try { ...@@ -221,18 +233,7 @@ try {
function createCoverLayer (props){ function createCoverLayer (props){
// 1. step过滤 // 1. step过滤
var workstep = props.workstep; var workstep = props.workstep;
// 2.过滤工作层
var work_layer = getLayer({layer_type:"silk_screen", context: "board"})
if(/yes/ig.test(par.select_lyr)){
var matrix = GEN.getMatrix({job:job});
var layers = Object.keys(matrix).map(function(key){
var tmp ={};
tmp[key] = key;
return tmp
})
work_layer = gui.selectMultiple({title: "请先择工作层",list: layers,defaultvalue: work_layer,columns: 4,gen: GEN})
}
if(work_layer.length == 0 ) {return "没有先择layer"}
// 其他参数 // 其他参数
var info = gui.showForm({ var info = gui.showForm({
title : '请手动匹配以下信息', title : '请手动匹配以下信息',
...@@ -302,10 +303,10 @@ function createCoverLayer (props){ ...@@ -302,10 +303,10 @@ function createCoverLayer (props){
workstep.forEach(function(step){ workstep.forEach(function(step){
GEN.openStep({job:job,name:step}); GEN.openStep({job:job,name:step});
GEN.clearLayers(); GEN.clearLayers();
GEN.affectedLayer({ mode:'all',affected:'no' });
GEN.units({ type:par.units} ); GEN.units({ type:par.units} );
GEN.zoomHome(); GEN.zoomHome();
work_layer.forEach(function(layer){ work_layer.forEach(function(layer,index){
GEN.affectedLayer({ mode:'all',affected:'no' });
var cover_lyr = layer + par.cover_layer_suffix ; var cover_lyr = layer + par.cover_layer_suffix ;
var sm,outer ; var sm,outer ;
if ( GEN.isLayerExists({job:job,layer:cover_lyr}) ) { GEN.deleteLayer({job:job,layer:[cover_lyr]}) } if ( GEN.isLayerExists({job:job,layer:cover_lyr}) ) { GEN.deleteLayer({job:job,layer:[cover_lyr]}) }
...@@ -339,6 +340,8 @@ function createCoverLayer (props){ ...@@ -339,6 +340,8 @@ function createCoverLayer (props){
GEN.copyLayer({source_job:job,source_step:step,source_layer:outline_tmp,dest_layer:cover_lyr,mode:'append',invert:'no'}) GEN.copyLayer({source_job:job,source_step:step,source_layer:outline_tmp,dest_layer:cover_lyr,mode:'append',invert:'no'})
GEN.deleteLayer({job:job,layer:[outline_tmp],step:step}); GEN.deleteLayer({job:job,layer:[outline_tmp],step:step});
} }
GEN.displayLayer({name:cover_lyr,display_number:index+1})
}) })
}) })
GEN.affectedLayer({affected:'no',mode:'all'}) GEN.affectedLayer({affected:'no',mode:'all'})
...@@ -349,17 +352,7 @@ function ssFrameSeparate (props) { ...@@ -349,17 +352,7 @@ function ssFrameSeparate (props) {
// 1. step过滤 // 1. step过滤
var workstep = props.workstep; var workstep = props.workstep;
// 2.过滤工作层 // 2.过滤工作层
var work_layers = getLayer({layer_type:"silk_screen", context: "board"})
if(/yes/ig.test(par.select_lyr)){
var matrix = GEN.getMatrix({job:job});
var layers = Object.keys(matrix).map(function(key){
var tmp ={};
tmp[key] = key;
return tmp
})
work_layers = gui.selectMultiple({defaultsize:[200,100],title: "请先择工作层",list: layers,defaultvalue: work_layers,columns: 4,gen: GEN})
}
if(work_layers.length == 0 ) {return "没有先择layer"}
var info = gui.showForm({ var info = gui.showForm({
title : '请手动匹配以下信息', title : '请手动匹配以下信息',
...@@ -601,17 +594,6 @@ function slBoxOptimize(props){ ...@@ -601,17 +594,6 @@ function slBoxOptimize(props){
// 1. step过滤 // 1. step过滤
var workstep = props.workstep; var workstep = props.workstep;
// 2.过滤工作层 // 2.过滤工作层
var work_layers = getLayer({layer_type:"silk_screen", context: "board"})
if(/yes/ig.test(par.select_lyr)){
var matrix = GEN.getMatrix({job:job});
var layers = Object.keys(matrix).map(function(key){
var tmp ={};
tmp[key] = key;
return tmp
})
work_layers = gui.selectMultiple({defaultsize:[200,100],title: "请先择工作层",list: layers,defaultvalue: work_layers,columns: 4,gen: GEN})
}
if(work_layers.length == 0 ) {return "没有先择layer"}
var matrix = GEN.getMatrix({job:job}) var matrix = GEN.getMatrix({job:job})
workstep.forEach(function(step){ workstep.forEach(function(step){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment