fixing angles

detect_structures.py

@@ -18,7 +18,7 @@ BISEC_VECTORS = True
 BISEC_CONES = True
 GLOBAL_LINE = True
 BISEC_CONE_ANGLE = 40
-CORRECTION_ANGLE = 20
+CORRECTION_ANGLE = 30
 OVERLAY_ALPHA = 0.2
 BISEC_SKIP_LOWER_LEVELS = False
 OUT_DIR = 'images/out/images_imdahl/main_structure_cones'
@@ -57,7 +57,7 @@ for img_name in images:
     datum.cvInputData = img
     opWrapper.emplaceAndPop([datum])
 
-    # img = datum.cvOutputData
+    img = datum.cvOutputData
     #overlay = img.copy()
 
     #print("poses:"+str(len(datum.poseKeypoints)))

lib/bisection.py

@@ -14,7 +14,15 @@ def getAngle(a,b,c, CORRECTION_ANGLE):
     bc = c - b
     cosine_angle = np.dot(ba, bc) / (np.linalg.norm(ba) * np.linalg.norm(bc))
     angle = np.arccos(cosine_angle)
-    angle = angle - np.deg2rad(CORRECTION_ANGLE)
+    print("angle",angle,np.rad2deg(angle),360-np.rad2deg(angle),180-np.rad2deg(angle)) 
+    # TODO get the angle right....
+    # angle = angle - np.deg2rad(CORRECTION_ANGLE)
+    if(a[0]-b[0]<0): #check wich direction (left/right) the vector should point
+        print("left angle",angle,np.rad2deg(angle))
+        angle = 360 - angle #- np.deg2rad(CORRECTION_ANGLE)
+    else:
+        print("right angle",angle,np.rad2deg(angle))
+        angle = 180 - angle #+ np.deg2rad(CORRECTION_ANGLE)
     return angle
 
 def getGlobalLineAngle(poses, CORRECTION_ANGLE):
@@ -22,10 +30,6 @@ def getGlobalLineAngle(poses, CORRECTION_ANGLE):
 
 def getBisecPoint(a,b,c, CORRECTION_ANGLE):
     angle = getAngle(a,b,c, CORRECTION_ANGLE)
-    if(a[0]-b[0]<0): #check wich direction (left/right) the vector should point
-        angle = 360 - angle
-    else:
-        angle = 180 - angle
     angle = angle / 2
     dist = la.norm(a-b)
     # dist = 100
@@ -34,10 +38,6 @@ def getBisecPoint(a,b,c, CORRECTION_ANGLE):
 
 def getBisecCone(a,b,c,width, CORRECTION_ANGLE):
     angle = getAngle(a,b,c, CORRECTION_ANGLE)
-    if(a[0]-b[0]<0): #check wich direction (left/right) the vector should point
-        angle = 360 - angle
-    else:
-        angle = 180 - angle
     angle = angle / 2
     #dist = la.norm(a-b)
     dist = 1500