Merge pull request #25 from fernaper/development

🐛 Fixed bugs with distribution package

Author: fernaper

opencv_draw_tools/SelectZone.py

@@ -4,7 +4,7 @@
 import sys
 import cv2
 
-import tags_constraint
+from opencv_draw_tools.tags_constraint import *
 
 """
     You can change it.
@@ -406,8 +406,8 @@ def select_multiple_zones(frame, all_selected_zones, all_tags=None, alpha=0.9, c
         all_tags_shapes = []
         for i, zone in enumerate(all_selected_zones):
             all_tags_shapes.append(get_shape_tags(zone, all_tags[i], margin=margin))
-        # Here you could pass the frame if you want to see where tags_constraint thinks the tags will be.           Just: frame=frame     \/
-        best_position = tags_constraint.get_possible_positions(f_width, f_height, all_selected_zones, all_tags_shapes, margin=margin, frame=[])
+        # Here you could pass the frame if you want to see where get_possible_positions thinks the tags will be.           Just: frame=frame     \/
+        best_position = get_possible_positions(f_width, f_height, all_selected_zones, all_tags_shapes, margin=margin, frame=[])
         for i, zone in enumerate(all_selected_zones):
             if best_position:
                 position = best_position[i]
@@ -430,9 +430,9 @@ def webcam_test():
         if ret:
             keystroke = cv2.waitKey(1)
             position1 = (0.33,0.2,0.66,0.8)
-            tags1 = ['MIT License', '(C) Copyright\n    Fernando\n    Perez\n    Gutierrez\n hola\n', 'mundo']
-            position2 = (0.22,0.4,0.3,0.88)
-            tags2 = ['Release', 'v1.0.0']
+            tags1 = ['MIT License', '(C) Copyright\n    Fernando\n    Perez\n    Gutierrez', '@fernaperg']
+            position2 = (0.1,0.4,0.3,0.88)
+            tags2 = ['Release', 'v1.0.1']
             frame = select_multiple_zones(frame, [position1,position2], all_tags=[tags1,tags2], color=(14,28,200),
                                 thickness=2, filled=True, normalized=True)
             cv2.imshow(window_name, frame)

opencv_draw_tools/__init__.py

@@ -1,12 +1,13 @@
 from opencv_draw_tools.SelectZone import *
+import opencv_draw_tools.tags_constraint
 
 name = 'opencv_draw_tools'
 help = '''
 MIT License
 Copyright (c) 2019 Fernando Perez
 For more information visit: https://github.com/fernaper/opencv-draw-tools
 Also you can write complete_help to view full information'''
-__version__ =  '1.0.0'
+__version__ =  '1.0.1'
 
 complete_help = '''
 {} - v{}

opencv_draw_tools/tags_constraint.py

@@ -17,6 +17,12 @@ def rectangle_collision_list_rectangles (rectangle, list_rectangles):
             return True
     return False
 
+def is_valid(position, frame_shape, other_selected_zones):
+    x1, y1, x2, y2 = position
+    width, height = frame_shape
+    return x1 >= 0 and x2 > x1 and y1 >= 0 and y2 > y1 and x2 <= width and y2 <= height and \
+        not rectangle_collision_list_rectangles(position, other_selected_zones)
+
 def get_possible_positions(width, height, all_selected_zones, all_tags_shapes, margin=5, frame=[]):
     problem = Problem()
     for i, rectangle in enumerate(all_selected_zones):
@@ -29,8 +35,7 @@ def get_possible_positions(width, height, all_selected_zones, all_tags_shapes, m
         other_selected_zones = all_selected_zones[:i] + all_selected_zones[i+1:]
         for side in sides:
             # Only accepts zones inside the frame with tags not inside other selections
-            if rectangle_collision_rectangle(side[:-1], (0, 0, width, height)) and \
-                not rectangle_collision_list_rectangles(side[:-1], other_selected_zones):
+            if is_valid(side[:-1], (width,height), other_selected_zones):
                 valid_sides.append(side)
         problem.addVariable('zone_{}'.format(i), valid_sides)
 
@@ -66,6 +71,7 @@ def get_possible_positions(width, height, all_selected_zones, all_tags_shapes, m
             info_zone = best_solution['zone_{}'.format(i)]
             # This is for testing where this method thinks tags will be poisitionated
             if len(frame):
+                #print(info_zone)
                 cv2.rectangle(frame, (info_zone[0],info_zone[1]),(info_zone[2], info_zone[3]), (0,255,0),0)
             if info_zone[0] >= 0 and info_zone[2] <= width and info_zone[1] >= 0 and info_zone[3] <= height:
                 final_ans.append(info_zone[4])

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='opencv-draw-tools-fernaperg',
-    version='1.0.0',
+    version='1.0.1',
     author='Fernando Pérez',
     author_email='[email protected]',
     description='Library to help the drawing process with OpenCV. Thought to add labels to the images. Classification of images, etc.',