add text control, fix button control

robotics-in-concert · Apr 14, 2015 · effcc3e · effcc3e
1 parent f2b808e
commit effcc3e
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 8 deletions.
diff --git a/rocon_composer_blockly/public/bundle.js b/rocon_composer_blockly/public/bundle.js
@@ -2090,6 +2090,23 @@ Blockly.Blocks['ui_vertical'] = {
     return this.setNextStatement(true);
   },
 
+};
+Blockly.Blocks['ui_text'] = {
+
+  init: function() {
+    this.setColour(30);
+    this.appendDummyInput().appendField('Text' + name);
+
+    this.appendDummyInput().appendField('name:')
+      .appendField(new Blockly.FieldTextInput('name', null), 'NAME');
+
+    this.appendValueInput('TEXT').appendField('text:');
+    this.setInputsInline(true);
+    this.setPreviousStatement(true);
+    return this.setNextStatement(true);
+
+  },
+
 };
 
 Blockly.Blocks['ui_button'] = {
@@ -2098,8 +2115,10 @@ Blockly.Blocks['ui_button'] = {
     this.setColour(30);
     this.appendDummyInput().appendField('Button' + name);
 
-    this.appendValueInput('NAME').appendField('name : ');
-    this.appendValueInput('TEXT').appendField('text : ');
+    this.appendDummyInput().appendField('name:')
+      .appendField(new Blockly.FieldTextInput('name', null), 'NAME');
+
+    this.appendValueInput('TEXT').appendField('text:');
     this.setInputsInline(true);
     this.setPreviousStatement(true);
     return this.setNextStatement(true);
@@ -2109,7 +2128,28 @@ Blockly.Blocks['ui_button'] = {
 
 };
 Blockly.JavaScript['ui_button'] = function(block){
-  return 'layout.push({type: "button"});';
+  var text = Blockly.JavaScript.valueToCode(block, 'TEXT', Blockly.JavaScript.ORDER_NONE) || "''";
+  var name = block.getFieldValue('NAME');
+
+  console.log(name);
+
+  var code = _.template('layout.push({type: "button", name: "<%= name %>", text: <%= text %>});')({
+    text: text,
+    name: name
+  });
+  return code;
+};
+Blockly.JavaScript['ui_text'] = function(block){
+  var text = Blockly.JavaScript.valueToCode(block, 'TEXT', Blockly.JavaScript.ORDER_NONE) || "''";
+  var name = block.getFieldValue('NAME');
+
+  console.log(name);
+
+  var code = _.template('layout.push({type: "text", name: "<%= name %>", text: <%= text %>});')({
+    text: text,
+    name: name
+  });
+  return code;
 };
 
 

diff --git a/rocon_composer_blockly/public/js/blocks/ui.js b/rocon_composer_blockly/public/js/blocks/ui.js
@@ -47,6 +47,23 @@ Blockly.Blocks['ui_vertical'] = {
     return this.setNextStatement(true);
   },
 
+};
+Blockly.Blocks['ui_text'] = {
+
+  init: function() {
+    this.setColour(30);
+    this.appendDummyInput().appendField('Text' + name);
+
+    this.appendDummyInput().appendField('name:')
+      .appendField(new Blockly.FieldTextInput('name', null), 'NAME');
+
+    this.appendValueInput('TEXT').appendField('text:');
+    this.setInputsInline(true);
+    this.setPreviousStatement(true);
+    return this.setNextStatement(true);
+
+  },
+
 };
 
 Blockly.Blocks['ui_button'] = {
@@ -55,8 +72,10 @@ Blockly.Blocks['ui_button'] = {
     this.setColour(30);
     this.appendDummyInput().appendField('Button' + name);
 
-    this.appendValueInput('NAME').appendField('name : ');
-    this.appendValueInput('TEXT').appendField('text : ');
+    this.appendDummyInput().appendField('name:')
+      .appendField(new Blockly.FieldTextInput('name', null), 'NAME');
+
+    this.appendValueInput('TEXT').appendField('text:');
     this.setInputsInline(true);
     this.setPreviousStatement(true);
     return this.setNextStatement(true);
@@ -66,7 +85,28 @@ Blockly.Blocks['ui_button'] = {
 
 };
 Blockly.JavaScript['ui_button'] = function(block){
-  return 'layout.push({type: "button"});';
+  var text = Blockly.JavaScript.valueToCode(block, 'TEXT', Blockly.JavaScript.ORDER_NONE) || "''";
+  var name = block.getFieldValue('NAME');
+
+  console.log(name);
+
+  var code = _.template('layout.push({type: "button", name: "<%= name %>", text: <%= text %>});')({
+    text: text,
+    name: name
+  });
+  return code;
+};
+Blockly.JavaScript['ui_text'] = function(block){
+  var text = Blockly.JavaScript.valueToCode(block, 'TEXT', Blockly.JavaScript.ORDER_NONE) || "''";
+  var name = block.getFieldValue('NAME');
+
+  console.log(name);
+
+  var code = _.template('layout.push({type: "text", name: "<%= name %>", text: <%= text %>});')({
+    text: text,
+    name: name
+  });
+  return code;
 };
 
 

diff --git a/rocon_composer_blockly/public/js/tpl/blockly.html b/rocon_composer_blockly/public/js/tpl/blockly.html
@@ -352,10 +352,12 @@ <h3>List</h3>
     <block type="ui_create" />
     <block type="ui_horizontal" />
     <block type="ui_vertical" />
-    <block type="ui_button">
-      <value name="NAME">
+    <block type="ui_text">
+      <value name="TEXT">
         <block type="text" />
       </value>
+    </block>
+    <block type="ui_button">
       <value name="TEXT">
         <block type="text" />
       </value>