Move to have components and mechanisms like statements

Author: alan412

src/blocks/mrc_component.ts

@@ -57,9 +57,9 @@ const COMPONENT = {
       .appendField(new Blockly.FieldTextInput('my_mech'), 'NAME')
       .appendField('of type')
       .appendField(createFieldNonEditableText(''), 'TYPE');
-    this.setPreviousStatement(false);
-    this.setNextStatement(false);
-    this.setOutput(true, OUTPUT_NAME);
+    this.setPreviousStatement(true, OUTPUT_NAME);
+    this.setNextStatement(true, OUTPUT_NAME);
+    // this.setOutput(true, OUTPUT_NAME);
   },
 
   /**
@@ -134,6 +134,6 @@ export const pythonFromBlock = function (
       }
       code += block.mrcArgs[i].name + ' = ' + generator.valueToCode(block, fieldName, Order.NONE);
     } 
-  code += ')';
-  return [code, Order.ATOMIC];
+  code += ')\n' + "self.hardware.append(self." + block.getFieldValue('NAME') + ")\n";
+  return code;
 }

src/blocks/mrc_mechanism.ts

@@ -57,9 +57,9 @@ const MECHANISM = {
       .appendField(new Blockly.FieldTextInput('my_mech'), 'NAME')
       .appendField('of type')
       .appendField(createFieldNonEditableText(''), 'TYPE');
-    this.setPreviousStatement(false);
-    this.setNextStatement(false);
-    this.setOutput(true, OUTPUT_NAME);
+    this.setPreviousStatement(true, OUTPUT_NAME);
+    this.setNextStatement(true, OUTPUT_NAME);
+    //this.setOutput(true, OUTPUT_NAME);
   },
 
   /**
@@ -74,7 +74,7 @@ const MECHANISM = {
         'name': arg.name,
         'type': arg.type,
       });
-    });    
+    });
     if (this.mrcImportModule) {
       extraState.importModule = this.mrcImportModule;
     }
@@ -87,7 +87,7 @@ const MECHANISM = {
     this.mrcImportModule = extraState.importModule ? extraState.importModule : '';
     this.mrcArgs = [];
 
-    if(extraState.params){
+    if (extraState.params) {
       extraState.params.forEach((arg) => {
         this.mrcArgs.push({
           'name': arg.name,
@@ -101,17 +101,17 @@ const MECHANISM = {
   /**
      * Update the block to reflect the newly loaded extra state.
      */
-    updateBlock_: function(this: MechanismBlock): void {
-      // Add input sockets for the arguments.
-      for (let i = 0; i < this.mrcArgs.length; i++) {
-        const input = this.appendValueInput('ARG' + i)
-            .setAlign(Blockly.inputs.Align.RIGHT)
-            .appendField(this.mrcArgs[i].name);
-        if (this.mrcArgs[i].type) {
-          input.setCheck(getAllowedTypesForSetCheck(this.mrcArgs[i].type));
-        }
+  updateBlock_: function (this: MechanismBlock): void {
+    // Add input sockets for the arguments.
+    for (let i = 0; i < this.mrcArgs.length; i++) {
+      const input = this.appendValueInput('ARG' + i)
+        .setAlign(Blockly.inputs.Align.RIGHT)
+        .appendField(this.mrcArgs[i].name);
+      if (this.mrcArgs[i].type) {
+        input.setCheck(getAllowedTypesForSetCheck(this.mrcArgs[i].type));
       }
     }
+  }
 }
 
 export const setup = function () {
@@ -126,14 +126,15 @@ export const pythonFromBlock = function (
     generator.addImport(block.mrcImportModule);
   }
   let code = 'self.' + block.getFieldValue('NAME') + ' = ' + block.getFieldValue('TYPE') + '(';
-  
+
   for (let i = 0; i < block.mrcArgs.length; i++) {
-      const fieldName = 'ARG' + i;
-      if(i != 0){
-        code += ', '
-      }
-      code += block.mrcArgs[i].name + ' = ' + generator.valueToCode(block, fieldName, Order.NONE);
-    } 
-  code += ')';
-  return [code, Order.ATOMIC];
+    const fieldName = 'ARG' + i;
+    if (i != 0) {
+      code += ', '
+    }
+    code += block.mrcArgs[i].name + ' = ' + generator.valueToCode(block, fieldName, Order.NONE);
+  }
+  code += ')\n' + "self.hardware.append(self." + block.getFieldValue('NAME') + ")\n";
+
+  return code;
 }

src/blocks/mrc_mechanism_component_holder.ts

@@ -25,27 +25,19 @@ import { MRC_STYLE_MECHANISMS } from '../themes/styles';
 import { ExtendedPythonGenerator } from '../editor/extended_python_generator';
 import { OUTPUT_NAME as MECHANISM_OUTPUT } from './mrc_mechanism';
 import { OUTPUT_NAME as COMPONENT_OUTPUT } from './mrc_component';
-import { createPlusField } from '../fields/field_plus';
-import { createMinusField } from '../fields/field_minus';
-import { Order } from 'blockly/python';
-
 
 export const BLOCK_NAME = 'mrc_mechanism_component_holder';
 
 export const MECHANISM = 'mechanism';
 export const COMPONENT = 'component';
 
 type MechanismComponentHolderExtraState = {
-  numMechanismInputs?: number,
-  numComponentInputs?: number,
+  hideMechanims?: boolean;
 }
 
 type MechanismComponentHolderBlock = Blockly.Block & MechanismComponentHolderMixin;
 interface MechanismComponentHolderMixin extends MechanismComponentHolderMixinType {
-  mrcNumMechanismInputs: number,
-  mrcNumComponentInputs: number,
-  lastMechanism: Blockly.Input,
-  lastComponent: Blockly.Input
+  mrcHideMechanisms : boolean;
 }
 type MechanismComponentHolderMixinType = typeof MECHANISM_COMPONENT_HOLDER;
 
@@ -55,158 +47,41 @@ const MECHANISM_COMPONENT_HOLDER = {
     */
   init: function (this: MechanismComponentHolderBlock): void {
     this.setInputsInline(false);
-    this.appendValueInput('MECHANISM_1')
-      .appendField('Mechanisms')
-      .appendField(createPlusField(MECHANISM), 'PLUS_MECHANISM')
-      .setCheck(MECHANISM_OUTPUT);
+    this.appendStatementInput('MECHANISMS').setCheck(MECHANISM_OUTPUT).appendField('Mechanisms');
+    this.appendStatementInput('COMPONENTS').setCheck(COMPONENT_OUTPUT).appendField('Components');
 
-    this.appendValueInput('COMPONENT_1')
-      .appendField('Components')
-      .appendField(createPlusField(COMPONENT), 'PLUS_COMPONENT')
-      .setCheck(COMPONENT_OUTPUT);
     this.setOutput(false);
     this.setStyle(MRC_STYLE_MECHANISMS);
-    this.mrcNumComponentInputs = 1;
-    this.mrcNumMechanismInputs = 1;
-  },
-  plus: function (this: MechanismComponentHolderBlock, type: string): void {
-    if (type == MECHANISM) {
-      this.addMechanismPart_();
-    } else if (type == COMPONENT) {
-      this.addComponentPart_();
-    }
-  },
-  addMechanismPart_: function (this: MechanismComponentHolderBlock): void {
-    this.mrcNumMechanismInputs += 1;
-    let newName = 'MECHANISM_' + this.mrcNumMechanismInputs;
-    let lastLast = this.lastMechanism;
-    this.lastMechanism = this.appendValueInput(newName)
-      .setAlign(Blockly.inputs.Align.RIGHT)
-      .appendField(createMinusField(MECHANISM), 'MINUS_MECHANISM')
-      .setCheck(MECHANISM_OUTPUT);
-    this.moveInputBefore(newName, 'COMPONENT_1');
-    if (lastLast) {
-      lastLast.removeField('MINUS_MECHANISM');
-    }
-  },
-  addComponentPart_: function (this: MechanismComponentHolderBlock): void {
-    this.mrcNumComponentInputs += 1;
-    let newName = 'COMPONENT_' + this.mrcNumComponentInputs;
-    let lastLast = this.lastComponent;
-    this.lastComponent = this.appendValueInput(newName)
-      .setAlign(Blockly.inputs.Align.RIGHT)
-      .appendField(createMinusField(COMPONENT), 'MINUS_COMPONENT')
-      .setCheck(COMPONENT_OUTPUT);
-    if (lastLast) {
-      lastLast.removeField('MINUS_COMPONENT');
-    }
-  },
-  minus: function (this: MechanismComponentHolderBlock, type: string): void {
-    if (type == MECHANISM) {
-      this.subtractMechanismPart_();
-    } else if (type == COMPONENT) {
-      this.subtractComponentPart_();
-    }
-  },
-  subtractMechanismPart_: function (this: MechanismComponentHolderBlock): void {
-    if (this.mrcNumMechanismInputs > 1) {
-      let name = 'MECHANISM_' + this.mrcNumMechanismInputs;
-      this.removeInput(name);
-      this.mrcNumMechanismInputs -= 1;
-      if (this.mrcNumMechanismInputs > 1) {
-        name = 'MECHANISM_' + this.mrcNumMechanismInputs;
-        let lastInput = this.getInput(name);
-        if (lastInput) {
-          this.lastMechanism = lastInput.appendField(createMinusField(MECHANISM), 'MINUS_MECHANISM');
-        }
-      }
-    }
-  },
-  subtractComponentPart_: function (this: MechanismComponentHolderBlock): void {
-    if (this.mrcNumComponentInputs > 1) {
-      let name = 'COMPONENT_' + this.mrcNumComponentInputs;
-      this.removeInput(name);
-      this.mrcNumComponentInputs -= 1;
-      if (this.mrcNumComponentInputs > 1) {
-        name = 'COMPONENT_' + this.mrcNumComponentInputs;
-        let lastInput = this.getInput(name);
-        if (lastInput) {
-          this.lastMechanism = lastInput.appendField(createMinusField(COMPONENT), 'MINUS_COMPONENT');
-        }
-      }
-    }
   },
   saveExtraState: function (this: MechanismComponentHolderBlock): MechanismComponentHolderExtraState {
     const extraState: MechanismComponentHolderExtraState = {
     };
-    if (this.mrcNumComponentInputs != 1) {
-      extraState.numComponentInputs = this.mrcNumComponentInputs;
-    }
-    if (this.mrcNumMechanismInputs != 1) {
-      extraState.numMechanismInputs = this.mrcNumMechanismInputs;
+    if (this.mrcHideMechanisms == true) {
+      extraState.hideMechanims = this.mrcHideMechanisms;
     }
     return extraState;
   },
   /**
   * Applies the given state to this block.
   */
   loadExtraState: function (this: MechanismComponentHolderBlock, extraState: MechanismComponentHolderExtraState): void {
-    this.mrcNumComponentInputs = (extraState.numComponentInputs == undefined) ? 1 : extraState.numComponentInputs;
-    this.mrcNumMechanismInputs = (extraState.numMechanismInputs == undefined) ? 1 : extraState.numMechanismInputs;
+    this.mrcHideMechanisms = (extraState.hideMechanims == undefined) ? 1 : extraState.hideMechanims;
     this.updateBlock_();
   },
   /**
      * Update the block to reflect the newly loaded extra state.
      */
   updateBlock_: function (this: MechanismComponentHolderBlock): void {
-    let number = 1;
-    while (this.getInput('MECHANISM_' + number)) {
-      this.removeInput('MECHANISM_' + number);
-      number += 1;
-    }
-    number = 1;
-    while (this.getInput('COMPONENT_' + number)) {
-      this.removeInput('COMPONENT_' + number);
-      number += 1;
-    }
-
-    if (this.mrcNumMechanismInputs != 0) {
-      this.appendValueInput('MECHANISM_1')
-        .appendField('Mechanisms')
-        .appendField(createPlusField(MECHANISM), 'PLUS_MECHANISM')
-        .setCheck(MECHANISM_OUTPUT);
-    }
-    let remainingMechanisms = this.mrcNumMechanismInputs - 1;
-    number = 1;
-    while (remainingMechanisms > 0) {
-      number += 1;
-      let newName = 'MECHANISM_' + number;
-      this.lastMechanism = this.appendValueInput(newName)
-        .setAlign(Blockly.inputs.Align.RIGHT)
-        .setCheck(MECHANISM_OUTPUT);
-      if (remainingMechanisms == 1) {
-        this.lastMechanism.appendField(createMinusField(MECHANISM), 'MINUS_MECHANISM')
-      }      
-      remainingMechanisms--;
-    }
-
-    if (this.mrcNumComponentInputs != 0) {
-      this.appendValueInput('COMPONENT_1')
-        .appendField('Components')
-        .appendField(createPlusField(COMPONENT), 'PLUS_COMPONENT')
-        .setCheck(COMPONENT_OUTPUT);
-    }
-    let remainingComponents = this.mrcNumComponentInputs - 1;
-    number = 1;
-    while (remainingComponents > 0) {
-      let newName = 'COMPONENT_' + number;
-      this.lastComponent = this.appendValueInput(newName)
-        .setAlign(Blockly.inputs.Align.RIGHT)
-        .setCheck(COMPONENT_OUTPUT);
-      if (remainingComponents == 1) {
-        this.lastComponent.appendField(createMinusField(COMPONENT), 'MINUS_COMPONENT')
-      }      
-      remainingComponents--;
+    if(this.mrcHideMechanisms){
+      if(this.getInput('MECHANISMS')){
+        this.removeInput('MECHANISMS')
+      }    
+    }
+    else{
+      if(!this.getInput('MECHANISMS')){
+        this.appendStatementInput('MECHANISMS').setCheck(MECHANISM_OUTPUT).appendField('Mechanisms');
+        this.moveInputBefore('MECHANISMS', 'COMPONENTS')
+      }
     }
   }
 }
@@ -219,28 +94,18 @@ export const pythonFromBlock = function (
   block: MechanismComponentHolderBlock,
   generator: ExtendedPythonGenerator,
 ) {
-  let code = 'def define_hardware(self):\n';
+  let code = 'def define_hardware(self):\n' + generator.INDENT + 'self.hardware = []\n';
 
-  let body = '';
-  for(let i = 1; i <= block.mrcNumMechanismInputs; i++){
-    const name = 'MECHANISM_' + i;
-    if(block.getInput(name)){
-      let mechanismCode = generator.valueToCode(block, name, Order.NONE) || '';
-      if (mechanismCode != ''){
-        body += generator.INDENT + mechanismCode + "\n";
-      }
-    }
+  let mechanisms = '';
+  let components = '';
+
+  if (block.getInput('MECHANISMS')) {
+    mechanisms = generator.statementToCode(block, 'MECHANISMS');
   }
-  for(let i = 1; i <= block.mrcNumComponentInputs; i++){
-    const name = 'COMPONENT_' + i;
-    if(block.getInput(name)){
-      let componentCode = generator.valueToCode(block, name, Order.NONE) || '';
-      if (componentCode != ''){
-        body += generator.INDENT + componentCode + "\n";
-      }
-    }
+  if (block.getInput('COMPONENTS')) {
+    components = generator.statementToCode(block, 'COMPONENTS');
   }
-  
+  const body = mechanisms + components;
   if(body != ''){
     code += body;
   }else{