Commit d87a7437 authored by xuanweiace's avatar xuanweiace

fix bug

parent 55693e69
...@@ -305,10 +305,11 @@ def add_to_list(mainWindow: MainWindow, element_type: str, li: list): ...@@ -305,10 +305,11 @@ 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, subtitle, suggest = li
st_time_sec, ed_time_sec = str(st_time_sec), str(ed_time_sec) st_time_sec, ed_time_sec = str(st_time_sec), str(ed_time_sec)
speed = '1.00(4字/秒)'
aside = "" aside = ""
i = len(mainWindow.projectContext.all_elements) i = len(mainWindow.projectContext.all_elements)
if element_type == "字幕": 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]) mainWindow.projectContext.all_elements.append(mainWindow.projectContext.subtitle_list[-1])
else: else:
if i == 0: if i == 0:
...@@ -319,7 +320,7 @@ def add_to_list(mainWindow: MainWindow, element_type: str, li: list): ...@@ -319,7 +320,7 @@ def add_to_list(mainWindow: MainWindow, element_type: str, li: list):
# 因为暂时没有用到ed_time_sec,所以直接赋值空吧 # 因为暂时没有用到ed_time_sec,所以直接赋值空吧
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]) mainWindow.projectContext.all_elements.append(mainWindow.projectContext.aside_list[-1])
......
...@@ -160,6 +160,11 @@ class MainWindow(QMainWindow, Ui_MainWindow): ...@@ -160,6 +160,11 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.previewed_audio = {} self.previewed_audio = {}
self.is_video_playing = True self.is_video_playing = True
# 记录表格已经生成的idx,每次生成新的直接追加即可
self.all_tableWidget_idx = 0
self.pb_tableWidget_idx = 0
self.zm_tableWidget_idx = 0
# 重写关闭Mmainwindow窗口 # 重写关闭Mmainwindow窗口
def closeEvent(self, event): def closeEvent(self, event):
# buttonBox = QtWidgets.QMessageBox() # buttonBox = QtWidgets.QMessageBox()
...@@ -565,7 +570,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): ...@@ -565,7 +570,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
text = text[text.index('推荐'):] text = text[text.index('推荐'):]
# 需要格式化成hh:mm:ss格式 # 需要格式化成hh:mm:ss格式
if j in time_format_col_list and type(text)==str and len(text) != 0: if j in time_format_col_list and type(text)==str and len(text) != 0:
text = utils.transfer_second_to_time() text = utils.transfer_second_to_time(text)
item = QTableWidgetItem(text) item = QTableWidgetItem(text)
# 设置为不可编辑 # 设置为不可编辑
if self.checkIfTableItemCanChange(table, idx, j) == False: if self.checkIfTableItemCanChange(table, idx, j) == False:
...@@ -595,11 +600,12 @@ class MainWindow(QMainWindow, Ui_MainWindow): ...@@ -595,11 +600,12 @@ class MainWindow(QMainWindow, Ui_MainWindow):
col = item.column() # 获取列数 col = item.column() # 获取列数
print("row, col = %s, %s"%(row, col)) print("row, col = %s, %s"%(row, col))
text = item.text() # 获取内容 text = item.text() # 获取内容
sec_float = utils.trans_to_seconds(text)
self.init_previewed_audio() self.init_previewed_audio()
if self.checkIfVideoTimeCanChange(row, col): if self.checkIfVideoTimeCanChange(row, col):
self.video_timer.stop() self.video_timer.stop()
self.video_timer.start(1000) # 双击的时候,就重启计时器,避免他跳转回video.position的地方去。 self.video_timer.start(1000) # 双击的时候,就重启计时器,避免他跳转回video.position的地方去。
sec_float = utils.trans_to_seconds(text)
self.player.setPosition(int(float(sec_float)*1000)) self.player.setPosition(int(float(sec_float)*1000))
...@@ -733,6 +739,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): ...@@ -733,6 +739,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.projectContext.refresh_aside(row, text) self.projectContext.refresh_aside(row, text)
# 更新【字幕旁白】这个tab里的字 # 更新【字幕旁白】这个tab里的字
start_time = self.pb_tableWidget.item(int(row), constant.Aside.StartTimeColumn).text() start_time = self.pb_tableWidget.item(int(row), constant.Aside.StartTimeColumn).text()
start_time = utils.trans_to_seconds(start_time)
idx = self.projectContext.aside_subtitle_2contentId(Element(str(start_time),0,0,0,0)) idx = self.projectContext.aside_subtitle_2contentId(Element(str(start_time),0,0,0,0))
self.all_tableWidget.setItem(int(idx), constant.Content.AsideColumnNumber, QTableWidgetItem(text)) self.all_tableWidget.setItem(int(idx), constant.Content.AsideColumnNumber, QTableWidgetItem(text))
# def write2ProjectFromContent(self, item): # def write2ProjectFromContent(self, item):
......
...@@ -209,10 +209,10 @@ class ProjectContext: ...@@ -209,10 +209,10 @@ class ProjectContext:
self.clear() self.clear()
# todo:现在是只用None判断是否是字幕,后续是否也需要用""来? # todo:现在是只用None判断是否是字幕,后续是否也需要用""来?
for i in range(len(d["字幕"])): 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: 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]) self.all_elements.append(self.subtitle_list[-1])
else: else:
if i == 0: if i == 0:
...@@ -229,7 +229,7 @@ class ProjectContext: ...@@ -229,7 +229,7 @@ class ProjectContext:
ed_time_sec = "360000" # todo 默认最大时长是100h ed_time_sec = "360000" # todo 默认最大时长是100h
else: else:
ed_time_sec = "%.2f"%(float(d["起始时间"][i + 1]) - 0.01) 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]) self.all_elements.append(self.aside_list[-1])
# print("[load_excel_from_path] ", end='') # print("[load_excel_from_path] ", end='')
# self.all_elements[-1].print_self() # self.all_elements[-1].print_self()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment