From e0976bcb30fa50e6e33c701fc057a4e93935bccf Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Sat, 13 Oct 2018 06:17:09 +0000
Subject: [PATCH] Update README

---
 generate_data.py |  161 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 136 insertions(+), 25 deletions(-)

diff --git a/generate_data.py b/generate_data.py
index dafb40e..7a2ce87 100644
--- a/generate_data.py
+++ b/generate_data.py
@@ -11,6 +11,7 @@
 import sys
 import numpy as np
 import pandas as pd
+import transform_data
 
 # Referenced from geaxgx's playing-card-detection: https://github.com/geaxgx/playing-card-detection
 class Backgrounds:
@@ -63,54 +64,164 @@
 
 
 def apply_bounding_box(img, card_info, display=False):
-    # Mana symbol - They are located on the top right side of the card, next to the name.
+    # List of detected objects to be fed into the neural net
+    # The first object is the entire card
+    detected_object_list = [transform_data.ExtractedObject('card', [(0, 0), (len(img[0]), 0), (len(img[0]), len(img)), (0, len(img))])]
+    '''
+    # Mana symbol - They are located on the top right side of the card, next to the name
     # Their position is stationary, and is right-aligned.
     has_mana_cost = isinstance(card_info['mana_cost'], str)  # Cards with no mana cost will have nan
-    is_planeswalker = 'Planeswalker' in card_info['type_line']
     if has_mana_cost:
         mana_cost = re.findall('\{(.*?)\}', card_info['mana_cost'])
-        x2 = 683
-        y1 = 67
+        x_anchor = 683
+        y_anchor = 65
 
         # Cards with specific type or from old sets have their symbol at a different position
-        if is_planeswalker:
-            y1 -= 17
         if card_info['set'] in ['8ed', 'mrd', 'dst', '5dn']:
-            y1 -= 2
+            y_anchor -= 2
 
         for i in reversed(range(len(mana_cost))):
             # Hybrid mana symbol are larger than a normal symbol
             is_hybrid = '/' in mana_cost[i]
             if is_hybrid:
-                box = [(x2 - 47, y1 - 8), (x2 + 2, y1 + 43)]  # (x1, y1), (x2, y2)
-                x2 -= 45
+                x1 = x_anchor - 47
+                x2 = x_anchor + 2
+                y1 = y_anchor - 8
+                y2 = y_anchor + 43
+                x_anchor -= 45
             else:
-                box = [(x2 - 39, y1), (x2, y1 + 41)]  # (x1, y1), (x2, y2)
-                x2 -= 37
-            img_symbol = img[box[0][1]:box[1][1], box[0][0]:box[1][0]]
+                x1 = x_anchor - 39
+                x2 = x_anchor
+                y1 = y_anchor
+                y2 = y_anchor + 43
+                x_anchor -= 37
+            # Append them to the list of bounding box with the appropriate label
+            symbol_name = 'mana_symbol:' + mana_cost[i]
+            key_pts = [(x1, y1), (x2, y1), (x2, y2), (x1, y2)]
+            detected_object_list.append(transform_data.ExtractedObject(symbol_name, key_pts))
+
             if display:
+                img_symbol = img[y1:y2, x1:x2]
                 cv2.imshow('symbol', img_symbol)
                 cv2.waitKey(0)
 
+    # Set symbol - located on the right side of the type box in the centre of the card, next to the card type
+    # Only one symbol exists, and its colour varies by rarity.
+    if card_info['set'] in ['8ed']:
+        x1 = 622
+        x2 = 670
+    elif card_info['set'] in ['mrd', 'm10', 'm11', 'm12', 'm13', 'm14']:
+        x1 = 602
+        x2 = 684
+    elif card_info['set'] in ['dst']:
+        x1 = 636
+        x2 = 673
+    elif card_info['set'] in ['5dn']:
+        x1 = 630
+        x2 = 675
+    elif card_info['set'] in ['bok', 'rtr']:
+        x1 = 633
+        x2 = 683
+    elif card_info['set'] in ['sok', 'mbs']:
+        x1 = 638
+        x2 = 683
+    elif card_info['set'] in ['rav']:
+        x1 = 640
+        x2 = 678
+    elif card_info['set'] in ['csp']:
+        x1 = 650
+        x2 = 683
+    elif card_info['set'] in ['tsp', 'lrw', 'zen', 'wwk', 'ths']:
+        x1 = 640
+        x2 = 683
+    elif card_info['set'] in ['plc', 'fut', 'shm', 'eve']:
+        x1 = 625
+        x2 = 685
+    elif card_info['set'] in ['10e']:
+        x1 = 623
+        x2 = 680
+    elif card_info['set'] in ['mor', 'roe', 'bng']:
+        x1 = 637
+        x2 = 687
+    elif card_info['set'] in ['ala', 'arb']:
+        x1 = 635
+        x2 = 680
+    elif card_info['set'] in ['nph']:
+        x1 = 642
+        x2 = 678
+    elif card_info['set'] in ['gtc']:
+        x1 = 610
+        x2 = 683
+    elif card_info['set'] in ['dgm']:
+        x1 = 618
+        x2 = 678
+    else:
+        x1 = 630
+        x2 = 683
+    y1 = 589
+    y2 = 636
+    # Append them to the list of bounding box with the appropriate label
+    symbol_name = 'set_symbol:' + card_info['set']
+    key_pts = [(x1, y1), (x2, y1), (x2, y2), (x1, y2)]
+    detected_object_list.append(transform_data.ExtractedObject(symbol_name, key_pts))
+
+    if display:
+        img_symbol = img[y1:y2, x1:x2]
+        cv2.imshow('symbol', img_symbol)
+        cv2.waitKey(0)
+
+    # Name box - The long bar on the top with card name and mana symbols
+    # TODO
+
+    # Type box - The long bar on the middle with card type and set symbols
+    # TODO
+
+    # Image box - the large image on the top half of the card
+    # TODO
+    '''
+    return detected_object_list
+
 
 def main():
+    random.seed()
     #bg_images = load_dtd()
     #bg = Backgrounds()
     #bg.get_random(display=True)
-    df = fetch_data.load_all_cards_text('data/csv/dgm.csv')
-    #repeat = 'y'
-    while True:
-        card_info = df.iloc[random.randint(0, df.shape[0] - 1)]
-        print(card_info['name'])
-        card_img = cv2.imread('data/png/%s/%s_%s.png' % (card_info['set'], card_info['collector_number'],
-                                                         fetch_data.get_valid_filename(card_info['name'])))
+
+    card_pool = pd.DataFrame()
+    for set_name in fetch_data.all_set_list:
+        df = fetch_data.load_all_cards_text('data/csv/%s.csv' % set_name)
+        #for _ in range(3):
+        #    card_info = df.iloc[random.randint(0, df.shape[0] - 1)]
+        #    # Currently ignoring planeswalker cards due to their different card layout
+        #    is_planeswalker = 'Planeswalker' in card_info['type_line']
+        #    if not is_planeswalker:
+        #        card_pool = card_pool.append(card_info)
+        card_pool = card_pool.append(df)
+    '''
+    print(card_pool)
+    mana_symbol_set = set()
+    for _, card_info in card_pool.iterrows():
+        has_mana_cost = isinstance(card_info['mana_cost'], str)
+        if has_mana_cost:
+            mana_cost = re.findall('\{(.*?)\}', card_info['mana_cost'])
+            for symbol in mana_cost:
+                mana_symbol_set.add(symbol)
+
+    print(mana_symbol_set)
+    '''
+
+    for _, card_info in card_pool.iterrows():
+        img_name = '../usb/data/png/%s/%s_%s.png' % (card_info['set'], card_info['collector_number'],
+                                                     fetch_data.get_valid_filename(card_info['name']))
+        print(img_name)
+        card_img = cv2.imread(img_name)
         if card_img is None:
-            fetch_data.fetch_card_image(card_info)
-            card_img = cv2.imread('data/png/%s/%s_%s.png' % (card_info['set'], card_info['collector_number'],
-                                                             fetch_data.get_valid_filename(card_info['name'])))
-        sys.stdout.flush()
-        apply_bounding_box(card_img, card_info, display=True)
-        #repeat = input('y to repeat, n to finish')
+            fetch_data.fetch_card_image(card_info, out_dir='../usb/data/png/%s' % card_info['set'])
+            card_img = cv2.imread(img_name)
+        detected_object_list = apply_bounding_box(card_img, card_info, display=True)
+        print(detected_object_list)
+
     return
 
 

--
Gitblit v1.10.0