Fix indentation, compile

4 years ago · fa15964b98
parent 68c1f4dc1a
commit fa15964b98
15 changed files with 5063 additions and 4426 deletions
--- a/pycache/compile.cpython-36.pyc
+++ b/pycache/compile.cpython-36.pyc
--- a/pycache/control_motor.cpython-36.pyc
+++ b/pycache/control_motor.cpython-36.pyc
--- a/pycache/control_pixel.cpython-36.pyc
+++ b/pycache/control_pixel.cpython-36.pyc
--- a/pycache/detect.cpython-36.pyc
+++ b/pycache/detect.cpython-36.pyc
--- a/pycache/main.cpython-36.pyc
+++ b/pycache/main.cpython-36.pyc
--- a/pycache/pi_client.cpython-36.pyc
+++ b/pycache/pi_client.cpython-36.pyc
--- a/pycache/pixel.cpython-36.pyc
+++ b/pycache/pixel.cpython-36.pyc
--- a/pycache/run_detect.cpython-36.pyc
+++ b/pycache/run_detect.cpython-36.pyc
--- a/pycache/sort.cpython-36.pyc
+++ b/pycache/sort.cpython-36.pyc
--- a/build/lib.linux-x86_64-3.8/detect.cpython-38-x86_64-linux-gnu.so
+++ b/build/lib.linux-x86_64-3.8/detect.cpython-38-x86_64-linux-gnu.so
--- a/build/temp.linux-x86_64-3.8/detect.o
+++ b/build/temp.linux-x86_64-3.8/detect.o
--- a/detect.c
+++ b/detect.c
--- a/detect.cpython-38-x86_64-linux-gnu.so
+++ b/detect.cpython-38-x86_64-linux-gnu.so
--- a/detect.py
+++ b/detect.py
@ -370,8 +370,7 @@ def magicSort(contour):
    #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):
+        humoments[i] = -1 * math.copysign(1.0, humoments[i]) * math.log10(abs(humoments[i]))
        if i > 1:
            humoments[i] = int(round(humoments[i][0] / 8) * 8)
            if i != 4 and i != 6:
--- a/run_detect.py
+++ b/run_detect.py
@ -10,7 +10,7 @@ calibration_width = 0.75
 image = "img7.jpg"
 images = ("img2.jpg", "img3.jpg", "img4.jpg", "img5.jpg", "img6.jpg", "img7.jpg", "img8.jpg")
 #images = ("img.jpg", "img2.jpg")
-video = True
+video = False
 def go():
    for file in images:
        items,output = detect.detect(calibration_width, file, True, False)