From c2b90e3c2bbcdb26dfc4bdcee05eca7ac0049da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anian=20B=C3=BChler?= <anian.buehler@reutlingen-university.de> Date: Wed, 4 May 2022 15:26:48 +0200 Subject: [PATCH] added singlke-line setVariable-Blocks --- .../com/ardublock/block/ardublock.properties | 6 ++-- .../com/ardublock/block/ardublock.xml | 34 ++++++++++++++----- .../ardublock/block/ardublock_de.properties | 6 ++-- .../block/ardublock_en_GB.properties | 6 ++-- .../ardublock/block/block-mapping.properties | 3 +- 5 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties index ae0dfdd..d8ac8d0 100644 --- a/src/main/resources/com/ardublock/block/ardublock.properties +++ b/src/main/resources/com/ardublock/block/ardublock.properties @@ -685,8 +685,10 @@ bc.variable_number_long = Long bc.variable_number_float=float #TEST NEW BLOCKDESIGN -bg.setter_variable_analog=set analog variable -bg.setter_variable_analog.description= +bg.setter_variable_digital_line=set digital variable +bg.setter_variable_digital_line.description= +bg.setter_variable_analog_line=set analog variable +bg.setter_variable_analog_line.description= bg.create_variable_analog=create analog variable bg.create_variable_analog.description= bg.create_array_analog=set analog array diff --git a/src/main/resources/com/ardublock/block/ardublock.xml b/src/main/resources/com/ardublock/block/ardublock.xml index 32ecfaa..ff314cf 100644 --- a/src/main/resources/com/ardublock/block/ardublock.xml +++ b/src/main/resources/com/ardublock/block/ardublock.xml @@ -2043,24 +2043,37 @@ <text>#define bool constant</text> </description> <BlockConnectors> - <BlockConnector connector-type="boolean" connector-kind="socket" label="bc.variable"> + <BlockConnector connector-type="boolean" connector-kind="socket" label="bc.variable" position-type="bottom"> <DefaultArg genus-name="constant_digital" label="DIGITALE_KONSTANTE" /> </BlockConnector> - <BlockConnector connector-type="boolean" connector-kind="socket" label="bc.value"> - <DefaultArg genus-name="true" label="true" /> + <BlockConnector connector-type="boolean" connector-kind="socket" label="bc.value" position-type="bottom"> + <DefaultArg genus-name="constant_digital" label="DIGITALE_KONSTANTE" /><!-- <DefaultArg genus-name="true" label="true" /> --> </BlockConnector> </BlockConnectors> </BlockGenus> - <!--TESTESTEST--> - <BlockGenus name="setter_variable_analog" kind="command" color="255 0 0" initlabel="bg.setter_variable_analog" editable-label="no"> + <!--SingleLineBlocks--> + <BlockGenus name="setter_variable_digital_line" kind="command" color="255 0 0" initlabel="bg.setter_variable_digital_line" editable-label="no"> <description> <text>TEST -> TODO: crate bc.xyz variable for labels</text> </description> <BlockConnectors> - <BlockConnector connector-type="number" connector-kind="socket" label="variable" position-type="bottom"> - <DefaultArg genus-name="variable_number" label="analoge_Variable" /> + <BlockConnector connector-type="boolean" connector-kind="socket" label="Name" position-type="bottom"> + <DefaultArg genus-name="variable_digital" label="digitaleVariable" /> + </BlockConnector> + <BlockConnector connector-type="boolean" connector-kind="socket" label="=" position-type="bottom"> + </BlockConnector> + </BlockConnectors> + </BlockGenus> + + <BlockGenus name="setter_variable_analog_line" kind="command" color="255 0 0" initlabel="bg.setter_variable_analog_line" editable-label="no"> + <description> + <text>TEST -> TODO: crate bc.xyz variable for labels</text> + </description> + <BlockConnectors> + <BlockConnector connector-type="number" connector-kind="socket" label="Name" position-type="bottom"> + <DefaultArg genus-name="variable_number" label="analogeVariable" /> </BlockConnector> <BlockConnector connector-type="number" connector-kind="socket" label="=" position-type="bottom"> </BlockConnector> @@ -3441,7 +3454,8 @@ </BlockDrawer> <BlockDrawer button-color="255 0 0" name="bd.number" type="default"> - <!--<BlockGenusMember>setter_variable_analog</BlockGenusMember> + + <!-- IDEE: create_variable trägt in Tabelle ein, wenn kein Eintrag, dann erzeugt auch setter DefCode (Frage: Was ist mit lokalen?) <BlockGenusMember>create_variable_analog</BlockGenusMember> <BlockGenusMember>create_array_analog</BlockGenusMember>--> @@ -3452,6 +3466,7 @@ <BlockGenusMember>setter_variable_digital</BlockGenusMember> + <BlockGenusMember>setter_variable_digital_line</BlockGenusMember> <BlockGenusMember>variable_digital</BlockGenusMember> <BlockGenusMember>local_variable_digital</BlockGenusMember><!-- nur für Sim -> später anpassen --> @@ -3461,7 +3476,8 @@ <BlockGenusMember>false</BlockGenusMember> <BlockGenusMember>numberDivider3</BlockGenusMember> - <BlockGenusMember>setter_variable_number</BlockGenusMember> + <BlockGenusMember>setter_variable_number</BlockGenusMember> + <BlockGenusMember>setter_variable_analog_line</BlockGenusMember> <BlockGenusMember>variable_number</BlockGenusMember> <BlockGenusMember>local_variable_number</BlockGenusMember><!-- nur für Sim -> später anpassen --> <BlockGenusMember>number</BlockGenusMember> diff --git a/src/main/resources/com/ardublock/block/ardublock_de.properties b/src/main/resources/com/ardublock/block/ardublock_de.properties index d68d394..4ae4757 100644 --- a/src/main/resources/com/ardublock/block/ardublock_de.properties +++ b/src/main/resources/com/ardublock/block/ardublock_de.properties @@ -683,8 +683,10 @@ bc.variable_number_long =lange_analogen_Variable bc.variable_number_float=dezimale_Variable #TEST NEW BLOCKDESIGN -bg.setter_variable_analog=setze analoge variable -bg.setter_variable_analog.description=Schreibe neuen Wert in int Variable +bg.setter_variable_digital_line=setze digitale variable +bg.setter_variable_digital_line.description=Schreibe neuen Wert in digitale (bool) Variable +bg.setter_variable_analog_line=setze analoge variable +bg.setter_variable_analog_line.description=Schreibe neuen Wert in analoge (int) Variable bg.create_variable_analog=erstelle analoge variable bg.create_variable_analog.description=Erstelle neue int Variable\nOptional mit Startwert bg.create_array_analog=setze analoge Tabelle diff --git a/src/main/resources/com/ardublock/block/ardublock_en_GB.properties b/src/main/resources/com/ardublock/block/ardublock_en_GB.properties index e9f3a5c..0440e84 100644 --- a/src/main/resources/com/ardublock/block/ardublock_en_GB.properties +++ b/src/main/resources/com/ardublock/block/ardublock_en_GB.properties @@ -681,8 +681,10 @@ bc.variable_number_long =long_Variable bc.variable_number_float=float_Variable #TEST NEW BLOCKDESIGN -bg.setter_variable_analog=setze int variable -bg.setter_variable_analog.description=Schreibe neuen Wert in int Variable +bg.setter_variable_digital_line=setze bool variable +bg.setter_variable_digital_line.description=Schreibe neuen Wert in bool Variable +bg.setter_variable_analog_line=setze int variable +bg.setter_variable_analog_line.description=Schreibe neuen Wert in int Variable bg.create_variable_analog=erstelle int variable bg.create_variable_analog.description=Erstelle neue int Variable\nOptional mit Startwert bg.create_array_analog=setze int array diff --git a/src/main/resources/com/ardublock/block/block-mapping.properties b/src/main/resources/com/ardublock/block/block-mapping.properties index 68a78f3..6c08089 100644 --- a/src/main/resources/com/ardublock/block/block-mapping.properties +++ b/src/main/resources/com/ardublock/block/block-mapping.properties @@ -224,7 +224,8 @@ local_variable_number=com.ardublock.translator.block.numbers.LocalVariableNumber local_variable_digital=com.ardublock.translator.block.numbers.LocalVariableDigitalBlock #TEST NEW BLOCKDESIGN -setter_variable_analog=com.ardublock.translator.block.numbers.SetterVariableNumberBlock +setter_variable_digital_line=com.ardublock.translator.block.numbers.SetterVariableDigitalBlock +setter_variable_analog_line=com.ardublock.translator.block.numbers.SetterVariableNumberBlock create_variable_analog=com.ardublock.translator.block.numbers.SetterVariableNumberBlock #ARRAYS -- GitLab