]> wolfpit.net Git - hardware/fuck_tomatoes/.git/commitdiff
Ready for blob detection integration tests
authorunknown <michaelreeves808@gmail.com>
Mon, 25 Feb 2019 08:30:58 +0000 (00:30 -0800)
committerunknown <michaelreeves808@gmail.com>
Mon, 25 Feb 2019 08:30:58 +0000 (00:30 -0800)
FuckTomato.py
Printer.pyc
Tests.py
User_Interface/Buttons.py
User_Interface/Buttons.pyc
common.py [deleted file]

index c28f6b451c8d05ad6ac78fa250c3c6b8d5c0f27f..5da8b0fd76d993eec33dea2af9be5a5bf6e1d562 100644 (file)
@@ -1,27 +1,33 @@
 import cv2, sys, Printer, time
 from User_Interface import Draw, MouseManager, Buttons
 
-start_time = time.time()
-
 cap = cv2.VideoCapture(0)
 cv2.namedWindow('image')
 printer = Printer.Printer('COM4', (200, 200))
 mouse = MouseManager.MouseManager(printer)
 
+start_time = time.time()
+
 while 1:
-       ret, frame = cap.read()
-       Draw.drawImage(frame, printer)
-       cv2.imshow('image', frame)
+       ret, img = cap.read()
+
+       colorMask = MaskProcessing.GetColorMask(img, sliders)
+       processedImg = MaskProcessing.ProcessImageMask(colorMask, img, sliders)
 
        if time.time() - start_time > 8:
-               res = printer.packageIsExecuting()
-               if not res:
-                       print(res)
-       #if not printer.packageIsExecuting():
-               # ...Detection and package send... #
-               #After g-code package send, check for XY reset and update printer execution status
-               #pass
+               if not printer.packageIsExecuting():
+                       print('PRINTER HOMED')
+                       keyPoints = detector.detect(processedImg)
+                       points = [xy.pt for xy in keyPoints]
+                       print('-------PACKAGE COUNT: %d-------'%(len(points)))
+                       print(Gcode.buildGcodePackage(points, (200, 200), False))
+
+       Draw.drawImage(img, printer)
+    cv2.imshow('image', processedImg)
+    cv2.imshow('color', colorMask)
+    cv2.imshow('cum', img)
 
+       #Add sliders to args
        if Buttons.checkButtons(printer): break
 
 cap.release()
index 1f198c538c6f79ec6a3a00557a7c331508415aab..3a73216708da44f5e9436004f347bfd404915b1b 100644 (file)
Binary files a/Printer.pyc and b/Printer.pyc differ
index 5883907cacffd78cd0e3194c45f1ad8bbc69a1af..5aa2c4d854ced4760f58873feadf91557bcdad4e 100644 (file)
--- a/Tests.py
+++ b/Tests.py
@@ -4,10 +4,8 @@ from utils import Gcode, Detector, MaskProcessing
 from User_Interface import Sliders
 
 cap = cv2.VideoCapture(0)
-
 detector = Detector.InitializeBlobDetector()
 cv2.namedWindow('image')
-
 sliders = Sliders.Sliders('image')
 
 while 1:
@@ -16,14 +14,16 @@ while 1:
     colorMask = MaskProcessing.GetColorMask(img, sliders)
     res = MaskProcessing.ProcessImageMask(colorMask, img, sliders)
 
-    points = detector.detect(res)
-    img = cv2.drawKeypoints(img, points, np.array([]), (255, 0, 0), cv2.DRAW_MATCHES_FLAGS_DRAW_RICH_KEYPOINTS)
+    keyPoints = detector.detect(res)
+    img = cv2.drawKeypoints(img, keyPoints, np.array([]), (255, 0, 0), cv2.DRAW_MATCHES_FLAGS_DRAW_RICH_KEYPOINTS)
+    
+    points = [xy.pt for xy in keyPoints]
+    print('-------PACKAGE COUNT: %d-------'%(len(points)))
+    print(Gcode.buildGcodePackage(points, (200, 200), False))
 
     cv2.imshow('image', res)
-    cv2.imshow('cum', img)
     cv2.imshow('color', colorMask)
+    cv2.imshow('cum', img)
 
     command = cv2.waitKey(10) & 0xFF
-    if command == ord('q'):
-        break
-
+    if command == ord('q'): break
\ No newline at end of file
index 7e8d8e2f028c9d3209fe7244b52c22c6e7655bf9..5b650ea5af7c136a1078531f364db51abe16f848 100644 (file)
@@ -1,6 +1,6 @@
 import cv2
 
-def checkButtons(printer):
+def checkButtons(printer, sliders):
        command = cv2.waitKey(10) & 0xFF
        if command == ord('q'):
                printer.settings.saveSettings()
index 9bc8c3931e4b0ab543592902f511ba169cb5c4e9..70b21bb253738c41878146408828ac394b15a1a7 100644 (file)
Binary files a/User_Interface/Buttons.pyc and b/User_Interface/Buttons.pyc differ
diff --git a/common.py b/common.py
deleted file mode 100644 (file)
index 1dd46bd..0000000
--- a/common.py
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/usr/bin/env python
-
-'''
-This module contains some common routines used by other samples.
-'''
-
-# Python 2/3 compatibility
-from __future__ import print_function
-import sys
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    from functools import reduce
-
-import numpy as np
-import cv2 as cv
-
-# built-in modules
-import os
-import itertools as it
-from contextlib import contextmanager
-
-image_extensions = ['.bmp', '.jpg', '.jpeg', '.png', '.tif', '.tiff', '.pbm', '.pgm', '.ppm']
-
-class Bunch(object):
-    def __init__(self, **kw):
-        self.__dict__.update(kw)
-    def __str__(self):
-        return str(self.__dict__)
-
-def splitfn(fn):
-    path, fn = os.path.split(fn)
-    name, ext = os.path.splitext(fn)
-    return path, name, ext
-
-def anorm2(a):
-    return (a*a).sum(-1)
-def anorm(a):
-    return np.sqrt( anorm2(a) )
-
-def homotrans(H, x, y):
-    xs = H[0, 0]*x + H[0, 1]*y + H[0, 2]
-    ys = H[1, 0]*x + H[1, 1]*y + H[1, 2]
-    s  = H[2, 0]*x + H[2, 1]*y + H[2, 2]
-    return xs/s, ys/s
-
-def to_rect(a):
-    a = np.ravel(a)
-    if len(a) == 2:
-        a = (0, 0, a[0], a[1])
-    return np.array(a, np.float64).reshape(2, 2)
-
-def rect2rect_mtx(src, dst):
-    src, dst = to_rect(src), to_rect(dst)
-    cx, cy = (dst[1] - dst[0]) / (src[1] - src[0])
-    tx, ty = dst[0] - src[0] * (cx, cy)
-    M = np.float64([[ cx,  0, tx],
-                    [  0, cy, ty],
-                    [  0,  0,  1]])
-    return M
-
-
-def lookat(eye, target, up = (0, 0, 1)):
-    fwd = np.asarray(target, np.float64) - eye
-    fwd /= anorm(fwd)
-    right = np.cross(fwd, up)
-    right /= anorm(right)
-    down = np.cross(fwd, right)
-    R = np.float64([right, down, fwd])
-    tvec = -np.dot(R, eye)
-    return R, tvec
-
-def mtx2rvec(R):
-    w, u, vt = cv.SVDecomp(R - np.eye(3))
-    p = vt[0] + u[:,0]*w[0]    # same as np.dot(R, vt[0])
-    c = np.dot(vt[0], p)
-    s = np.dot(vt[1], p)
-    axis = np.cross(vt[0], vt[1])
-    return axis * np.arctan2(s, c)
-
-def draw_str(dst, target, s):
-    x, y = target
-    cv.putText(dst, s, (x+1, y+1), cv.FONT_HERSHEY_PLAIN, 1.0, (0, 0, 0), thickness = 2, lineType=cv.LINE_AA)
-    cv.putText(dst, s, (x, y), cv.FONT_HERSHEY_PLAIN, 1.0, (255, 255, 255), lineType=cv.LINE_AA)
-
-class Sketcher:
-    def __init__(self, windowname, dests, colors_func):
-        self.prev_pt = None
-        self.windowname = windowname
-        self.dests = dests
-        self.colors_func = colors_func
-        self.dirty = False
-        self.show()
-        cv.setMouseCallback(self.windowname, self.on_mouse)
-
-    def show(self):
-        cv.imshow(self.windowname, self.dests[0])
-
-    def on_mouse(self, event, x, y, flags, param):
-        pt = (x, y)
-        if event == cv.EVENT_LBUTTONDOWN:
-            self.prev_pt = pt
-        elif event == cv.EVENT_LBUTTONUP:
-            self.prev_pt = None
-
-        if self.prev_pt and flags & cv.EVENT_FLAG_LBUTTON:
-            for dst, color in zip(self.dests, self.colors_func()):
-                cv.line(dst, self.prev_pt, pt, color, 5)
-            self.dirty = True
-            self.prev_pt = pt
-            self.show()
-
-
-# palette data from matplotlib/_cm.py
-_jet_data =   {'red':   ((0., 0, 0), (0.35, 0, 0), (0.66, 1, 1), (0.89,1, 1),
-                         (1, 0.5, 0.5)),
-               'green': ((0., 0, 0), (0.125,0, 0), (0.375,1, 1), (0.64,1, 1),
-                         (0.91,0,0), (1, 0, 0)),
-               'blue':  ((0., 0.5, 0.5), (0.11, 1, 1), (0.34, 1, 1), (0.65,0, 0),
-                         (1, 0, 0))}
-
-cmap_data = { 'jet' : _jet_data }
-
-def make_cmap(name, n=256):
-    data = cmap_data[name]
-    xs = np.linspace(0.0, 1.0, n)
-    channels = []
-    eps = 1e-6
-    for ch_name in ['blue', 'green', 'red']:
-        ch_data = data[ch_name]
-        xp, yp = [], []
-        for x, y1, y2 in ch_data:
-            xp += [x, x+eps]
-            yp += [y1, y2]
-        ch = np.interp(xs, xp, yp)
-        channels.append(ch)
-    return np.uint8(np.array(channels).T*255)
-
-def nothing(*arg, **kw):
-    pass
-
-def clock():
-    return cv.getTickCount() / cv.getTickFrequency()
-
-@contextmanager
-def Timer(msg):
-    print(msg, '...',)
-    start = clock()
-    try:
-        yield
-    finally:
-        print("%.2f ms" % ((clock()-start)*1000))
-
-class StatValue:
-    def __init__(self, smooth_coef = 0.5):
-        self.value = None
-        self.smooth_coef = smooth_coef
-    def update(self, v):
-        if self.value is None:
-            self.value = v
-        else:
-            c = self.smooth_coef
-            self.value = c * self.value + (1.0-c) * v
-
-class RectSelector:
-    def __init__(self, win, callback):
-        self.win = win
-        self.callback = callback
-        cv.setMouseCallback(win, self.onmouse)
-        self.drag_start = None
-        self.drag_rect = None
-    def onmouse(self, event, x, y, flags, param):
-        x, y = np.int16([x, y]) # BUG
-        if event == cv.EVENT_LBUTTONDOWN:
-            self.drag_start = (x, y)
-            return
-        if self.drag_start:
-            if flags & cv.EVENT_FLAG_LBUTTON:
-                xo, yo = self.drag_start
-                x0, y0 = np.minimum([xo, yo], [x, y])
-                x1, y1 = np.maximum([xo, yo], [x, y])
-                self.drag_rect = None
-                if x1-x0 > 0 and y1-y0 > 0:
-                    self.drag_rect = (x0, y0, x1, y1)
-            else:
-                rect = self.drag_rect
-                self.drag_start = None
-                self.drag_rect = None
-                if rect:
-                    self.callback(rect)
-    def draw(self, vis):
-        if not self.drag_rect:
-            return False
-        x0, y0, x1, y1 = self.drag_rect
-        cv.rectangle(vis, (x0, y0), (x1, y1), (0, 255, 0), 2)
-        return True
-    @property
-    def dragging(self):
-        return self.drag_rect is not None
-
-
-def grouper(n, iterable, fillvalue=None):
-    '''grouper(3, 'ABCDEFG', 'x') --> ABC DEF Gxx'''
-    args = [iter(iterable)] * n
-    if PY3:
-        output = it.zip_longest(fillvalue=fillvalue, *args)
-    else:
-        output = it.izip_longest(fillvalue=fillvalue, *args)
-    return output
-
-def mosaic(w, imgs):
-    '''Make a grid from images.
-
-    w    -- number of grid columns
-    imgs -- images (must have same size and format)
-    '''
-    imgs = iter(imgs)
-    if PY3:
-        img0 = next(imgs)
-    else:
-        img0 = imgs.next()
-    pad = np.zeros_like(img0)
-    imgs = it.chain([img0], imgs)
-    rows = grouper(w, imgs, pad)
-    return np.vstack(map(np.hstack, rows))
-
-def getsize(img):
-    h, w = img.shape[:2]
-    return w, h
-
-def mdot(*args):
-    return reduce(np.dot, args)
-
-def draw_keypoints(vis, keypoints, color = (0, 255, 255)):
-    for kp in keypoints:
-        x, y = kp.pt
-        cv.circle(vis, (int(x), int(y)), 2, color)
\ No newline at end of file