From 574bf7050cbd2a565bd0f36544d899dc9698f1a7 Mon Sep 17 00:00:00 2001
From: Cole Deck <cd109876@gmail.com>
Date: Fri, 13 Dec 2019 09:30:11 -0600
Subject: [PATCH] video capture and detection working now

---
 __pycache__/detect.cpython-38.pyc | Bin 5881 -> 5898 bytes
 detect.py                         |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/__pycache__/detect.cpython-38.pyc b/__pycache__/detect.cpython-38.pyc
index 66e3f488ae2a59ad824f700ec596ea04a2e576d9..46ef21019f72eb15b21a43679782490f2ed42e54 100644
GIT binary patch
delta 781
zcmZva%WD%+6vpSyqZ5-%Qqw#e^O)M2Op{C|&stlt71M=w;l_>NqHtQPp`lEt3*inC
z0t$i<xKI#WG#i(SCVzx0*CK+rvpYdI?mRO|p%rIw=AQ5T&OIN8`=|6mSMDi_m&32{
z_Sb`-@0A@{3JoN}G2NRYGi(!Mn2lsrh(MHmmKUU$twDUqdtQ-l0*HeGN|r$jwAkbA
z5-r&})nRs-vvsRN^&T1LDJL&as4^|v1~njpl!26il$#@E(D}Y(KEpebZQeP-B^)W*
zl|Jcwz}l3VwRD;R5(;zlLXv|Nq<exRLxvT-nX&6`_$6=W5zK>_;2;a?m~j;emAP{Y
zLFMwP0`s=!4q9~vxic2virc>mIW!ZptCo0Nr9N7P;6SizmiV|vYY>1uPOW3D#(sEH
z5hR@jVV<LYtWQG%LTuKjM%1>5j(^i7SZs6sse?~+4wA#WzC$8ZfUu8#wOfsIJz~i;
zO*1hLYB9`qcpS6_b<lA0GT}M~UVVf5EkZSyy#)=2!>-o<J0NavP|aSX8pLqB9`h?S
zkJo8wKwt^~<pGIt4gm$WtHj7v_EbrdCVQ=v@0|Cue8$f;^dq@`ieo=?109_8@(<0T
zfd*M&n}H+#L}1?n+O#H^X?%nxnFJ;WcbOGb*_+_X#Yyp`drAzy2S)<Q4v%I={Ph;9
zTF9(BMIOU_sdKou|HN!KXU~@TaDU4@*ftHP-o)@lv>xqko9j+~lRb~-NQ=FT-u?^o
C#?1r(

delta 764
zcmZuvJ#W)c6!r5*6Vf<=d^Qb<o6;t6o7hgAP>M=vrO*L7u&^L8RJv_}s8Qv*1JbjC
z6v2Rm6zNF_B!)%|3`~&x07fQegxG<F0a)0$&jG1Lc(}gj+;iVKdU}tHUsd&ns)hvo
zR$u+N_3gE~6Hv%NAp$c(ITB-=SmSIIC`buNvJZiICFSXm9*V(dq<aPwE(N4qi!Rbi
zPxPv^>KW94sb#@4+!{4{WQ=nhn}1X$H9d=3kU*7%DhpLUMwLb9`ik=q&&aez-oZ3l
z%3iHcI&W|`;mo)O)qunj0zH)#APZ-E5~m@@Dj{v0x*LBidSw)rLCy$}2W_nJ83mb{
z6AVG7@RxyEPxp;hxRLL14(9y*6`02`MX&D4M|C<$>ku7Cp6$waZE8aVO6c0ana#e0
za>+6j`2`^^(J;<W1Mafv$wE?V%b55lU4n(S(4RPXPiG-BygqqIB)nDjE?nr=ri31G
z12j*yv;g%qq8$;9*1(1`kU@Y59Se`XOv5gry02|PgX?hX%KtYY?QKxqTcA3m@OFdF
zCukn6)9Qf0dHkCLk`}lE7TIkzO_tbwHA|Z8xoTcJndic>Jj<9z@$*#1dFTcvIG*Jn
zHA_XB<RaUQJYk<BMV625DqkghgX}@H5YZ(kkG(_u!d^sIhu@<kiD<)@@sW6`g|r@X
zY(5pS+*CS;d;9mC2JeGg&hGw}bFl50eBQ+JQFia_Z98imud}DA5^1rwsjI&M<%P<l

diff --git a/detect.py b/detect.py
index 4f62c97..925198a 100644
--- a/detect.py
+++ b/detect.py
@@ -164,7 +164,7 @@ def detect(calibration_width, img_file, show, quick):
             cv2.drawContours(orig, [box.astype("int")], -1, (0, 255, 0), 2)
         else:
             circular = True
-            cv2.circle(orig, (int(x), int(y)), int(radius), (0, 255, 0), 2)
+            cv2.circle(orig, (int(x), int(y)), int(radius), (0, 255, 0), 3)
             mask = np.zeros(gray.shape, np.uint8)
             cv2.drawContours(mask, [c], 0, 255, -1)
             #pixelpoints = np.transpose(np.nonzero(mask))
@@ -246,7 +246,7 @@ def detect(calibration_width, img_file, show, quick):
                 #cv2.drawContours(orig, [box.astype("int")], -1, (0, 255, 0), 2)
             else:
                 circular = True
-                cv2.circle(orig, (int(x), int(y)), int(radius), (0, 255, 0), 1)
+                cv2.circle(orig, (int(x), int(y)), int(radius), (255, 0, 0), 2)
 
             objtype = "Unknown"
             itemw = larger(dimA, dimB)
@@ -321,7 +321,7 @@ def detect(calibration_width, img_file, show, quick):
                 swap(ypos, ypos2)
             if rectangular:
                 cv2.line(orig, (int(xpos), int(ypos)),
-                         (int(xpos2), int(ypos2)), (0, 255, 0), 1)
+                         (int(xpos2), int(ypos2)), (255, 127, 0), 2)
             # print(str(iteml))
             # draw the object sizes on the image
             if show or True: