Skip to content

Commit a90600c

Browse files
previprevi
committed
wip #92 
1 parent c5f80f3 commit a90600c

File tree

8 files changed

+46
-36
lines changed

8 files changed

+46
-36
lines changed

‎src/assets/js/blockly/blocks.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -989,25 +989,27 @@ Blockly.Blocks.coderbot_adv_findText = {
989989
this.appendDummyInput()
990990
.appendField(Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_FIND)
991991
.appendField(new Blockly.FieldDropdown([
992-
[Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_ACCEPT_ALPHA, 'alpha'],
993-
[Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_ACCEPT_NUM, 'num'],
994-
[Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_ACCEPT_ALPHANUM, 'alphanum'],
995-
[Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_ACCEPT_UNSPEC, 'unspec'],
992+
[Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_ACCEPT_ENG, 'eng'],
993+
[Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_ACCEPT_ITA, 'ita'],
994+
[Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_ACCEPT_SPA, 'spa'],
995+
[Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_ACCEPT_FRE, 'fra'],
996+
[Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_ACCEPT_DEU, 'deu'],
997+
[Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_ACCEPT_UNSPEC, ''],
996998
]), 'ACCEPT')
997-
.appendField(Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_COLOR);
998-
this.appendValueInput('COLOR')
999-
.setCheck(['Colour', 'String']);
999+
.appendField(Blockly.Msg.CODERBOT_SENSOR_FINDTEXT_TIMEOUT);
1000+
this.appendValueInput('TIMEOUT')
1001+
.setCheck('Number');
10001002
this.setInputsInline(true);
1001-
this.setOutput(true, ['Number', 'Array']);
1003+
this.setOutput(true, ['String']);
10021004
this.setTooltip(Blockly.Msg.LOGIC_BOOLEAN_TOOLTIP);
10031005
},
10041006
};
10051007

10061008
Blockly.Python.coderbot_adv_findText = function (block) {
10071009
// Boolean values true and false.
1008-
const accept = block.getFieldValue('ACCEPT');
1009-
const color = Blockly.Python.valueToCode(block, 'COLOR', Blockly.Python.ORDER_NONE);
1010-
const code = `get_cam().find_text(accept="${accept}", back_color=${color})`;
1010+
const lang = block.getFieldValue('ACCEPT');
1011+
const timeout = Blockly.Python.valueToCode(block, 'TIMEOUT', Blockly.Python.ORDER_NONE);
1012+
const code = `get_cam().find_text(lang="${lang}", timeout=${timeout})`;
10111013
return [code, Blockly.Python.ORDER_ATOMIC];
10121014
};
10131015

‎src/assets/js/blockly/bot_en.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@
6161
"CODERBOT_SENSOR_AVERAGE_VALUE": "Value (brightness)",
6262
"CODERBOT_SENSOR_AVERAGE_ALL": "HSV (as list)",
6363
"CODERBOT_SENSOR_FINDTEXT_FIND": "find text",
64-
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ALPHA": "Alpha (A..Z)",
65-
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_NUM": "Numeric (0..9)",
66-
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ALPHANUM": "Alphanumeric (A..Z;0..9)",
64+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ENG": "English",
65+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ITA": "Italian",
66+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_FRE": "French",
67+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_SPA": "Spanish",
68+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_DEU": "German",
6769
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_UNSPEC": "Any",
68-
"CODERBOT_SENSOR_FINDTEXT_COLOR": "background color",
70+
"CODERBOT_SENSOR_FINDTEXT_TIMEOUT": "max time",
6971
"CODERBOT_SENSOR_FINDQRCODE": "read Bar-QRCode",
7072
"CODERBOT_SENSOR_FINDARCODE": "read AR Code",
7173
"CODERBOT_AUDIO_RECORD_FILE_NAME": "record as file",

‎src/assets/js/blockly/bot_fr.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@
5353
"CODERBOT_SENSOR_FINDLOGO": "trouve le logo",
5454
"CODERBOT_SENSOR_FINDCLASS": "trouve le class",
5555
"CODERBOT_SENSOR_FINDTEXT_FIND": "trouve le text",
56-
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ALPHA": "Alpha (A..Z)",
57-
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_NUM": "Numeric (0..9)",
58-
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ALPHANUM": "Alphanumeric (A..Z;0..9)",
56+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ENG": "English",
57+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ITA": "Italian",
58+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_FRE": "French",
59+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_SPA": "Spanish",
60+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_DEU": "German",
5961
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_UNSPEC": "Any",
60-
"CODERBOT_SENSOR_FINDTEXT_COLOR": "background color",
62+
"CODERBOT_SENSOR_FINDTEXT_TIMEOUT": "max time",
6163
"CODERBOT_SENSOR_FINDQRCODE": "trouve le Bar/QRCode",
6264
"CODERBOT_SENSOR_FINDARCODE": "trouve le AR Code",
6365
"CODERBOT_AUDIO_RECORD_FILE_NAME": "record as file",

‎src/assets/js/blockly/bot_it.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@
6161
"CODERBOT_SENSOR_AVERAGE_VALUE": "Luminosità",
6262
"CODERBOT_SENSOR_AVERAGE_ALL": "HSV (come lista)",
6363
"CODERBOT_SENSOR_FINDTEXT_FIND": "trova testo",
64-
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ALPHA": "Lettere (A..Z)",
65-
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_NUM": "Numeri (0..9)",
66-
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ALPHANUM": "Lettere e numeri (A..Z;0..9)",
64+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ENG": "Inglese",
65+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_ITA": "Italiano",
66+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_FRE": "Francese",
67+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_SPA": "Spagnolo",
68+
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_DEU": "Tedesco",
6769
"CODERBOT_SENSOR_FINDTEXT_ACCEPT_UNSPEC": "Qualsiasi",
68-
"CODERBOT_SENSOR_FINDTEXT_COLOR": "colore sfondo",
70+
"CODERBOT_SENSOR_FINDTEXT_TIMEOUT": "tempo massimo",
6971
"CODERBOT_SENSOR_FINDQRCODE": "leggi Bar/QRCode",
7072
"CODERBOT_SENSOR_FINDARCODE": "leggi AR Code",
7173
"CODERBOT_AUDIO_RECORD_FILE_NAME": "registra audio su file",

‎src/assets/toolbox_adv.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,10 +1016,13 @@
10161016
"kind": "block",
10171017
"type": "coderbot_adv_findText",
10181018
"inputs": {
1019-
"COLOR": {
1019+
"TIMEOUT": {
10201020
"shadow": {
10211021
"kind": "block",
1022-
"type": "colour_picker"
1022+
"type": "math_number",
1023+
"fields": {
1024+
"NUM": 0
1025+
}
10231026
}
10241027
}
10251028
}

‎src/common/coderbot.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,10 @@ class CoderBot {
333333
});
334334
}
335335

336-
runProgram(name, code, options) {
336+
runProgram(name, code) {
337337
return this.$axios.post(`${this.CB}/programs/${name}/run`, {
338-
name: 'run program',
338+
name: name,
339339
code: code,
340-
options: options
341340
});
342341
}
343342

‎src/components/Activity.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,9 +638,9 @@ export default {
638638
runProgram() {
639639
if (this.status) {
640640
// POST /program/save
641-
const options = this.activity;
642641
const { code } = this.$refs.workspace.getProgramData();
643-
this.$coderbot.runProgram(this.programName, code, options).then(() => {
642+
const programName = this.programName != '' ? this.programName : 'untitled';
643+
this.$coderbot.runProgram(programName, code).then(() => {
644644
this.runtimeDialog = true;
645645
setTimeout(() => {
646646
this.updateExecStatus();

‎src/components/Landing.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,31 @@
1818
</v-col>
1919
<br>
2020
<div style="font-size: 18px;"> {{ $t("message.choose_action") }} </div>
21-
<v-container>
22-
<v-row>
21+
<v-container align="center">
22+
<v-row >
2323
<v-col>
24-
<v-btn color="indigo" to="/program">
24+
<v-btn color="indigo" size="large" to="/program" class="md4">
2525
<v-icon icon="mdi-flip-to-front"></v-icon>{{ $t("message.program") }}
2626
</v-btn>
2727
</v-col>
2828
</v-row>
2929
<v-row>
3030
<v-col>
31-
<v-btn color="indigo" target="_blank" href="/docs">
31+
<v-btn color="indigo" size="large" target="_blank" href="/docs">
3232
<v-icon icon="mdi-help"></v-icon>{{ $t("message.docs") }}
3333
</v-btn>
3434
</v-col>
3535
</v-row>
3636
<v-row>
3737
<v-col>
38-
<v-btn color="indigo" to="/control">
38+
<v-btn color="indigo" size="large" to="/control">
3939
<v-icon icon="mdi-gamepad"></v-icon>{{ $t("message.control") }}
4040
</v-btn>
4141
</v-col>
4242
</v-row>
4343
<v-row>
4444
<v-col>
45-
<v-btn color="indigo" to="/settings">
45+
<v-btn color="indigo" size="large" to="/settings">
4646
<v-icon icon="mdi-cog"></v-icon>{{ $t("message.settings") }}
4747
</v-btn>
4848
</v-col>

0 commit comments

Comments
 (0)