Skip to content

Commit a87f969

Browse files
bjost2sbjost2s
committed
Issue OpenRoberta/openroberta-lab#1400:remove "_getSample" in the name of the marker information block. Attention! XsltTransformer.java removes inputs in this case
1 parent ff49fc3 commit a87f969

70 files changed

Lines changed: 80 additions & 80 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎blockly_compressed.js‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎blocks/robSensorDefinitions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ sensors.camera = {};
106106
sensors.camera.robotino = {
107107
title: 'CAMERA', modes: [{
108108
name: 'LINE', type: 'Number', op: 'NUM_REV', value: '-0.5'
109-
}, { name: 'BLOB', type: 'Number' }], ports: 'CONFIGURATION', portsHidden: true
109+
}], ports: 'CONFIGURATION', portsHidden: true
110110
};
111111
sensors.code = {};
112112
sensors.code.bob3 = {

‎blocks/robSensors.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ Blockly.Blocks['robSensors_record_stop'] = {
274274
}
275275
};
276276

277-
Blockly.Blocks['robSensors_markerinf_getSample'] = {
277+
Blockly.Blocks['robSensors_get_markerinf'] = {
278278
/**
279279
* Get the information about given marker.
280280
*/

‎msg/js/ar.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,6 @@ Blockly.Msg.NAO_APPLYPOSTURE_TOOLTIP = "Robot will take the selected posture or
965965
Blockly.Msg.NAO_AUTONOMOUS = "turn autonomous behaviour"; // untranslated
966966
Blockly.Msg.NAO_AUTONOMOUS_TOOLTIP = "Turn the robots autonomous behaviour on or off. While 'on' the robot will react to sounds, move slightly from side to side and try to track faces. Turn it off if this behaviour interrupts your program."; // untranslated
967967
Blockly.Msg.NAO_BLINK = "blink"; // untranslated
968-
Blockly.Msg.NAO_CAMERA = "camera"; // untranslated
969968
Blockly.Msg.NAO_CAMERA_BOTTOM = "bottom"; // untranslated
970969
Blockly.Msg.NAO_CAMERA_TOP = "top"; // untranslated
971970
Blockly.Msg.NAO_FACE_GET_INFORMATION_TOOLTIP = "Returns additional information about the given detected in an array with following values: [XAngle, YAngle, XSize, YSize, Heading], please note that all values are given in camera angles."; // untranslated
@@ -1428,6 +1427,7 @@ Blockly.Msg.SENSOR_ARM_TOOLTIP = "Returns true, if the selected part of the arm
14281427
Blockly.Msg.SENSOR_BATTERY = "battery charge"; // untranslated
14291428
Blockly.Msg.SENSOR_BOTTOM = "bottom"; // untranslated
14301429
Blockly.Msg.SENSOR_CALIBRATE = "calibrate"; // untranslated
1430+
Blockly.Msg.SENSOR_CAMERA = "camera"; // untranslated
14311431
Blockly.Msg.SENSOR_CODE = "code pad"; // untranslated
14321432
Blockly.Msg.SENSOR_COLOUR = "colour sensor"; // untranslated
14331433
Blockly.Msg.SENSOR_COLOURTCS3472 = "colour sensor TCS3472"; // untranslated

‎msg/js/az.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,6 @@ Blockly.Msg.NAO_APPLYPOSTURE_TOOLTIP = "Robot will take the selected posture or
965965
Blockly.Msg.NAO_AUTONOMOUS = "turn autonomous behaviour"; // untranslated
966966
Blockly.Msg.NAO_AUTONOMOUS_TOOLTIP = "Turn the robots autonomous behaviour on or off. While 'on' the robot will react to sounds, move slightly from side to side and try to track faces. Turn it off if this behaviour interrupts your program."; // untranslated
967967
Blockly.Msg.NAO_BLINK = "blink"; // untranslated
968-
Blockly.Msg.NAO_CAMERA = "camera"; // untranslated
969968
Blockly.Msg.NAO_CAMERA_BOTTOM = "bottom"; // untranslated
970969
Blockly.Msg.NAO_CAMERA_TOP = "top"; // untranslated
971970
Blockly.Msg.NAO_FACE_GET_INFORMATION_TOOLTIP = "Returns additional information about the given detected in an array with following values: [XAngle, YAngle, XSize, YSize, Heading], please note that all values are given in camera angles."; // untranslated
@@ -1428,6 +1427,7 @@ Blockly.Msg.SENSOR_ARM_TOOLTIP = "Returns true, if the selected part of the arm
14281427
Blockly.Msg.SENSOR_BATTERY = "battery charge"; // untranslated
14291428
Blockly.Msg.SENSOR_BOTTOM = "bottom"; // untranslated
14301429
Blockly.Msg.SENSOR_CALIBRATE = "calibrate"; // untranslated
1430+
Blockly.Msg.SENSOR_CAMERA = "camera"; // untranslated
14311431
Blockly.Msg.SENSOR_CODE = "code pad"; // untranslated
14321432
Blockly.Msg.SENSOR_COLOUR = "colour sensor"; // untranslated
14331433
Blockly.Msg.SENSOR_COLOURTCS3472 = "colour sensor TCS3472"; // untranslated

‎msg/js/ba.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,6 @@ Blockly.Msg.NAO_APPLYPOSTURE_TOOLTIP = "Robot will take the selected posture or
965965
Blockly.Msg.NAO_AUTONOMOUS = "turn autonomous behaviour"; // untranslated
966966
Blockly.Msg.NAO_AUTONOMOUS_TOOLTIP = "Turn the robots autonomous behaviour on or off. While 'on' the robot will react to sounds, move slightly from side to side and try to track faces. Turn it off if this behaviour interrupts your program."; // untranslated
967967
Blockly.Msg.NAO_BLINK = "blink"; // untranslated
968-
Blockly.Msg.NAO_CAMERA = "camera"; // untranslated
969968
Blockly.Msg.NAO_CAMERA_BOTTOM = "bottom"; // untranslated
970969
Blockly.Msg.NAO_CAMERA_TOP = "top"; // untranslated
971970
Blockly.Msg.NAO_FACE_GET_INFORMATION_TOOLTIP = "Returns additional information about the given detected in an array with following values: [XAngle, YAngle, XSize, YSize, Heading], please note that all values are given in camera angles."; // untranslated
@@ -1428,6 +1427,7 @@ Blockly.Msg.SENSOR_ARM_TOOLTIP = "Returns true, if the selected part of the arm
14281427
Blockly.Msg.SENSOR_BATTERY = "battery charge"; // untranslated
14291428
Blockly.Msg.SENSOR_BOTTOM = "bottom"; // untranslated
14301429
Blockly.Msg.SENSOR_CALIBRATE = "calibrate"; // untranslated
1430+
Blockly.Msg.SENSOR_CAMERA = "camera"; // untranslated
14311431
Blockly.Msg.SENSOR_CODE = "code pad"; // untranslated
14321432
Blockly.Msg.SENSOR_COLOUR = "colour sensor"; // untranslated
14331433
Blockly.Msg.SENSOR_COLOURTCS3472 = "colour sensor TCS3472"; // untranslated

‎msg/js/bcc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,6 @@ Blockly.Msg.NAO_APPLYPOSTURE_TOOLTIP = "Robot will take the selected posture or
965965
Blockly.Msg.NAO_AUTONOMOUS = "turn autonomous behaviour"; // untranslated
966966
Blockly.Msg.NAO_AUTONOMOUS_TOOLTIP = "Turn the robots autonomous behaviour on or off. While 'on' the robot will react to sounds, move slightly from side to side and try to track faces. Turn it off if this behaviour interrupts your program."; // untranslated
967967
Blockly.Msg.NAO_BLINK = "blink"; // untranslated
968-
Blockly.Msg.NAO_CAMERA = "camera"; // untranslated
969968
Blockly.Msg.NAO_CAMERA_BOTTOM = "bottom"; // untranslated
970969
Blockly.Msg.NAO_CAMERA_TOP = "top"; // untranslated
971970
Blockly.Msg.NAO_FACE_GET_INFORMATION_TOOLTIP = "Returns additional information about the given detected in an array with following values: [XAngle, YAngle, XSize, YSize, Heading], please note that all values are given in camera angles."; // untranslated
@@ -1428,6 +1427,7 @@ Blockly.Msg.SENSOR_ARM_TOOLTIP = "Returns true, if the selected part of the arm
14281427
Blockly.Msg.SENSOR_BATTERY = "battery charge"; // untranslated
14291428
Blockly.Msg.SENSOR_BOTTOM = "bottom"; // untranslated
14301429
Blockly.Msg.SENSOR_CALIBRATE = "calibrate"; // untranslated
1430+
Blockly.Msg.SENSOR_CAMERA = "camera"; // untranslated
14311431
Blockly.Msg.SENSOR_CODE = "code pad"; // untranslated
14321432
Blockly.Msg.SENSOR_COLOUR = "colour sensor"; // untranslated
14331433
Blockly.Msg.SENSOR_COLOURTCS3472 = "colour sensor TCS3472"; // untranslated

‎msg/js/be-tarask.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,6 @@ Blockly.Msg.NAO_APPLYPOSTURE_TOOLTIP = "Robot will take the selected posture or
965965
Blockly.Msg.NAO_AUTONOMOUS = "turn autonomous behaviour"; // untranslated
966966
Blockly.Msg.NAO_AUTONOMOUS_TOOLTIP = "Turn the robots autonomous behaviour on or off. While 'on' the robot will react to sounds, move slightly from side to side and try to track faces. Turn it off if this behaviour interrupts your program."; // untranslated
967967
Blockly.Msg.NAO_BLINK = "blink"; // untranslated
968-
Blockly.Msg.NAO_CAMERA = "camera"; // untranslated
969968
Blockly.Msg.NAO_CAMERA_BOTTOM = "bottom"; // untranslated
970969
Blockly.Msg.NAO_CAMERA_TOP = "top"; // untranslated
971970
Blockly.Msg.NAO_FACE_GET_INFORMATION_TOOLTIP = "Returns additional information about the given detected in an array with following values: [XAngle, YAngle, XSize, YSize, Heading], please note that all values are given in camera angles."; // untranslated
@@ -1428,6 +1427,7 @@ Blockly.Msg.SENSOR_ARM_TOOLTIP = "Returns true, if the selected part of the arm
14281427
Blockly.Msg.SENSOR_BATTERY = "battery charge"; // untranslated
14291428
Blockly.Msg.SENSOR_BOTTOM = "bottom"; // untranslated
14301429
Blockly.Msg.SENSOR_CALIBRATE = "calibrate"; // untranslated
1430+
Blockly.Msg.SENSOR_CAMERA = "camera"; // untranslated
14311431
Blockly.Msg.SENSOR_CODE = "code pad"; // untranslated
14321432
Blockly.Msg.SENSOR_COLOUR = "colour sensor"; // untranslated
14331433
Blockly.Msg.SENSOR_COLOURTCS3472 = "colour sensor TCS3472"; // untranslated

‎msg/js/be.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,6 @@ Blockly.Msg.NAO_APPLYPOSTURE_TOOLTIP = "Робат абярэ зададдзен
965965
Blockly.Msg.NAO_AUTONOMOUS = "уключэнне аўтаномных паводзінаў";
966966
Blockly.Msg.NAO_AUTONOMOUS_TOOLTIP = "Уключае альбо выключае аўтаномныя паводзіны робата. Ва ўключаным стане робат будзе распазнаваць твары, рэагаваць на гукі і рухацца з боку ў бок. Выключыце гэтыя паводзіны, калі яны перашкаджаюць выкананню Вашай праграмы.";
967967
Blockly.Msg.NAO_BLINK = "міргаць";
968-
Blockly.Msg.NAO_CAMERA = "camera"; // untranslated
969968
Blockly.Msg.NAO_CAMERA_BOTTOM = "ніз";
970969
Blockly.Msg.NAO_CAMERA_TOP = "верх";
971970
Blockly.Msg.NAO_FACE_GET_INFORMATION_TOOLTIP = "Вяртае дадатковую інфармацыю аб зададзеным распазнаным твары ў выглядзе масіва значэнняў: [XAngle, YAngle, XSize, YSize, Heading] усе значэнні зададзены ў кутах камеры.";
@@ -1428,6 +1427,7 @@ Blockly.Msg.SENSOR_ARM_TOOLTIP = "Вяртае значэнне ісціна, к
14281427
Blockly.Msg.SENSOR_BATTERY = "Напружанне ";
14291428
Blockly.Msg.SENSOR_BOTTOM = "ніжні";
14301429
Blockly.Msg.SENSOR_CALIBRATE = "калібраваць";
1430+
Blockly.Msg.SENSOR_CAMERA = "камера";
14311431
Blockly.Msg.SENSOR_CODE = "кодавая клавіатура";
14321432
Blockly.Msg.SENSOR_COLOUR = "датчык колеру";
14331433
Blockly.Msg.SENSOR_COLOURTCS3472 = "colour sensor TCS3472"; // untranslated

‎msg/js/bg.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,6 @@ Blockly.Msg.NAO_APPLYPOSTURE_TOOLTIP = "Robot will take the selected posture or
965965
Blockly.Msg.NAO_AUTONOMOUS = "turn autonomous behaviour"; // untranslated
966966
Blockly.Msg.NAO_AUTONOMOUS_TOOLTIP = "Turn the robots autonomous behaviour on or off. While 'on' the robot will react to sounds, move slightly from side to side and try to track faces. Turn it off if this behaviour interrupts your program."; // untranslated
967967
Blockly.Msg.NAO_BLINK = "blink"; // untranslated
968-
Blockly.Msg.NAO_CAMERA = "camera"; // untranslated
969968
Blockly.Msg.NAO_CAMERA_BOTTOM = "bottom"; // untranslated
970969
Blockly.Msg.NAO_CAMERA_TOP = "top"; // untranslated
971970
Blockly.Msg.NAO_FACE_GET_INFORMATION_TOOLTIP = "Returns additional information about the given detected in an array with following values: [XAngle, YAngle, XSize, YSize, Heading], please note that all values are given in camera angles."; // untranslated
@@ -1428,6 +1427,7 @@ Blockly.Msg.SENSOR_ARM_TOOLTIP = "Returns true, if the selected part of the arm
14281427
Blockly.Msg.SENSOR_BATTERY = "battery charge"; // untranslated
14291428
Blockly.Msg.SENSOR_BOTTOM = "bottom"; // untranslated
14301429
Blockly.Msg.SENSOR_CALIBRATE = "calibrate"; // untranslated
1430+
Blockly.Msg.SENSOR_CAMERA = "camera"; // untranslated
14311431
Blockly.Msg.SENSOR_CODE = "code pad"; // untranslated
14321432
Blockly.Msg.SENSOR_COLOUR = "colour sensor"; // untranslated
14331433
Blockly.Msg.SENSOR_COLOURTCS3472 = "colour sensor TCS3472"; // untranslated

0 commit comments

Comments
 (0)