From 68c1f4dc1a6a0584e46138e98a89ad90b5b173c7 Mon Sep 17 00:00:00 2001
From: Cole Deck <cd109876@gmail.com>
Date: Fri, 6 Mar 2020 10:38:12 -0600
Subject: [PATCH] Update magic numbers to be more consistent

---
 __pycache__/detect.cpython-38.pyc | Bin 6366 -> 6524 bytes
 detect.py                         |  24 +++++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/__pycache__/detect.cpython-38.pyc b/__pycache__/detect.cpython-38.pyc
index 5e1785c9527e1ac0b25a41e393b56636808150a7..8c6053a9be649ce02c75ca1146f6518ddd97113f 100644
GIT binary patch
delta 769
zcmah{O=wd=5Z-zJ`9&}`4JsrhD$!`0C{%*Ag3^FuJ%|VoDx}$%hV;Fpla12)o;l>K
z2=C%a8V}wzr(VRPCn+9t@ZO7vco0!=Hc_lz++n`?zI{8xyxILw_+E_Pip9c=*5?PS
zcW#$n#vf|%cKAqJS7B-R&3vbw6N_G?4}Q+e@u{Zr#KOD3clg})CGYeAc!A>V0Fulv
zds#a1Jopm5ANfcbrzj(YMsP2df#bo`*fCfOUdMXyCb$^ifzj}5d`E{D!&ixGpjZ(6
zIJA<!O3hS3w)AV66fN@0<efYOTT>@{T=6xo`nu4#!nM9~g{_?N4Xz7)+u(+$ct(m1
zlmsJf3U#9UFn|P;`~ur3?aO@T8=k?<riSl@B|?+aTuCu*9cF#tR)TPnN9RIK6??lx
zfXJ?=^RNgDRak%0`XDXI=9#Z=h<{3kWHBDuSMvWAA|mW5vL-MQ@$^2FfqD8(mWwX$
z88j7?<H8vUDG5gj>g2ROEuuyN<pB32+fwpr%n->%u^70?Z0{@y+p4zOo1I48we|H@
zy)cJIXcy(nz*z|;f}Cla)s`z-UBv68?a*4+X*o4lbnK{8sW+<2U1zn1g}+pBq`4KR
zHi8D~veFpFT`!Pyph35qCB`63b^x@o#UT%Iupmu4GisVVs#<_DC3g_#DWF1N>u%R+
rZ{m5$tqRuL73|coD8I}98fl{8)No1aa!{E*VaVr&3&G>*8<6=4;6blh

delta 563
zcmYjO&ubGw6rQ&`limE-Rdh*>ifllU)ly6jRwZ~*3tFgx^s>-mnhkMDb~l}!P%4||
zuwDgWZk}53AJAN^2hod1|9~7k3ZA`5QQyQ0zTtiEeQ(~!d(0d)zc%c3%PJAH2jSLc
z|Hd18kHW|43p&u@_VlOmg_bfesP?s&Cf}5^N*!LwqsmVC8&<E*tH0!)Rfh|5-?{`(
z<Y#LF@8pVo2>#m>hYVg%-#e=yjp~MbABS{6jXJghMg#p0disIL=hZ6{K?5z&bL}qK
zSQ^uS3btPeSf*vPMh-NGAUA~mm*;Q*4pDiFY&ZW?x?`Fh_bijKE=*DUr^o@w_8=&X
zS;j<Bltekx1Fc2^;~dE$s2dK398kuDnK9L#vB$(S*S@QDImk~7Rp(i8J?_WJPJGMd
z7M8sVZ^$1D7bi_5zS&8JyJ^^qeKtsXjcfd-QZ6YtuRuMwSMZHa5{qQS`6_b1_;eH{
zQ8yN;Uyj<nu(LLbwz_-<;f%)ZsLPp>&SAbt3+Vt~Gd+t5ffAmR@Q8v9i<%7;IHgf=
z!33@vz0>?U2CgCaEFML}UB0Yxv(0<MHcz{}q3+fCGb%zHcTe#Z`TNY}g8De#l8d#6
G;Qj&O27-V9

diff --git a/detect.py b/detect.py
index 6bd1ab0..6169dbb 100644
--- a/detect.py
+++ b/detect.py
@@ -319,6 +319,7 @@ def detect(calibration_width, img_file, show, quick):
         # cv2.putText(orig, "{:.5f}in".format(itemhr),
         #	(int(trbrX + 20), int(trbrY)), cv2.FONT_HERSHEY_SIMPLEX,
         #	0.65, (255, 255, 255), 2)
+        #objtype = magicSort(c)
         if objtype == "Unknown":
             objtype = magicSort(c)
             output = "{:.2f}in".format(itemw) + " x {:.2f}in".format(itemh)
@@ -364,16 +365,25 @@ def detect(calibration_width, img_file, show, quick):
 def magicSort(contour):
     moments = cv2.moments(contour)
     humoments = cv2.HuMoments(moments)
-    humoments[6] = abs(humoments[6]) #it's possible for the last number to change sign if item is mirrored
-    magicNumber = 0
+    #humoments[6] = abs(humoments[6]) #it's possible for the last number to change sign if item is mirrored
+    #magicNumber1 = 0
+    #magicNumber2 = 0
+    name = "Unknown"
     for i in range(0,7):
 	    humoments[i] = -1 * math.copysign(1.0, humoments[i]) * math.log10(abs(humoments[i]))
-        
     for i in range(0,7):
-        magicNumber += humoments[i]
-        print(str(humoments[i]))
+        if i > 1:
+            humoments[i] = int(round(humoments[i][0] / 8) * 8)
+            if i != 4 and i != 6:
+                name += ", " + str(abs(int(humoments[i][0])))
+            #magicNumber1 += abs(humoments[i][0])
+        else:
+            humoments[i] = int(round(humoments[i][0] * 4) * 16)
+            name += ", " + str(abs(int(humoments[i][0])))
+            #magicNumber2 += abs(humoments[i][0])
+        #magicNumber += humoments[i][0]           
+    print(str(humoments))
     #print(magicNumber)
-    name = "Unknown: "
-    name += str(int(round(magicNumber[0] / 2) * 2))
+    #name = "Unknown: " + str(int(magicNumber1)) + ", " + str(int(magicNumber2))
     print(name)
     return name
\ No newline at end of file