Update gui

.gitignore

@@ -6,8 +6,12 @@
 /credentials
 /gui
 /ui_design/source
+/ui_design/images
+/ui_design/ui_design
 .idea/
 *.DS_Store
 *.pyc
 *.orig
 __pycache__/
+env/
+venv/

TUTORIAL.md

@@ -60,7 +60,7 @@ In the prompt Powershell console, input `python main.py`, then you can run the c
 
 # Windows 下 Python 运行环境搭建教程
 
-## 安装Anaconda Python 2.x
+## 安装Anaconda Python 3.x
 
 点击 https://www.anaconda.com/download/ ， 64位电脑按如下选择：
 

main.py

@@ -1,4 +1,4 @@
-import ora.gui as Gui
+import ora.gui_ as Gui
 import multiprocessing as mp
 
 def main():

ora/command_line.py

@@ -4,8 +4,8 @@
 from . import overwatch as OW
 from . import game
 from . import pool
-from json import load
 from sys import argv
+import json
 
 
 def log(*args):
@@ -15,98 +15,112 @@ def log(*args):
 class Program(object):
     def __init__(self):
         self.game_instance = None
-        self.argv = argv
+        self.argv = argv[:4]
+        self.msg = self._msg()
+        self.data = self._get_data_to_dict(argv)
 
-    def _get_data(self, key):
-        """
-        Extract key from sys.argv, then delete the key
-        """
-        key += '='
-        key_index = len(key)
-        for i, s in enumerate(self.argv):
-            if s[:key_index] == key:
-                string = s[key_index:]
-                del self.argv[i]
-                return string
-        return None
-
-    def _user_input(self):
-        """
-        Retrieving info from user input in command line
-        """
-        # Getting fps
-        if 'help' in self.argv:
-            print("""
+    def _get_data_to_dict(self, argv):
+        if 'help' in argv:
+            print(self.msg.get('help'))
+            exit(0)
+        if len(self.argv) < 4:
+            raise ValueError(self.msg.get('need_help'))
+
+        result = {}
+        argv = argv[4:]
+        if argv:
+            for i, s in enumerate(argv):
+                if '=' not in s:
+                    raise ValueError('<{}> {}'.format(s, self.msg.get('lack')))
+                k, v = s.split('=')
+                result[k] = v
+            return result
+        return result
+
+    @staticmethod
+    def _msg():
+        result = {}
+        result['help'] = """
             Example:
-                main_cli.exe <video_path> <output_path> <number> players=player.txt fps=2 start_time=0 end_time=0
+                main_cli.exe <video_path> <output_path> <number> version=0 players=player.txt fps=2 start_time=0 end_time=0
 
             Mandatory arguments:
                 <video_path>         Absolute path of video(example: F:/video.mp4)
                 <output_path>        Absolute path of output file(example: F:/)
                 <number>             A number representing game type. 0: OWL, 1: Non-OWL
 
             Optional:
+                version=0            OWL stage number(0=preseason, 1, 2, 3, 4)
                 players=players.txt  A text file saving info of all 12 players with JSON formatting
                 fps=2                FPS of analyzer (2 by default)
                 start_time=0         Starting time in seconds
                 end_time=0           Ending time in seconds (If both are 0, then the whole video is analyzed)
-                """)
-            exit(0)
-        fps = self._get_data('fps')
+        """
+        result['need_help'] = """
+            Please input with proper amount of arguments.
+            If you need any help, please type: main_cli.py help
+        """
+        result['lack'] = "optional lack of token '='"
+        result['json'] = """
+        JSON format:
+        {
+            "right": {
+                "players": [
+                    "player7",
+                    "player8",
+                    "player9",
+                    "player10",
+                    "player11",
+                    "player12"
+                ],
+                "team": "Team B"
+            },
+            "left": {
+                "players": [
+                    "player1",
+                    "player2",
+                    "player3",
+                    "player4",
+                    "player5",
+                    "player6",
+                ],
+                "team": "Team A"
+            }
+        }
+        """
+        return result
+
+    def _user_input(self):
+        """
+        Retrieving info from user input in command line
+        """
         info = {
-            'fps': 2 if fps is None else fps,
-            '_player': self._get_data('player'),
-            'start_time': self._get_data('start_time') or 0,
-            'end_time': self._get_data('end_time') or 0,
+            'fps': self.data.get('fps', 2),
+            '_players': self.data.get('players'),
+            'start_time': self.data.get('start_time', 0),
+            'end_time': self.data.get('end_time', 0),
+            'game_version': self.data.get('version', 0),
+            'video_path': self.argv[1],
+            'output_path': self.argv[2],
+            'game_type': self.argv[3]
         }
-        if len(self.argv) <= 3 or len(self.argv) > 4:
-            raise ValueError("""
-            Please input with proper amount of arguments.
-            如需帮助请输入 main_cli.py help
-            """)
-        info['video_path'] = self.argv[1]
-        info['output_path'] = self.argv[2]
-        info['game_type'] = self.argv[3]
         return info
 
     def info(self):
         info = self._user_input()
-        player_path = info.pop('_player')
+        player_path = info.pop('_players')
         if player_path is None:
             info['name_team_left'] = 'Team A'
             info['name_team_right'] = 'Team B'
             info['name_players_team_left'] = ['player' + str(i) for i in range(1, 7)]
             info['name_players_team_right'] = ['player' + str(i) for i in range(7, 13)]
         else:
-            with open(player_path, 'r') as f:
-                data = load(f)
-            """
-            JSON format:
-            {
-                "right": {
-                    "players": [
-                        "player7",
-                        "player8",
-                        "player9",
-                        "player10",
-                        "player11",
-                        "player12"
-                    ],
-                    "team": "Team B"
-                },
-                "left": {
-                    "players": [
-                        "player1",
-                        "player2",
-                        "player3",
-                        "player4",
-                        "player5",
-                        "player6",
-                    ],
-                    "team": "Team A"
-                }
-            }
-            """
+            try:
+                with open(player_path, 'r') as f:
+                    data = json.load(f)
+            except json.decoder.JSONDecodeError:
+                print(self.msg.get('json'))
+                exit(0)
             info['name_team_left'] = data['left']['team']
             info['name_team_right'] = data['right']['team']
             info['name_players_team_left'] = data['left']['players']
@@ -140,6 +154,15 @@ def info(self):
 
         if not (info['game_type'] == 0 or info['game_type'] == 1):
             raise ValueError('Invalid game type!')
+
+        try:
+            print(info['game_version'])
+            info['game_version'] = int(info['game_version'])
+        except ValueError:
+            log('Invalid OWL stage number!')
+
+        if info['game_type'] == 0 and info['game_version'] not in [0, 1, 2, 3, 4]:
+            raise ValueError('Invalid OWL stage number!')
         return info
 
     def run(self):
@@ -150,8 +173,7 @@ def run(self):
         self.game_instance.analyze(info['start_time'], info['end_time'], is_test=False)
         pool.PROCESS_POOL.close()
         pool.PROCESS_POOL.join()
-        self.game_instance.output_to_json()
-        self.game_instance.output_to_excel()
+        self.game_instance.output()
         log('ok')
 
 program = Program()

ora/gui/default.py

@@ -0,0 +1,6 @@
+
+COPY_RIGHT = '''
+    COPYRIGHT
+
+    '''
+

ora/gui/functions.py

@@ -0,0 +1,51 @@
+from os.path import join
+
+from PyQt5.Qt import QIcon, QSize
+from PyQt5.QtWidgets import QFileDialog
+
+SRC_PATH = './ora/gui/images'
+
+
+def dynamic_base_class(instance, cls, cls_name):
+    instance.__class__ = type(cls_name, (cls, instance.__class__), {})
+    return instance
+
+
+def set_background_img(widget, file_name, path='/bgs/'):
+    widget.setStyleSheet("background-image: url(%s)" % (SRC_PATH + path + file_name))
+
+
+def set_background_color(widget, color):
+    widget.setStyleSheet("background-color: %s" % color)
+
+
+def set_plain_text(widget, text):
+    widget.setPlainText(text)
+
+
+def pic_to_icon(file_name, path='icons'):
+    return QIcon(join(SRC_PATH, path, file_name))
+
+
+def set_full_icon(widget, file_name, path='icons'):
+    qicon = pic_to_icon(file_name, path)
+    widget.setIcon(qicon)
+    widget.setIconSize(QSize(100, 100))
+
+
+def remove_listwidget_item(listwidget):
+    listwidget.takeItem(listwidget.currentRow())
+
+def open_file_dialog(parent):
+    filename, _ = QFileDialog.getOpenFileName(parent, u'select video')
+    return filename
+
+def set_qclass_child_widgets_style(widget, qclass, style):
+    for c in get_qclass_child_widgets(widget, qclass):
+        c.setStyleSheet(style)
+
+
+def get_qclass_child_widgets(widget, qclass):
+    for c in widget.children():
+        if isinstance(c, qclass):
+            yield c