From 3954fa4281e374c310a0c5b11168830513f370ae Mon Sep 17 00:00:00 2001 From: "weiye.wang" Date: Fri, 21 Jun 2024 22:45:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E5=88=97=E5=8F=8A=E5=8D=95=E4=BA=BA?= =?UTF-8?q?=E8=AE=B2=E4=B9=89=E7=94=9F=E6=88=90=E4=B8=AD=E7=9A=84=E5=B9=B4?= =?UTF-8?q?=E7=BA=A7=E5=92=8C=E7=8F=AD=E7=BA=A7=E9=80=89=E6=8B=A9=E6=94=B9?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 工具v4/database_tools_2.py | 2 +- 工具v4/单人讲义生成.py | 3 ++- 工具v4/系列讲义生成.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/工具v4/database_tools_2.py b/工具v4/database_tools_2.py index e38d6c67..5b87aab1 100644 --- a/工具v4/database_tools_2.py +++ b/工具v4/database_tools_2.py @@ -2483,7 +2483,7 @@ def SubstringOccurence(regex,string): #生成regex在string中出现的所有位 poslist = [item.start() for item in re.finditer(regex,string)] return poslist -def select_grade_from_pro_dict(prodict,grades): +def select_grade_from_pro_dict(prodict,grades): #grades是一个list if len(grades) == 0: return prodict else: diff --git a/工具v4/单人讲义生成.py b/工具v4/单人讲义生成.py index 4a5c431e..1e21b5f0 100644 --- a/工具v4/单人讲义生成.py +++ b/工具v4/单人讲义生成.py @@ -74,7 +74,8 @@ class MyWindow_drsc(QWidget,Ui_Form): structures_dict = load_structures_dict_from_mariadb(mycursor) raw_pro_dict,obj_dict,bn_dict,unit_obj_dict = generateDictsfromMariaDB(mycursor) if self.radioButton_teacher.isChecked() and self.checkBox_usages.isChecked() and not self.lineEdit_class.text().strip() == "": - grades = self.lineEdit_class.text().strip().split(",") + grades = RefinePunctuations(self.lineEdit_class.text().strip()).split(",") + grades = [g.strip() for g in grades] else: grades = [] pro_dict = select_grade_from_pro_dict(raw_pro_dict,grades) diff --git a/工具v4/系列讲义生成.py b/工具v4/系列讲义生成.py index f60aa5aa..a44ab817 100644 --- a/工具v4/系列讲义生成.py +++ b/工具v4/系列讲义生成.py @@ -85,7 +85,8 @@ class MyWindow_jysc(QWidget,Ui_Form): structures_dict = load_structures_dict_from_mariadb(mycursor) raw_pro_dict,obj_dict,bn_dict,unit_obj_dict = generateDictsfromMariaDB(mycursor) if self.radioButton_teacher.isChecked() and self.checkBox_usages.isChecked() and not self.lineEdit_grades.text().strip() == "": - grades = self.lineEdit_grades.text().strip().split(",") + grades = RefinePunctuations(self.lineEdit_grades.text().strip()).split(",") + grades = [g.strip() for g in grades] else: grades = [] pro_dict = select_grade_from_pro_dict(raw_pro_dict,grades)