gui细节调整(添加秒)

Kazeya27 · Mar 18, 2023 · 062c68e · 062c68e
1 parent 1184e86
commit 062c68e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 23 deletions.
diff --git a/guisrc/MainView.py b/guisrc/MainView.py
@@ -68,7 +68,7 @@ def confirm(self):
         for result in results:
             text += result.decode('utf-8') + "\n"
         self.outputView.setOutputView(text)
-        self.runTime.setText("运行时间：" + str(round(end - start, 2)))
+        self.runTime.setText("运行时间：" + str(round(end - start, 2)) + "s")
         # warn = WarningView("出现了blabla错误")
         # warn.show()
 

diff --git a/guisrc/OptionView.py b/guisrc/OptionView.py
@@ -78,30 +78,27 @@ def __init__(self):
         layout.addWidget(addition)
         self.setLayout(layout)
 
+    def setAdditionEnabled(self, isTrue: bool):
+        self.beginCharBox.setEnabled(isTrue)
+        self.endCharBox.setEnabled(isTrue)
+        self.banCharBox.setEnabled(isTrue)
+        self.circleBtn.setEnabled(isTrue)
+        if not isTrue:
+            self.beginCharBox.setCurrentIndex(0)
+            self.endCharBox.setCurrentIndex(0)
+            self.banCharBox.setCurrentIndex(0)
+
     def clickAllBtn(self):
         self._model = 0
-        self.beginCharBox.setEnabled(False)
-        self.beginCharBox.setCurrentIndex(0)
-        self.endCharBox.setEnabled(False)
-        self.endCharBox.setCurrentIndex(0)
-        self.banCharBox.setEnabled(False)
-        self.banCharBox.setCurrentIndex(0)
-        self.circleBtn.setEnabled(False)
-        self.circleBtn.setChecked(False)
+        self.setAdditionEnabled(False)
 
     def clickWordBtn(self):
         self._model = 1
-        self.beginCharBox.setEnabled(True)
-        self.endCharBox.setEnabled(True)
-        self.banCharBox.setEnabled(True)
-        self.circleBtn.setEnabled(True)
+        self.setAdditionEnabled(True)
 
     def clickLetterBtn(self):
         self._model = 2
-        self.beginCharBox.setEnabled(True)
-        self.endCharBox.setEnabled(True)
-        self.banCharBox.setEnabled(True)
-        self.circleBtn.setEnabled(True)
+        self.setAdditionEnabled(True)
 
     def getOption(self):
         model = self._model

diff --git a/guisrc/WarningView.py b/guisrc/WarningView.py
@@ -9,4 +9,3 @@ def __init__(self, msg):
         warn.setIcon(QMessageBox.Critical)
         warn.setWindowTitle("异常提示")
         warn.exec_()
-
diff --git a/src/main.cpp b/src/main.cpp
@@ -238,7 +238,7 @@ void print_ans(int len,char* result[],int operate)
     fout.close();
 }
 
-int test_main(int argc,char* argv[])
+int main(int argc,char* argv[])
 {
     char* words[20010];
     char* result[20010];

diff --git a/test/CliTests/config7.txt b/test/CliTests/config7.txt
@@ -1,4 +1,4 @@
 -2
 chain.txt
 -h
-a
+A
diff --git a/test/CliTests/config8.txt b/test/CliTests/config8.txt
@@ -1,4 +1,4 @@
 -2
 chain.txt
 -t
-a
+A
diff --git a/test/CliTests/config9.txt b/test/CliTests/config9.txt
@@ -1,4 +1,6 @@
 -2
 chain.txt
 -j
-a
+A
+-h
+b
diff --git a/test/CliTests/long.txt b/test/CliTests/long.txt
@@ -1 +1 @@
-aaa aab bb bc cc cd dd de ee ef ff fg gg gh hh hi ii ij jj jk kk kl ll lm mm mn nn no oo op pp pq qq
+bc cc cd de df ee ef eg ff fg gg gh gi hh hi ii ij jk jl jj kk kl ll lm ln mm mn nn
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,3 @@ def __init__(self, msg):
		warn.setIcon(QMessageBox.Critical)
		warn.setWindowTitle("异常提示")
		warn.exec_()
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		aaa aab bb bc cc cd dd de ee ef ff fg gg gh hh hi ii ij jj jk kk kl ll lm mm mn nn no oo op pp pq qq
		bc cc cd de df ee ef eg ff fg gg gh gi hh hi ii ij jk jl jj kk kl ll lm ln mm mn nn