Skip to content

Commit 3020e94

Browse files
committed
feat:evfs施工完成、国际化
1 parent 0855bfe commit 3020e94

File tree

8 files changed

+263
-246
lines changed

8 files changed

+263
-246
lines changed

src/gameSettings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(self, mainWindow):
4848
self.comboBox_country.lineEdit().setAlignment(Qt.AlignCenter)
4949
self.comboBox_country.editTextChanged.connect(self.onchange_combobox_country)
5050
self.comboBox_country.lineEdit().setText(self.country)
51-
51+
self.comboBox_country.addItems(self.country_name)
5252

5353
self.setParameter()
5454

src/mineSweeperGUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ def replay_game(self):
10211021
video.analyse_for_features(["high_risk_guess", "jump_judge", "needless_guess",
10221022
"mouse_trace", "vision_transfer", "pluck",
10231023
"super_fl_local"])
1024-
self.play_video(video)
1024+
self.play_video(video, True)
10251025

10261026
def action_CEvent(self):
10271027
# 点击菜单栏的自定义后回调

src/mineSweeperVideoPlayer.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,9 @@ def action_OpenFile(self, openfile_name=None):
7373
"mouse_trace", "vision_transfer", "pluck",
7474
"super_fl_local"])
7575
self.ui_video_control.add_new_video_set_tab(video_set)
76-
self.ui_video_control.videoTabClicked.connect(lambda x: self.play_video(video_set[x].evf_video))
77-
self.ui_video_control.videoTabDoubleClicked.connect(lambda x: self.play_video(video_set[x].evf_video, True))
76+
self.ui_video_control.videoTabClicked.connect(self.play_video_tab_name_id)
77+
self.ui_video_control.videoTabDoubleClicked.connect(
78+
lambda a, b: self.play_video_tab_name_id(a, b, True))
7879
# self.tab_data.append(video_set)
7980
video = video_set[0].evf_video
8081
else:
@@ -179,6 +180,16 @@ def play_video(self, video, new_tab=False):
179180
self.timer_video.start(10)
180181

181182

183+
# 根据标签名和索引播放录像
184+
def play_video_tab_name_id(self, tab_name, idv, new_tab=False):
185+
tab_count = self.ui_video_control.tabWidget.count()
186+
for index in range(tab_count):
187+
tab_widget = self.ui_video_control.tabWidget.widget(index)
188+
if tab_widget.tab_name == tab_name:
189+
self.play_video(tab_widget.video_set[idv].evf_video, new_tab)
190+
return
191+
192+
182193
# 切换标签时,播放标签中的录像
183194
def on_tab_clicked(self, idt):
184195
if isinstance(self.ui_video_control.tabWidget.widget(idt), videoControl.VideoTabWidget):

0 commit comments

Comments
 (0)