diff --git a/js/mods.js b/js/mods.js index e42afc7f8ddc17ac9201052372f43e0633367663..ca5cd97ef66e053113821147475ea83a460290d3 100644 --- a/js/mods.js +++ b/js/mods.js @@ -772,9 +772,11 @@ function add_module(args) { for (var v in args.inputs) { var div = document.createElement('div') if (args.inputs[v].label != undefined) - div.innerHTML += args.inputs[v].label+' ('+args.inputs[v].type+')' + div.innerHTML += args.inputs[v].label else - div.innerHTML += v+' ('+args.inputs[v].type+')' + div.innerHTML += v + if (args.inputs[v].type != '') + div.innerHTML += '('+args.inputs[v].type+')' div.setAttribute('id',JSON.stringify({id:idnumber,type:'inputs',name:v})) div.addEventListener('mouseover',input_over) div.addEventListener('mouseout',input_out) @@ -824,9 +826,11 @@ function add_module(args) { for (var v in args.outputs) { var div = document.createElement('div') if (args.outputs[v].label != undefined) - div.innerHTML += args.outputs[v].label+' ('+args.outputs[v].type+')' + div.innerHTML += args.outputs[v].label else - div.innerHTML += v+' ('+args.outputs[v].type+')' + div.innerHTML += v + if (args.outputs[v].type != '') + div.innerHTML += '('+args.outputs[v].type+')' div.setAttribute('id',JSON.stringify({id:idnumber,type:'outputs',name:v})) div.addEventListener('mouseover',output_over) div.addEventListener('mouseout',output_out) diff --git a/modules/toolpath/machines/laser cutter/Epilog b/modules/toolpath/machines/laser cutter/Epilog index 2c6a83d2d4f72b1f9fa4f2244909c12e45d92a08..757e56c0b9be7b9d079bcbf6e888cafee967ca1d 100644 --- a/modules/toolpath/machines/laser cutter/Epilog +++ b/modules/toolpath/machines/laser cutter/Epilog @@ -25,14 +25,13 @@ var name = 'Epilog laser cutter' // initialization // var init = function() { - mod.force.value = 50 mod.speed.value = 2 } // // inputs // var inputs = { - toolpath:{type:'object', + toolpath:{type:'', event:function(evt){ mod.name = evt.detail.name mod.path = evt.detail.path @@ -41,21 +40,21 @@ var inputs = { mod.height = evt.detail.height make_path() }}, - settings:{type:'object', + settings:{type:'', event:function(evt){ - //set_values(evt.detail) + set_values(evt.detail) }}} // // outputs // var outputs = { - file:{type:'object', + file:{type:'', event:function(str){ - obj = {} - obj.type = 'file' - obj.name = mod.name+'.camm' - obj.contents = str - mods.output(mod,'file',obj) + //obj = {} + //obj.type = 'file' + //obj.name = mod.name+'.camm' + //obj.contents = str + //mods.output(mod,'file',obj) }}} // // interface