v0.2.2-beta2

1. 修复部分全局变量操作的bug
2. 修正部分截图相关参数

Author: [xct24]

main.py

@@ -19,7 +19,7 @@
 
 ## Version Info
 global globalVersion
-globalVersion = 'PCRJJCAnalyzer-v0.2.2-beta1'
+globalVersion = 'PCRJJCAnalyzer-v0.2.2-beta2'
 
 ## PrepareInitialPaths
 if not os.path.exists(os.path.join(os.path.expanduser('~'), "PCRJJCAnalyzer")):
@@ -103,9 +103,12 @@ def __init__(self, parent=None, mainGUI=None):
     def onOpenConfigFolderButtonClicked(self):
         os.startfile(os.path.join(os.path.expanduser('~'), "PCRJJCAnalyzer"))
     def onResetSettingsButton(self):
+        global config_dict
         util.config_writeConfig(util.default_dict)
-        util.loadConfig()
-        global_logger.info("已重置设定。")
+        config_dict = util.default_dict
+        self.customizedApiUrlLineEdit.setDisabled(True)
+        self.defaultApiUrlRadioButton.setChecked(True)
+        global_logger.warning("已重置设定。")
     def onLoggingLevelDropboxSelect(self, loggingLevel):
         if loggingLevel == "Warning":
             logging.getLogger().setLevel(logging.WARNING)
@@ -149,7 +152,7 @@ def setApiModeOnClicked(self):
                 self.customizedApiUrlLineEdit.setDisabled(False)
         try:
             util.config_writeConfig(config_dict)
-            util.loadConfig()
+            util.config_loadConfig()
         except Exception as e:
             global_logger.exception("Failed to write config", e)
     def customizedApirUrlLineEditHandler(self,customizedApiUrl):
@@ -1053,7 +1056,7 @@ def parseChars(self):
         refImage = cv2.imdecode(np.fromfile(refImagePath,dtype=np.uint8),cv2.IMREAD_COLOR) # 读取参考图
         for i in range(len(self.charImageList)):
             charNum = i+1
-            charIndex = (util.cv_getIndex(util.cv_getMidPoint(self.charImageList[i], refImage, eval("cv2.%s" % config_dict['algorithm'] )), refImageParams)) # 计算出目标角色在参考图中的坐标位置（行与列）
+            charIndex = (util.cv_getIndex(util.cv_getMidPoint(self.charImageList[i], refImage, eval("%s" % config_dict['algorithm'] )), refImageParams)) # 计算出目标角色在参考图中的坐标位置（行与列）
             charName = characterIndexList[charIndex[0]]["unit_name"]
             charId = characterIndexList[(charIndex[0])]["unit_id"]
             self.charDataList[i] = {"name": charName, "id": charId}
@@ -1067,6 +1070,7 @@ def parseChars(self):
 
 if __name__ == '__main__':
     # ### CLI测试部分
+    global config_dict 
     config_dict = util.config_loadConfig()
     refImageParams = util.config_getRefImageParams()
     QApplication.setAttribute(Qt.AA_EnableHighDpiScaling)

util.py

@@ -38,7 +38,7 @@
     'effectiveMarginOffSet': [0, 32, 42, 0],
     'customizedApi': False,
     'customizedApiUrl': '',
-    'algorithm': 'cv.TM_SQDIFF',
+    'algorithm': 'cv2.TM_SQDIFF',
     'matchTemplateParams':
         {
             'charLocationRatioConfig_CurrentEnemyTeam': 
@@ -57,7 +57,7 @@
                 },
             'charLocationRatioConfig_HistoryTeamTwo': 
                 {
-                    'y': 0.4773333333,
+                    'y': 0.49,
                     'w': 0.058583784,
                     'h': 0.09,
                     'x': [0.486625, 0.5571875, 0.628375, 0.69825, 0.7686375]
@@ -71,14 +71,14 @@
                 },
             'charLocationRatioConfig_HistoryTeamOne_WithTitleBanner': 
                 {
-                    'y': 0.29,
+                    'y': 0.50,
                     'w': 0.058583784,
                     'h': 0.09,
                     'x': [0.486625, 0.5571875, 0.628375, 0.69825, 0.7686375]
                 },
             'charLocationRatioConfig_HistoryTeamTwo_WithTitleBanner': 
                 {
-                    'y': 0.483333,
+                    'y': 0.49,
                     'w': 0.058583784,
                     'h': 0.09,
                     'x': [0.486625, 0.5571875, 0.628375, 0.69825, 0.7686375]
@@ -200,7 +200,6 @@ def config_loadConfig():
         config_dict = copy.deepcopy(default_dict)
         config_file = open(os.path.join(os.path.expanduser('~'), "PCRJJCAnalyzer", "config.json"),'w',encoding='utf-8')
         json.dump(config_dict,config_file,ensure_ascii=False)
-        config_file.close()
     return config_dict
 
 def config_loadRefImageParams():
@@ -231,6 +230,7 @@ def config_writeConfig(config_dict):
         config_file = open(os.path.join(os.path.expanduser('~'), "PCRJJCAnalyzer", "config.json"),'w',encoding='utf-8')
         json.dump(config_dict,config_file,ensure_ascii=False)
         config_file.close()
+    config_loadConfig()
     return
 
 # 暂不开放