Merge branch 'feat_1' of http://gitlab.uiiai.com/xuanweiace/accessibility_movie_2 into old_version

constant.py

@@ -2,6 +2,7 @@
 class Content:
     StartTimeColumn = 0
     AsideColumnNumber = 2
+    SpeedColumnNumber = 3
     ActivateColumns = [2,3]
     # ColumnCount = 3
     ObjectName = "all_tableWidget"
@@ -10,6 +11,7 @@ class Content:
 class Aside:
     StartTimeColumn = 0
     AsideColumnNumber = 3
+    SpeedColumnNumber = 4
     ActivateColumns = [3,4]
     ObjectName = "pb_tableWidget"
     TimeFormatColumns = [0,1]

detect_with_ocr.py

@@ -305,10 +305,12 @@ def add_to_list(mainWindow: MainWindow, element_type: str, li: list):
 
     st_time_sec, ed_time_sec, subtitle, suggest = li
     st_time_sec, ed_time_sec = str(st_time_sec), str(ed_time_sec)
+    # 默认使用配置文件中的语速
+    speed = mainWindow.projectContext.speaker_speed
     aside = ""
     i = len(mainWindow.projectContext.all_elements)
     if element_type == "字幕":
-        mainWindow.projectContext.subtitle_list.append(Element(st_time_sec, ed_time_sec, subtitle, suggest, aside))
+        mainWindow.projectContext.subtitle_list.append(Element(st_time_sec, ed_time_sec, subtitle, suggest, aside,speed))
         mainWindow.projectContext.all_elements.append(mainWindow.projectContext.subtitle_list[-1])
     else:
         if i == 0:
@@ -319,7 +321,7 @@ def add_to_list(mainWindow: MainWindow, element_type: str, li: list):
         # 因为暂时没有用到ed_time_sec，所以直接赋值空吧
         ed_time_sec = ""
 
-        mainWindow.projectContext.aside_list.append(Element(st_time_sec, ed_time_sec, subtitle, suggest, aside))
+        mainWindow.projectContext.aside_list.append(Element(st_time_sec, ed_time_sec, subtitle, suggest, aside,speed))
         mainWindow.projectContext.all_elements.append(mainWindow.projectContext.aside_list[-1])
 
 

management.py

@@ -135,7 +135,7 @@ class ProjectContext:
         self.excel_sheet_name = "旁白插入位置建议"
         self.history_records = []
         self.records_pos = 0
-        #是否处于初始化中
+        #是否处于初始化中：在set_table_to_window时为True，主要用来做undo和redo记录操作历史的时候用到该变量，值为False才进行undo等操作。
         self.initial_ing = False
 
         self.speakers = []
@@ -166,6 +166,7 @@ class ProjectContext:
         with open('./conf.ini', 'w', encoding='utf-8') as f:
             f.writelines([self.speaker_info + '\n', self.speaker_speed])
 
+
     def setVideoPath(self, video_path):
         self.video_path = video_path
     def setExcelPath(self, excel_path):
@@ -194,6 +195,11 @@ class ProjectContext:
         if not self.initial_ing:
             save_excel_to_to_path(self.all_elements, self.excel_path, self.header, self.excel_sheet_name)
 
+    def refresh_aside_speed(self, row, speed: str)->None:
+        self.aside_list[int(row)].speed = speed
+        if not self.initial_ing:
+            save_excel_to_to_path(self.all_elements, self.excel_path, self.header, self.excel_sheet_name)
+
     def refresh_element(self, row, aside: str):
         self.all_elements[int(row)].aside = aside
         if not self.initial_ing:
@@ -209,10 +215,10 @@ class ProjectContext:
         self.clear()
         # todo:现在是只用None判断是否是字幕，后续是否也需要用""来？
         for i in range(len(d["字幕"])):
-            st_time_sec, ed_time_sec, subtitle, suggest, aside = [d[x][i] for x in self.header]
+            st_time_sec, ed_time_sec, subtitle, suggest, aside, speed = [d[x][i] for x in self.header]
             # 当前条目是字幕
             if d["字幕"][i] != None:
-                self.subtitle_list.append(Element(st_time_sec, ed_time_sec, subtitle, suggest, aside))
+                self.subtitle_list.append(Element(st_time_sec, ed_time_sec, subtitle, suggest, aside, speed))
                 self.all_elements.append(self.subtitle_list[-1])
             else:
                 if i == 0:
@@ -229,7 +235,7 @@ class ProjectContext:
                     ed_time_sec = "360000" # todo 默认最大时长是100h
                 else:
                     ed_time_sec = "%.2f"%(float(d["起始时间"][i + 1]) - 0.01)
-                self.aside_list.append(Element(st_time_sec, ed_time_sec, subtitle, suggest, aside))
+                self.aside_list.append(Element(st_time_sec, ed_time_sec, subtitle, suggest, aside, speed))
                 self.all_elements.append(self.aside_list[-1])
             # print("[load_excel_from_path] ", end='')
             # self.all_elements[-1].print_self()