feat(ui): show corresponding contestant name when judging (#197)

alphagocc · alphagocc · commit 7289cd7e0759 · 2024-07-15T15:50:22.000+08:00
diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
@@ -1 +1 @@
-269
+270
diff --git a/src/core/contest.h b/src/core/contest.h
@@ -71,7 +71,7 @@ class Contest : public QObject {
 	void taskDeletedForViewer(int);
 	void problemTitleChanged();
 	void dialogAlert(QString);
-	void singleCaseFinished(int, int, int, int, int, int, int);
+	void singleCaseFinished(QString, int, int, int, int, int, int, int);
 	void singleSubtaskDependenceFinished(int, int, int);
 	void taskJudgingStarted(QString);
 	void taskJudgingFinished();
diff --git a/src/core/taskjudger.cpp b/src/core/taskjudger.cpp
@@ -519,10 +519,10 @@ int TaskJudger::judge() {
 					    qMin(nowScore, statusToScore(overallStatus[i], task->getTestCase(i)->getFullScore()));
 			}
 
-			emit singleCaseFinished(task->getTestCase(i)->getTimeLimit(), i, j, int(result[i][j]),
-			                        (j + 1 == task->getTestCase(i)->getInputFiles().size() ? 1 : -1) *
-			                            nowScore,
-			                        timeUsed[i][j], memoryUsed[i][j]);
+			emit singleCaseFinished(
+			    contestantName, task->getTestCase(i)->getTimeLimit(), i, j, int(result[i][j]),
+			    (j + 1 == task->getTestCase(i)->getInputFiles().size() ? 1 : -1) * nowScore, timeUsed[i][j],
+			    memoryUsed[i][j]);
 
 			if (score[i][j] < testCaseScore[i])
 				testCaseScore[i] = score[i][j];
@@ -534,8 +534,8 @@ int TaskJudger::judge() {
 
 void TaskJudger::makeDialogAlert(QString msg) { emit dialogAlert(std::move(msg)); }
 void TaskJudger::taskSkipped(const std::pair<int, int> &cur) {
-	emit singleCaseFinished(task->getTestCase(cur.first)->getTimeLimit(), cur.first, cur.second,
-	                        int(result[cur.first][cur.second]), 0, 0, 0);
+	emit singleCaseFinished(contestant->getContestantName(), task->getTestCase(cur.first)->getTimeLimit(),
+	                        cur.first, cur.second, int(result[cur.first][cur.second]), 0, 0, 0);
 }
 
 void TaskJudger::stop() { isJudging = false; }
diff --git a/src/core/taskjudger.h b/src/core/taskjudger.h
@@ -80,7 +80,7 @@ class TaskJudger : public QObject {
 	void judgingStarted(QString);
 	void judgingFinished();
 	void dialogAlert(QString);
-	void singleCaseFinished(int, int, int, int, int, int, int);
+	void singleCaseFinished(QString, int, int, int, int, int, int, int);
 	void singleSubtaskDependenceFinished(int, int, int);
 	void compileError(int, int);
 	void stopJudgingSignal();
diff --git a/src/judgingdialog.cpp b/src/judgingdialog.cpp
@@ -84,8 +84,8 @@ void JudgingDialog::judgeAll() {
 	accept();
 }
 
-void JudgingDialog::singleCaseFinished(int progress, int x, int y, int result, int scoreGot, int timeUsed,
-                                       int memoryUsed) {
+void JudgingDialog::singleCaseFinished(QString contestantName, int progress, int x, int y, int result,
+                                       int scoreGot, int timeUsed, int memoryUsed) {
 	bool isOnMaxValue =
 	    ui->logViewer->verticalScrollBar()->value() == ui->logViewer->verticalScrollBar()->maximum();
 	QTextBlockFormat blockFormat;
@@ -219,7 +219,8 @@ void JudgingDialog::singleCaseFinished(int progress, int x, int y, int result, i
 			break;
 	}
 
-	cursor->insertText(tr("Test case %1.%2: ").arg(x + 1).arg(y + 1), preCharFormat);
+	cursor->insertText(tr("Contestant %3 Test case %1.%2: ").arg(x + 1).arg(y + 1).arg(contestantName),
+	                   preCharFormat);
 	cursor->insertText(text, charFormat);
 
 	if (addtext.length() > 0)
diff --git a/src/judgingdialog.h b/src/judgingdialog.h
@@ -44,7 +44,7 @@ class JudgingDialog : public QDialog {
 
   public slots:
 	void dialogAlert(const QString &);
-	void singleCaseFinished(int, int, int, int, int, int, int);
+	void singleCaseFinished(QString, int, int, int, int, int, int, int);
 	void singleSubtaskDependenceFinished(int, int, int);
 	void taskJudgingStarted(const QString &);
 	void taskJudgedDisplay(const QString &, const QList<QList<int>> &, const int);
diff --git a/translations/en_US.ts b/translations/en_US.ts
@@ -1211,10 +1211,6 @@ Depends: </source>
         <source>Special judge run time error</source>
         <translation></translation>
     </message>
-    <message>
-        <source>Test case %1.%2: </source>
-        <translation></translation>
-    </message>
     <message>
         <source>Subtask Dependence %1: #%2: </source>
         <translation></translation>
@@ -1288,6 +1284,10 @@ Depends: </source>
         <source>Main grader (grader.*) cannot be found</source>
         <translation></translation>
     </message>
+    <message>
+        <source>Contestant %3 Test case %1.%2: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>JudgingThread</name>
@@ -1936,14 +1936,6 @@ Depends: </source>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Pure</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Lost</source>
-        <translation></translation>
-    </message>
     <message>
         <source>Enable debug output</source>
         <translation></translation>
diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
@@ -1165,10 +1165,6 @@ Depends: </source>
         <source>Cancel</source>
         <translation>停止测试</translation>
     </message>
-    <message>
-        <source>Test case %1.%2: </source>
-        <translation>测试点 %1.%2： </translation>
-    </message>
     <message>
         <source>Correct answer</source>
         <translation>答案正确</translation>
@@ -1313,6 +1309,10 @@ Depends: </source>
         <source>Main grader (grader.*) cannot be found</source>
         <translation>未找到主接口程序（grader.*）</translation>
     </message>
+    <message>
+        <source>Contestant %3 Test case %1.%2: </source>
+        <translation>选手 %3 测试点 %1.%2: </translation>
+    </message>
 </context>
 <context>
     <name>JudgingThread</name>
@@ -1961,14 +1961,6 @@ Depends: </source>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Pure</source>
-        <translation>Pure</translation>
-    </message>
-    <message>
-        <source>Lost</source>
-        <translation>Lost</translation>
-    </message>
     <message>
         <source>Enable debug output</source>
         <translation>启用 Debug 输出</translation>
diff --git a/translations/zh_TW.ts b/translations/zh_TW.ts
@@ -1165,10 +1165,6 @@ Depends: </source>
         <source>Cancel</source>
         <translation>停止測試</translation>
     </message>
-    <message>
-        <source>Test case %1.%2: </source>
-        <translation>測試點 %1.%2： </translation>
-    </message>
     <message>
         <source>Correct answer</source>
         <translation>答案正確</translation>
@@ -1313,6 +1309,10 @@ Depends: </source>
         <source>Main grader (grader.*) cannot be found</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Contestant %3 Test case %1.%2: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>JudgingThread</name>
@@ -1961,14 +1961,6 @@ Depends: </source>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Pure</source>
-        <translation>Pure</translation>
-    </message>
-    <message>
-        <source>Lost</source>
-        <translation>Lost</translation>
-    </message>
     <message>
         <source>Enable debug output</source>
         <translation>啓用 Debug 輸出</translation>
