| 4,12 → 4,13 |
|---|
| var value_list2 = Blockly.JavaScript.valueToCode(block, 'list2', Blockly.JavaScript.ORDER_ATOMIC); |
| if (value_list2.length==0) value_list2='""'; |
| var dropdown_simplepid = block.getFieldValue('simplepid'); |
| var dropdown_sameparticles = block.getFieldValue('sameparticles'); |
| var number_mass0 = block.getFieldValue('mass0'); |
| var number_mass1 = block.getFieldValue('mass1'); |
| var value_histogram = Blockly.JavaScript.valueToCode(block, 'histogram', Blockly.JavaScript.ORDER_ATOMIC); |
| if (value_histogram.length==0) value_histogram='""'; |
| // TODO: Assemble JavaScript into code variable. |
| var code = '{"combiner":{"list1":' + value_list1 + ',"list2":' + value_list2 + ',"pid":"' + dropdown_simplepid + '","m0":"' + number_mass0 + '","m1":"' + number_mass1 + '","histogram":' + value_histogram + '}}\n'; |
| var code = '{"combiner":{"list1":' + value_list1 + ',"list2":' + value_list2 + ',"sameparticles":"'+ dropdown_sameparticles +'","pid":"' + dropdown_simplepid + '","m0":"' + number_mass0 + '","m1":"' + number_mass1 + '","histogram":' + value_histogram + '}}\n'; |
| // TODO: Change ORDER_NONE to the correct strength. |
| return [code, Blockly.JavaScript.ORDER_NONE]; |
| }; |
| 42,11 → 43,14 |
|---|
| |
| Blockly.JavaScript['simple_analysis'] = function(block) { |
| var number_neve = block.getFieldValue('neve'); |
| var number_first= block.getFieldValue('first'); |
| var number_print= block.getFieldValue('print'); |
| var dropdown_datasource = block.getFieldValue('datasource'); |
| var value_list = Blockly.JavaScript.valueToCode(block, 'list', Blockly.JavaScript.ORDER_ATOMIC); |
| if (value_list.length==0) value_list='""'; |
| // TODO: Assemble JavaScript into code variable. |
| var code = '{"analysis":{"neve":"' + number_neve + '","datasource":"' + dropdown_datasource + '","list":' + value_list + '}}\n'; |
| var code = '{"analysis":{"neve":"' + number_neve + '","first":"' + number_first + '","print":"' + number_print + '","datasource":"' + dropdown_datasource + '","list":' + value_list + '}}\n'; |
| |
| return code; |
| }; |
| |
| 66,4 → 70,4 |
|---|
| var code = '{"primary":' + '{"histogram":' + value_histogram + '}}\n'; |
| // TODO: Change ORDER_NONE to the correct strength. |
| return [code, Blockly.JavaScript.ORDER_NONE]; |
| }; |
| }; |