feat：evfs施工中

eee555 · eee555 · commit 2fb659ac5410 · 2025-11-13T14:53:37.000+08:00
diff --git a/src/mineSweeperGUI.py b/src/mineSweeperGUI.py
@@ -621,7 +621,7 @@ def dump_evf_file_data(self):
                 self.label.ms_board.generate_evf_v4_raw_data()
                 # 补上校验值
                 checksum = self.checksum_guard.get_checksum(
-                    self.label.ms_board.raw_data[:-1])
+                    self.label.ms_board.raw_data[:-2])
                 self.label.ms_board.checksum = checksum
             return
         elif isinstance(self.label.ms_board, ms.EvfVideo):
diff --git a/src/mineSweeperVideoPlayer.py b/src/mineSweeperVideoPlayer.py
@@ -13,6 +13,10 @@ class MineSweeperVideoPlayer(MineSweeperGUIEvent):
     # 打开录像文件的回调
     def action_OpenFile(self, openfile_name=None):
         self.setting_path / 'replay'
+        
+        self.ui_video_control = videoControl.ui_Form(self.r_path, self.game_setting,
+                                                     self.mainWindow)
+        
         self.unlimit_cursor()
         if not openfile_name:
             openfile_name = QFileDialog.\
@@ -39,32 +43,50 @@ def action_OpenFile(self, openfile_name=None):
             elif openfile_name[-4:] == "evfs":
                 video_set = ms.Evfs(openfile_name)
                 # 包含对每个evf的parse
-                video_set.parse()
-                video = video_set[0].evf_video
+                # video_set.parse()
+                # video = video_set[0].evf_video
             else:
                 return
         except:
             return
-        self.play_video(video, video_set)
+        
+        
+        if video_set:
+            # 包含对每个evf的parse
+            video_set.parse()
+            video_set.analyse()
+            video_set.analyse_for_features(["high_risk_guess", "jump_judge", "needless_guess",
+                                            "mouse_trace", "vision_transfer", "pluck",
+                                            "super_fl_local"])
+            self.ui_video_control.add_new_video_set_tab(video_set)
+            video = video_set[0].evf_video
+        else:
+            video.parse_video()
+            video.analyse()
+            video.analyse_for_features(["high_risk_guess", "jump_judge", "needless_guess",
+                                        "mouse_trace", "vision_transfer", "pluck",
+                                        "super_fl_local"])
+        self.ui_video_control.add_new_video_tab(video)
+        self.ui_video_control.videoTabClicked.connect(lambda x: self.play_video(video_set[x].evf_video))
+        self.play_video(video)
         
 
-    # 录像播放控制器关闭时，播放新文件
+    # 播放新录像，调整局面尺寸等
+    # 控制台中，不添加新标签、连接信号。假如关闭就展示
     # 播放AvfVideo、RmvVideo、EvfVideo、MvfVideo或BaseVideo
-    def play_video(self, video, video_set):
+    def play_video(self, video):
         # if self.game_state == 'display':
         #     self.ui_video_control.QWidget.close()
         # self.game_state = 'display'
         if self.game_state != 'display':
             self.game_state = 'display'
 
-        if not video_set:
-            video.parse_video()
-        video.analyse()
+        
         # 检查evf的checksum，其余录像没有鉴定能力
         if isinstance(video, ms.EvfVideo):
             self.score_board_manager.with_namespace({
                 "checksum_ok": self.checksum_guard.
-                valid_checksum(video.raw_data[:-33], video.checksum),
+                valid_checksum(video.raw_data[:-(len(video.checksum) + 2)], video.checksum),
             })
         else:
             self.score_board_manager.with_namespace({
@@ -78,18 +100,6 @@ def play_video(self, video, video_set):
             "column": video.column,
             "minenum": video.mine_num,
         })
-        video.analyse_for_features(["high_risk_guess", "jump_judge", "needless_guess",
-                                    "mouse_trace", "vision_transfer", "pluck",
-                                    "super_fl_local"])
-
-        # 组织录像评论
-        comments = []
-        for event in video.events:
-            t = event.time
-            comment = event.comments
-            if comment:
-                comments.append((t, [i.split(': ')
-                                for i in comment.split(';')[:-1]]))
         # 调整窗口
         if (video.row, video.column) != (self.row, self.column):
             self.setBoard(video.row, video.column, video.mine_num)
@@ -105,18 +115,14 @@ def play_video(self, video, video_set):
 
         self.timer_video = QTimer()
         self.timer_video.timeout.connect(self.video_playing_step)
-        self.ui_video_control = videoControl.ui_Form(self.r_path, video, video_set, comments,
-                                                     self.game_setting, self.mainWindow)
-        # self.mainWindow.closeEvent_.connect(self.ui_video_control.QWidget.close)
+        
         self.ui_video_control.pushButton_play.clicked.connect(self.video_play)
         self.ui_video_control.pushButton_replay.clicked.connect(
             self.video_replay)
         self.ui_video_control.videoSetTime.connect(self.video_set_time)
+        self.ui_video_control.videoSetTimePeriod.connect(self.video_set_a_time)
         self.ui_video_control.label_speed.wEvent.connect(self.video_set_speed)
-        for labels in self.ui_video_control.comments_labels:
-            labels[0].Release.connect(self.video_set_a_time)
-            labels[1].Release.connect(self.video_set_a_time)
-            labels[2].Release.connect(self.video_set_a_time)
+        
         self.ui_video_control.QWidget.show()
 
         self.video_time = video.video_start_time  # 录像当前时间
diff --git a/src/ui/uiComponents.py b/src/ui/uiComponents.py
@@ -216,25 +216,7 @@ def wheelEvent(self, event):
         self.setText(text)
         self.wEvent.emit(float(text))
 
-# 录像播放控制面板上的事件标签
-class CommentLabel(QtWidgets.QLabel):
-    Release = QtCore.pyqtSignal(int)
-    def __init__(self, parent, text, time_100, middle = True):
-        super(CommentLabel, self).__init__(parent)
-        if not isinstance(text, str):
-            text = "%.2f"%text
-        self.setText(text)
-        self.time_100 = time_100
-
-        font = QtGui.QFont()
-        font.setFamily("微软雅黑")
-        font.setPointSize(12)
-        self.setFont(font)
-        # self.setMinimumSize(QtCore.QSize(height, width))
-        if middle:
-            self.setAlignment(QtCore.Qt.AlignCenter)
-    def mouseReleaseEvent(self, e):
-        self.Release.emit(self.time_100)
+
 
 class ScoreTable(QtWidgets.QTableWidget):
     ...
diff --git a/src/ui/ui_video_control.py b/src/ui/ui_video_control.py
@@ -165,101 +165,15 @@ def setupUi(self, Form):
         self.tabWidget.setMovable(True)
         self.tabWidget.setTabBarAutoHide(True)
         self.tabWidget.setObjectName("tabWidget")
-        self.tab_0 = QtWidgets.QWidget()
-        self.tab_0.setObjectName("tab_0")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.tab_0)
-        self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout_2.setSpacing(0)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.scrollArea_0 = QtWidgets.QScrollArea(self.tab_0)
-        self.scrollArea_0.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
-        self.scrollArea_0.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.scrollArea_0.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
-        self.scrollArea_0.setWidgetResizable(True)
-        self.scrollArea_0.setObjectName("scrollArea_0")
-        self.scrollAreaWidgetContents_0 = QtWidgets.QWidget()
-        self.scrollAreaWidgetContents_0.setGeometry(QtCore.QRect(0, 0, 457, 459))
-        self.scrollAreaWidgetContents_0.setMinimumSize(QtCore.QSize(0, 0))
-        self.scrollAreaWidgetContents_0.setObjectName("scrollAreaWidgetContents_0")
-        self.label_video = QtWidgets.QLabel(self.scrollAreaWidgetContents_0)
-        self.label_video.setGeometry(QtCore.QRect(120, 0, 271, 42))
-        font = QtGui.QFont()
-        font.setFamily("微软雅黑")
-        font.setPointSize(12)
-        self.label_video.setFont(font)
-        self.label_video.setAlignment(QtCore.Qt.AlignCenter)
-        self.label_video.setObjectName("label_video")
-        self.checkBox_choose = QtWidgets.QCheckBox(self.scrollAreaWidgetContents_0)
-        self.checkBox_choose.setGeometry(QtCore.QRect(10, 0, 91, 42))
-        font = QtGui.QFont()
-        font.setFamily("微软雅黑")
-        font.setPointSize(12)
-        self.checkBox_choose.setFont(font)
-        self.checkBox_choose.setObjectName("checkBox_choose")
-        self.checkBox_choose.raise_()
-        self.label_video.raise_()
-        self.scrollArea_0.setWidget(self.scrollAreaWidgetContents_0)
-        self.verticalLayout_2.addWidget(self.scrollArea_0)
-        self.tabWidget.addTab(self.tab_0, "")
-        self.tab = QtWidgets.QWidget()
-        self.tab.setObjectName("tab")
-        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.tab)
-        self.verticalLayout_4.setContentsMargins(0, 0, 0, -1)
-        self.verticalLayout_4.setSpacing(0)
-        self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.scrollArea = QtWidgets.QScrollArea(self.tab)
-        self.scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
-        self.scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.scrollArea.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
-        self.scrollArea.setWidgetResizable(True)
-        self.scrollArea.setObjectName("scrollArea")
-        self.scrollAreaWidgetContents = QtWidgets.QWidget()
-        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 457, 448))
-        self.scrollAreaWidgetContents.setMinimumSize(QtCore.QSize(0, 0))
-        self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
-        self.label_time = QtWidgets.QLabel(self.scrollAreaWidgetContents)
-        self.label_time.setGeometry(QtCore.QRect(0, 0, 68, 42))
-        font = QtGui.QFont()
-        font.setFamily("微软雅黑")
-        font.setPointSize(12)
-        self.label_time.setFont(font)
-        self.label_time.setAlignment(QtCore.Qt.AlignCenter)
-        self.label_time.setObjectName("label_time")
-        self.label_tag = QtWidgets.QLabel(self.scrollAreaWidgetContents)
-        self.label_tag.setGeometry(QtCore.QRect(158, 0, 300, 42))
-        font = QtGui.QFont()
-        font.setFamily("微软雅黑")
-        font.setPointSize(12)
-        self.label_tag.setFont(font)
-        self.label_tag.setAlignment(QtCore.Qt.AlignCenter)
-        self.label_tag.setObjectName("label_tag")
-        self.label_event = QtWidgets.QLabel(self.scrollAreaWidgetContents)
-        self.label_event.setGeometry(QtCore.QRect(68, 0, 90, 42))
-        font = QtGui.QFont()
-        font.setFamily("微软雅黑")
-        font.setPointSize(12)
-        self.label_event.setFont(font)
-        self.label_event.setAlignment(QtCore.Qt.AlignCenter)
-        self.label_event.setObjectName("label_event")
-        self.scrollArea.setWidget(self.scrollAreaWidgetContents)
-        self.verticalLayout_4.addWidget(self.scrollArea)
-        self.tabWidget.addTab(self.tab, "")
         self.verticalLayout.addWidget(self.tabWidget)
 
         self.retranslateUi(Form)
-        self.tabWidget.setCurrentIndex(1)
+        self.tabWidget.setCurrentIndex(-1)
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def retranslateUi(self, Form):
         _translate = QtCore.QCoreApplication.translate
         self.pushButton_replay.setToolTip(_translate("Form", "重播"))
         self.pushButton_play.setToolTip(_translate("Form", "播放/暂停"))
         self.label_speed.setToolTip(_translate("Form", "滑动滚轮修改播放速度"))
-        self.label_video.setText(_translate("Form", "录像"))
-        self.checkBox_choose.setText(_translate("Form", "选择"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_0), _translate("Form", "目录"))
-        self.label_time.setText(_translate("Form", "时间"))
-        self.label_tag.setText(_translate("Form", "标签"))
-        self.label_event.setText(_translate("Form", "事件"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("Form", "录像1"))
 from ui.uiComponents import SpeedLabel
diff --git a/src/videoControl.py b/src/videoControl.py
diff --git a/uiFiles/ui_video_control.ui b/uiFiles/ui_video_control.ui
