fix: 增加指标时计数器的刷新方式

Author: eee555

src/gameScoreBoard.py

@@ -20,7 +20,7 @@ def __init__(self, r_path, pix_size):
 
         self.tableWidget.setColumnWidth(0, 80)
         self.tableWidget.setColumnWidth(1, 150)
-        # self.tableWidget.verticalHeader().setDefaultSectionSize(24)
+        self.tableWidget.verticalHeader().setDefaultSectionSize(24)
 
         self.QWidget.setWindowIcon (QtGui.QIcon (str(r_path.with_name('media').joinpath('cat.ico'))))
 
@@ -245,7 +245,16 @@ def show(self, ms_board, index_type):
         # if self.ui.QWidget.isVisible():
         #     self.visible()
 
-    def reshow(self, ms_board, index_type):
+    def reshow(self, ms_board, index_type = 0):
+        if not index_type:
+            if self.ms_board.game_board_state == 1\
+                or self.ms_board.game_board_state == 2\
+                    or self.ms_board.game_board_state == 5:
+                index_type = 1
+            else:
+                # 3、4为win和loss
+                index_type = 2
+            
         # 指标数量有变。增删指标用。游戏开始前。index_type是2
         self.ms_board = ms_board
         index_value_list = self.cal_index_value(ms_board, index_type)
@@ -301,13 +310,7 @@ def __table_ok(self, e = None):
             else:
                 self.score_board_items[self.editing_row][1] = new_formula
                 self.update_score_board_items_type()
-            if self.ms_board.game_board_state == 1\
-                or self.ms_board.game_board_state == 2\
-                    or self.ms_board.game_board_state == 5:
-                self.reshow(self.ms_board, 1)
-            else:
-                # 3、4为win和loss
-                self.reshow(self.ms_board, 2)
+            self.reshow(self.ms_board)
             self.editing_row = -1
             self.editing_column = -1
 
@@ -322,7 +325,7 @@ def __add_blank_line(self):
         # 添加一个空开的行，并刷新显示
         self.score_board_items.append(["", ""])
         self.score_board_items_type.append(1)
-        self.reshow(self.ms_board, 1)
+        self.reshow(self.ms_board)
 
     def close(self):
         config = configparser.ConfigParser()

src/mineSweeperGUI.py

@@ -18,7 +18,6 @@
 # from country_name import country_name
 import metaminesweeper_checksum
 
-version = "元3.1.11".encode( "UTF-8" )
 
 class MineSweeperGUI(superGUI.Ui_MainWindow):
     def __init__(self, MainWindow, args):
@@ -102,30 +101,6 @@ def save_evf_file_integrated():
         # 用本软件打开录像
         if len(args) == 2:
             self.action_OpenFile(args[1])
-        elif len(args) == 3:
-            print(args)
-            if args[1] == "-v":
-                print(version)
-                return
-            elif args[1] == "-t":
-                if args[2][-3:] == "evf":
-                    video = ms.EvfVideo(args[2])
-                else:
-                    print("unknown")
-                    return
-                try:
-                    video.parse_video()
-                except:
-                    print("false")
-                    return
-                
-                if self.checksum_guard.\
-                    valid_checksum(video.raw_data[:-33], video.checksum):
-                    print("true")
-                    return
-                else:
-                    print("false")
-                    return
 
         self.trans_language()
         self.score_board_manager.with_namespace({
@@ -687,7 +662,7 @@ def dump_evf_file_data(self):
             self.label.ms_board.is_fair = self.is_fair()
             self.label.ms_board.is_official = self.is_official()
 
-            self.label.ms_board.software = version
+            self.label.ms_board.software = superGUI.version
             self.label.ms_board.mode = self.gameMode
             self.label.ms_board.player_identifier = self.player_identifier.encode( "UTF-8" )
             self.label.ms_board.race_identifier = self.race_identifier.encode( "UTF-8" )

src/superGUI.py

@@ -13,13 +13,45 @@
 import minesweeper_master as mm
 import metaminesweeper_checksum
 from country_name import country_name
+import ms_toollib as ms
+
+
+version = "元3.1.11".encode( "UTF-8" )
+
 
 class Ui_MainWindow(Ui_MainWindow):
     minimum_counter = 0 # 最小化展示窗口有关
     # windowSizeState = 'loose'  # loose or tight
     def __init__(self, MainWindow, args):
         self.mainWindow = MainWindow
         self.setupUi(self.mainWindow)
+        
+        self.checksum_guard = metaminesweeper_checksum.ChecksumGuard()
+        if len(args) == 3:
+            print(args)
+            if args[1] == "-v":
+                print(version)
+                return
+            elif args[1] == "-t":
+                if args[2][-3:] == "evf":
+                    video = ms.EvfVideo(args[2])
+                else:
+                    print("unknown")
+                    return
+                try:
+                    video.parse_video()
+                except:
+                    print("false")
+                    return
+                
+                if self.checksum_guard.\
+                    valid_checksum(video.raw_data[:-33], video.checksum):
+                    print("true")
+                    return
+                else:
+                    print("false")
+                    return
+                
         # 设置全局路径
         r_path = Path(args[0]).parent
         self.r_path = r_path
@@ -30,8 +62,6 @@ def __init__(self, MainWindow, args):
         # 个人记录，用来弹窗
         self.record_path = str(r_path.with_name('record.ini'))
 
-        self.checksum_guard = metaminesweeper_checksum.ChecksumGuard()
-
 
         self.ico_path = str(r_path.with_name('media').joinpath('cat.ico'))
         self.smileface_path = str(r_path.with_name('media').joinpath('smileface.svg'))