Commit 55693e69 authored by xuanweiace's avatar xuanweiace

upd

parent 3ed61a1f
......@@ -834,9 +834,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
idx += 1
return idx
def add_line_operation_slot(self, row, start_time, end_time, subtitle, suggest, aside):
def add_line_operation_slot(self, row, start_time, end_time, subtitle, suggest, aside, speed):
# 注意,这里需要用同一对象,不能生成多个Element
new_element = Element(start_time, end_time, subtitle, suggest, aside)
new_element = Element(start_time, end_time, subtitle, suggest, aside, speed)
self.projectContext.all_elements.insert(int(row), new_element)
self.all_tableWidget_idx+=1
if suggest is not None and "插入旁白,推荐字数为" in suggest:
......
......@@ -11,9 +11,9 @@ from operation_dialog_ui import Ui_Dialog
class Operation_Dialog(QDialog, Ui_Dialog):
#开始检测信号,传参分别是movie路径和输出表格路径
start_add_signal = pyqtSignal(str, str, str, str, str, str)
start_mod_signal = pyqtSignal(str, str, str, str, str, str)
start_del_signal = pyqtSignal(str, str, str, str, str, str)
start_add_signal = pyqtSignal(str, str, str, str, str, str, str)
start_mod_signal = pyqtSignal(str, str, str, str, str, str, str)
start_del_signal = pyqtSignal(str, str, str, str, str, str, str)
def __init__(self, mainWindow):
super(Operation_Dialog, self).__init__()
self.setupUi(self)
......@@ -32,7 +32,7 @@ class Operation_Dialog(QDialog, Ui_Dialog):
# 增加一行/删除一行 选择框
self.comboBox_2.currentIndexChanged.connect(self.adddel_change_slot)
self.speed_list = ["1.00(4字/秒)", "1.10(4.5字/秒)", "1.25(5字/秒)", "1.50(6字/秒)", "1.75(7字/秒)", "2.00(8字/秒)", "2.50(10字/秒)"]
self.comboBox_3.addItems(li)
self.comboBox_3.addItems(self.speed_list)
self.lineEdits = [self.lineEdit, self.lineEdit_2, self.lineEdit_3, self.lineEdit_4, self.lineEdit_5, self.lineEdit_6]
self.zmpb_change_slot()
......@@ -138,7 +138,7 @@ class Operation_Dialog(QDialog, Ui_Dialog):
def start_operation_slot(self):
row, start_time, end_time, subtitle, suggest, aside = [x.text() for x in self.lineEdits]
speed = self.comboBox_3.currentText()
# 将hh:mm:ss转成秒的形式传给mainWindow
if type(start_time)==str and len(start_time)>0:
start_time = str(utils.trans_to_seconds(start_time))
......@@ -160,11 +160,11 @@ class Operation_Dialog(QDialog, Ui_Dialog):
# 根据增删两种操作,分别触发不同信号。
if self.comboBox_2.currentText() == "增加一行":
self.start_add_signal.emit(row, start_time, end_time, subtitle, suggest, aside)
self.start_add_signal.emit(row, start_time, end_time, subtitle, suggest, aside, speed)
elif self.comboBox_2.currentText() == "修改一行":
self.start_mod_signal.emit(row, start_time, end_time, subtitle, suggest, aside)
self.start_mod_signal.emit(row, start_time, end_time, subtitle, suggest, aside, speed)
else:
self.start_del_signal.emit(row, start_time, end_time, subtitle, suggest, aside)
self.start_del_signal.emit(row, start_time, end_time, subtitle, suggest, aside, speed)
def fill_row_info_slot(self):
text = self.lineEdit.text()
......@@ -180,6 +180,7 @@ class Operation_Dialog(QDialog, Ui_Dialog):
self.lineEdit_4.setText(elem.subtitle)
self.lineEdit_5.setText(elem.suggest[elem.suggest.index("推荐字数为") + 5:])
self.lineEdit_6.setText(elem.aside)
# 如果是旁白的话
if elem.suggest is not None and "推荐字数为" in elem.suggest:
self.lineEdit_5.setText(elem.suggest[elem.suggest.index("推荐字数为")+5:])
......
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