Skip to content

Commit 26f460f

Browse files
committed
-
1 parent 5736c3b commit 26f460f

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

data/program_find_color.data

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"dom_code": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"><block type=\"controls_whileUntil\" x=\"1\" y=\"90\"><field name=\"MODE\">WHILE</field><value name=\"BOOL\"><block type=\"logic_boolean\"><field name=\"BOOL\">TRUE</field></block></value><statement name=\"DO\"><block type=\"text_print\"><value name=\"TEXT\"><block type=\"coderbot_adv_findColor\"><field name=\"RETVAL\">DIST</field><value name=\"COLOR\"><block type=\"colour_rgb\"><value name=\"RED\"><block type=\"math_number\"><field name=\"NUM\">124</field></block></value><value name=\"GREEN\"><block type=\"math_number\"><field name=\"NUM\">50</field></block></value><value name=\"BLUE\"><block type=\"math_number\"><field name=\"NUM\">74</field></block></value></block></value></block></value></block></statement></block></xml>", "code": "def colour_rgb(r, g, b):\n r = round(min(100, max(0, r)) * 2.55)\n g = round(min(100, max(0, g)) * 2.55)\n b = round(min(100, max(0, b)) * 2.55)\n return '#%02x%02x%02x' % (r, g, b)\n\n\nwhile True:\n get_prog_eng().check_end()\n get_cam().set_text(get_cam().find_color(colour_rgb(124, 50, 74))[0])\n", "name": "find_color"}
1+
{"dom_code": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"><block type=\"controls_whileUntil\" x=\"1\" y=\"90\"><field name=\"MODE\">WHILE</field><value name=\"BOOL\"><block type=\"logic_boolean\"><field name=\"BOOL\">TRUE</field></block></value><statement name=\"DO\"><block type=\"text_print\"><value name=\"TEXT\"><block type=\"coderbot_adv_findColor\"><field name=\"RETVAL\">DIST</field><value name=\"COLOR\"><block type=\"text\"><field name=\"TEXT\">#000500</field></block></value></block></value></block></statement></block></xml>", "code": "while True:\n get_prog_eng().check_end()\n get_cam().set_text(get_cam().find_color('#000500')[0])\n", "name": "find_color"}

static/js/control.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ $(document).on( "pagecreate", '#page-control', function( event ) {
9797
canvas.height = img.height();
9898
canvas.getContext('2d').drawImage(img.get(0), 0, 0, img.width(), img.height());
9999
var pixelData = canvas.getContext('2d').getImageData(x, y, 1, 1).data;
100-
var colorHex = "0x" + paddedHexString(pixelData[0]) + paddedHexString(pixelData[1]) + paddedHexString(pixelData[2]);
100+
var colorHex = "#" + paddedHexString(pixelData[0]) + paddedHexString(pixelData[1]) + paddedHexString(pixelData[2]);
101101
alert("Color at point: " + colorHex);
102102
});
103103
$( ".photopopup" ).on({

viz/image.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,12 @@ def binarize(self, threshold = -1):
138138

139139
def find_blobs(self, minsize=0, maxsize=10000000):
140140
blobs = []
141-
image, contours, hyerarchy = cv2.findContours(self._data, cv2.RETR_LIST, cv2.CHAIN_APPROX_SIMPLE)
141+
image = contours = hyerarchy = None
142+
if "2.4" in cv2.__version__:
143+
contours, hyerarchy = cv2.findContours(self._data, cv2.RETR_LIST, cv2.CHAIN_APPROX_SIMPLE)
144+
else:
145+
image, contours, hyerarchy = cv2.findContours(self._data, cv2.RETR_LIST, cv2.CHAIN_APPROX_SIMPLE)
146+
142147
for c in contours:
143148
area = cv2.contourArea(c)
144149
if area > minsize and area < maxsize:

0 commit comments

Comments
 (0)