From c7cea4f2a98f4d754f118e5cc493bdd7ff5daac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anian=20B=C3=BChler?= <anian.buehler@reutlingen-university.de> Date: Mon, 17 May 2021 18:07:42 +0200 Subject: [PATCH] added 3-port infix-block --- .../com/ardublock/block/ardublock.properties | 2 ++ .../com/ardublock/block/ardublock.xml | 26 +++++++++++++++---- .../ardublock/block/ardublock_de.properties | 4 ++- .../ardublock/block/block-mapping.properties | 1 + 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties index 292de99..27e9aa5 100644 --- a/src/main/resources/com/ardublock/block/ardublock.properties +++ b/src/main/resources/com/ardublock/block/ardublock.properties @@ -624,6 +624,8 @@ bc.variable_number_float=float #TEST NEW BLOCKDESIGN bg.setter_variable_analog== bg.setter_variable_analog.description= +bg.create_variable_analog== +bg.create_variable_analog.description= #ARRAYS #**************************** diff --git a/src/main/resources/com/ardublock/block/ardublock.xml b/src/main/resources/com/ardublock/block/ardublock.xml index 4ed278a..7259e21 100644 --- a/src/main/resources/com/ardublock/block/ardublock.xml +++ b/src/main/resources/com/ardublock/block/ardublock.xml @@ -1032,8 +1032,8 @@ <DefaultArg genus-name="dummy" label="" /> </BlockConnector> - <BlockConnector connector-type="number" connector-kind="socket" position-type="bottom" /> - <BlockConnector connector-type="number" connector-kind="socket" position-type="bottom" /> + <BlockConnector connector-type="number" connector-kind="socket" position-type="bottom"/> + <BlockConnector connector-type="number" connector-kind="socket" position-type="bottom"/> </BlockConnectors> </BlockGenus> <BlockGenus name="less" kind="function" color="255 20 147" initlabel="bg.less"> @@ -1878,14 +1878,29 @@ </BlockGenus> - <BlockGenus name="setter_variable_analog" kind="command" color="255 0 0" initlabel="bg.setter_variable_analog" editable-label="yes"> + <BlockGenus name="setter_variable_analog" kind="command" color="255 0 0" initlabel="bg.setter_variable_analog" editable-label="no"> + <description> + <text>TESTTEST</text> + </description> + <BlockConnectors> + <BlockConnector connector-type="number" connector-kind="socket" position-type="bottom"> + <DefaultArg genus-name="variable_number" label="analoge_Variable" /> + </BlockConnector> + <BlockConnector connector-type="number" connector-kind="socket" position-type="bottom"> + </BlockConnector> + </BlockConnectors> + </BlockGenus> + + <BlockGenus name="create_variable_analog" kind="command" color="255 0 0" initlabel="bg.create_variable_analog" editable-label="no"> <description> <text>TESTTEST</text> </description> <BlockConnectors> - <BlockConnector connector-type="number" connector-kind="socket" label="==" label-editable="yes" position-type="bottom"> + <BlockConnector connector-type="number" connector-kind="socket" label="int" position-type="bottom"> + </BlockConnector> + <BlockConnector connector-type="number" connector-kind="socket" label="[" position-type="bottom"> </BlockConnector> - <BlockConnector connector-type="number" connector-kind="socket" label="=" label-editable="yes" position-type="bottom"> + <BlockConnector connector-type="number" connector-kind="socket" label="] = " position-type="bottom"> </BlockConnector> </BlockConnectors> </BlockGenus> @@ -2972,6 +2987,7 @@ <BlockGenusMember>numberDivider2</BlockGenusMember> <BlockGenusMember>setter_variable_analog</BlockGenusMember> + <BlockGenusMember>create_variable_analog</BlockGenusMember> <BlockGenusMember>setter_variable_digital</BlockGenusMember> <BlockGenusMember>variable_digital</BlockGenusMember> diff --git a/src/main/resources/com/ardublock/block/ardublock_de.properties b/src/main/resources/com/ardublock/block/ardublock_de.properties index 2589656..da86399 100644 --- a/src/main/resources/com/ardublock/block/ardublock_de.properties +++ b/src/main/resources/com/ardublock/block/ardublock_de.properties @@ -619,7 +619,9 @@ bc.variable_number_float=dezimale_Variable #TEST NEW BLOCKDESIGN bg.setter_variable_analog== -bg.setter_variable_analog.description= +bg.setter_variable_analog.description=Schreibe neuen Wert in analoge Variable +bg.create_variable_analog== +bg.create_variable_analog.description=Erstelle neue analoge Variable\nOptional mit Startwert #ARRAYS diff --git a/src/main/resources/com/ardublock/block/block-mapping.properties b/src/main/resources/com/ardublock/block/block-mapping.properties index a49dbc7..f644df6 100644 --- a/src/main/resources/com/ardublock/block/block-mapping.properties +++ b/src/main/resources/com/ardublock/block/block-mapping.properties @@ -212,6 +212,7 @@ local_variable_digital=com.ardublock.translator.block.numbers.LocalVariableDigit #TEST NEW BLOCKDESIGN setter_variable_analog=com.ardublock.translator.block.numbers.SetterVariableNumberBlock +create_variable_analog=com.ardublock.translator.block.numbers.SetterVariableNumberBlock #ARRAYS #**************************** -- GitLab