wangweiye
/
mathdeptv2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

系列及单人讲义生成中的年级和班级选择改善

This commit is contained in:
weiye.wang 2024-06-21 22:45:39 +08:00
parent fb6ac1f43b
commit 3954fa4281
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
工具v4/database_tools_2.py
View File

@ -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:

3
工具v4/单人讲义生成.py
View File

@ -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)

3
工具v4/系列讲义生成.py
View File

@ -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)