From 189816c4b696b10b56f0da84712298e24bb7cb0e Mon Sep 17 00:00:00 2001
From: Neil Gershenfeld <gersh@cba.mit.edu>
Date: Sun, 10 Sep 2017 10:59:01 -0400
Subject: [PATCH] allow for empty I/O type
---
js/mods.js | 12 ++++++++----
modules/toolpath/machines/laser cutter/Epilog | 19 +++++++++----------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/js/mods.js b/js/mods.js
index e42afc7..ca5cd97 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 2c6a83d..757e56c 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
--
GitLab