From fad8953ca0a183bb07c03f52b28abc966f9c1bf0 Mon Sep 17 00:00:00 2001
From: J_sky <bosichong@qq.com>
Date: Wed, 14 Nov 2018 20:05:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B2=BE=E7=AE=80=E4=BA=86?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=9A=84=E4=B8=80=E4=BA=9B=E7=AE=97=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=96=B0=E6=9E=84=E5=BB=BA=E4=BA=86GUI?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=9A=E6=9C=AA=E5=AE=8C=E6=88=90=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E6=95=B4=E5=90=88=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 118 ++++++++++++++++++------------
 App.py              | 171 ++++++++++++++++++++++++++++++++------------
 PrintPreview.py     |   3 +-
 Psmrcddup.py        |  62 +++++++++-------
 4 files changed, 237 insertions(+), 117 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 494e639..c0636f5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="34e32fa1-0595-45b0-acb0-186f150c9334" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/App.py" afterPath="$PROJECT_DIR$/App.py" />
+      <change beforePath="$PROJECT_DIR$/PrintPreview.py" afterPath="$PROJECT_DIR$/PrintPreview.py" />
       <change beforePath="$PROJECT_DIR$/Psmrcddup.py" afterPath="$PROJECT_DIR$/Psmrcddup.py" />
-      <change beforePath="$PROJECT_DIR$/utils/PSM_help.py" afterPath="$PROJECT_DIR$/utils/PSM_help.py" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -18,19 +19,18 @@
     <SUITE FILE_PATH="coverage/PrimarySchoolMath$Psm.coverage" NAME="Psm Coverage Results" MODIFIED="1540345215266" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/PrimarySchoolMath$PrintPreview.coverage" NAME="PrintPreview Coverage Results" MODIFIED="1540812288196" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/PrimarySchoolMath$text.coverage" NAME="text Coverage Results" MODIFIED="1541337268307" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/PrimarySchoolMath$App.coverage" NAME="App Coverage Results" MODIFIED="1541818052166" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/PrimarySchoolMath$PSM_help.coverage" NAME="PSM_help Coverage Results" MODIFIED="1542098949345" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/utils" />
-    <SUITE FILE_PATH="coverage/PrimarySchoolMath$Psm_rcddup.coverage" NAME="Psm-rcddup Coverage Results" MODIFIED="1542108835377" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/PrimarySchoolMath$PSM_help.coverage" NAME="PSM_help Coverage Results" MODIFIED="1542154100183" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/utils" />
+    <SUITE FILE_PATH="coverage/PrimarySchoolMath$App.coverage" NAME="App Coverage Results" MODIFIED="1542196958635" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/PrimarySchoolMath$Psm_rcddup.coverage" NAME="Psm-rcddup Coverage Results" MODIFIED="1542196287416" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
       <file leaf-file-name="PSM_help.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/utils/PSM_help.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="386">
-              <caret line="77" column="47" lean-forward="true" selection-start-line="77" selection-start-column="47" selection-end-line="77" selection-end-column="47" />
+            <state relative-caret-position="351">
+              <caret line="507" column="39" lean-forward="true" selection-start-line="507" selection-start-column="39" selection-end-line="507" selection-end-column="39" />
               <folding>
-                <element signature="e#285#298#0" expanded="true" />
                 <element signature="e#4985#5200#0" expanded="false" />
                 <element signature="e#5505#5714#0" expanded="false" />
                 <element signature="e#5751#5959#0" expanded="false" />
@@ -79,7 +79,30 @@
       <find>print(</find>
       <find>print</find>
       <find>raise</find>
+      <find>min_label</find>
+      <find>filter_entry</find>
+      <find>rb</find>
+      <find>t3</find>
+      <find>add</find>
+      <find>mult</find>
     </findStrings>
+    <replaceStrings>
+      <replace>add1_label</replace>
+      <replace>add2_label</replace>
+      <replace>add3_label</replace>
+      <replace>add1_entry</replace>
+      <replace>add3_entry</replace>
+      <replace>add4_entry</replace>
+      <replace>add</replace>
+      <replace>sub</replace>
+      <replace>mult</replace>
+      <replace>multistep</replace>
+      <replace>sub1</replace>
+      <replace>subattrs</replace>
+      <replace>mult1</replace>
+      <replace>multattrs</replace>
+      <replace>div</replace>
+    </replaceStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -91,15 +114,15 @@
         <option value="$PROJECT_DIR$/Psm.py" />
         <option value="$PROJECT_DIR$/Psm-rcddup.py" />
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/PrintPreview.py" />
-        <option value="$PROJECT_DIR$/App.py" />
         <option value="$PROJECT_DIR$/text.py" />
         <option value="$PROJECT_DIR$/test.py" />
         <option value="$PROJECT_DIR$/utils/utils.py" />
         <option value="$PROJECT_DIR$/utils/__init__.py" />
         <option value="$PROJECT_DIR$/utils.PSM_help.py" />
         <option value="$PROJECT_DIR$/utils/PSM_help.py" />
+        <option value="$PROJECT_DIR$/PrintPreview.py" />
         <option value="$PROJECT_DIR$/Psmrcddup.py" />
+        <option value="$PROJECT_DIR$/App.py" />
       </list>
     </option>
   </component>
@@ -148,8 +171,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -174,7 +197,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.Psm-rcddup">
+  <component name="RunManager" selected="Python.App">
     <configuration name="App" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -279,9 +302,9 @@
     </list>
     <recent_temporary>
       <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="Python.Psm-rcddup" />
-        <item index="1" class="java.lang.String" itemvalue="Python.PSM_help" />
-        <item index="2" class="java.lang.String" itemvalue="Python.App" />
+        <item index="0" class="java.lang.String" itemvalue="Python.App" />
+        <item index="1" class="java.lang.String" itemvalue="Python.Psm-rcddup" />
+        <item index="2" class="java.lang.String" itemvalue="Python.PSM_help" />
         <item index="3" class="java.lang.String" itemvalue="Python.text" />
         <item index="4" class="java.lang.String" itemvalue="Python.PrintPreview" />
       </list>
@@ -305,6 +328,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1920" height="992" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -312,11 +336,11 @@
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.369863" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.14951769" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14951769" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="SciView" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32972583" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21597" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21864952" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39954337" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -363,7 +387,7 @@
         <state relative-caret-position="972">
           <caret line="54" column="24" lean-forward="true" selection-start-line="54" selection-start-column="24" selection-end-line="54" selection-end-column="24" />
           <folding>
-            <element signature="e#285#298#0" expanded="true" />
+            <element signature="e#285#298#0" expanded="false" />
             <element signature="e#4985#5200#0" expanded="false" />
             <element signature="e#5505#5714#0" expanded="false" />
             <element signature="e#5751#5959#0" expanded="false" />
@@ -592,13 +616,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file:///Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/tkinter/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="1698" column="0" lean-forward="false" selection-start-line="1698" selection-start-column="0" selection-end-line="1698" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
@@ -606,13 +623,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/PrintPreview.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="481">
-          <caret line="34" column="26" lean-forward="false" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test.py" />
     <entry file="file://$PROJECT_DIR$/utils/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
@@ -622,13 +632,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/utils.PSM_help.py" />
-    <entry file="file://$PROJECT_DIR$/App.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-235">
-          <caret line="149" column="26" lean-forward="false" selection-start-line="149" selection-start-column="26" selection-end-line="149" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Library/Caches/PyCharm2017.3/python_stubs/-1199943127/builtins.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="169">
@@ -668,10 +671,38 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/PrintPreview.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="511">
+          <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
+          <folding>
+            <element signature="e#584#628#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/tkinter/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="166">
+          <caret line="2292" column="0" lean-forward="false" selection-start-line="2292" selection-start-column="0" selection-end-line="2292" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/App.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="166">
+          <caret line="108" column="0" lean-forward="false" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
+          <folding>
+            <element signature="e#628#651#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/Psmrcddup.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="202" column="14" lean-forward="false" selection-start-line="202" selection-start-column="14" selection-end-line="202" selection-end-column="14" />
+        <state relative-caret-position="753">
+          <caret line="167" column="21" lean-forward="true" selection-start-line="167" selection-start-column="21" selection-end-line="167" selection-end-column="21" />
           <folding>
             <element signature="e#703#716#0" expanded="true" />
           </folding>
@@ -680,10 +711,9 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/utils/PSM_help.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="386">
-          <caret line="77" column="47" lean-forward="true" selection-start-line="77" selection-start-column="47" selection-end-line="77" selection-end-column="47" />
+        <state relative-caret-position="351">
+          <caret line="507" column="39" lean-forward="true" selection-start-line="507" selection-start-column="39" selection-end-line="507" selection-end-column="39" />
           <folding>
-            <element signature="e#285#298#0" expanded="true" />
             <element signature="e#4985#5200#0" expanded="false" />
             <element signature="e#5505#5714#0" expanded="false" />
             <element signature="e#5751#5959#0" expanded="false" />
diff --git a/App.py b/App.py
index 16016c3..d0bdb82 100644
--- a/App.py
+++ b/App.py
@@ -43,6 +43,8 @@ from tkinter import messagebox  # 导入提示窗口包
 from Psmrcddup import Generator
 from PrintPreview import PrintPreview
 
+__version__ = "0.1.1"
+
 
 
 psm_list =[] #最终需要打印的所有口算题卷子
@@ -104,7 +106,7 @@ def createPSM():
 
     tmp_signum = ra1Var.get()#获取题类型设置
     tmp_step = rc1Var.get()#获取需要几步计算
-    tmp_range = (int(min_entry.get()),int(max_entry.get()))#获取数值取值范围
+    tmp_range = (int(min_entry.get()),int(add2_entry.get()))#获取数值取值范围
     tmp_same = sameVar.get()#获取题是否可以相同的设置
     tmp_carry = rb1Var.get()#获取是否需要进退位
     tmp_filter = eval('('+filter_entry.get()+')')#获取过滤数字
@@ -184,7 +186,7 @@ root.title(app_title)#设置窗口标题
 top_frame = tk.Frame(root)
 top_frame.pack(fill=tk.X,)
 
-t_frame = tk.LabelFrame(top_frame, text="口算题类型选择", padx=5, pady=5)
+t_frame = tk.LabelFrame(top_frame, text="口算题类型选择及详细设置", padx=5, pady=5)
 t_frame.pack(fill=tk.X, side=tk.TOP)
 
 t1_frame = tk.LabelFrame(t_frame, text="加减乘除选择", padx=5, pady=5)
@@ -193,17 +195,31 @@ t1_frame.pack(fill=tk.X, side=tk.LEFT)
 t2_frame = tk.LabelFrame(t_frame, text="选择几步口算", padx=5, pady=5)
 t2_frame.pack(fill=tk.X, side=tk.LEFT)
 
-t3_frame = tk.LabelFrame(t_frame, text="请选择", padx=5, pady=5)
+t3_frame = tk.LabelFrame(t_frame, text="其它设置", padx=5, pady=5)
 t3_frame.pack(fill=tk.X, side=tk.LEFT)
 
-c_frame = tk.LabelFrame(top_frame, text="口算题详细设置", padx=5, pady=5)
+
+
+c_frame = tk.LabelFrame(top_frame, text="加减乘除法详细设置", padx=5, pady=5)
 c_frame.pack(fill=tk.X, side=tk.TOP)
 
-l1_frame = tk.LabelFrame(c_frame, text="数值范围及过滤选择", padx=5, pady=5)
-l1_frame.pack(fill=tk.X, side=tk.TOP)
+addattrs_frame = tk.LabelFrame(c_frame, text="加法", padx=5, pady=5)
+addattrs_frame.pack(fill=tk.X, side=tk.TOP)
+
+subattrs_frame = tk.LabelFrame(c_frame, text="减法", padx=5, pady=5)
+subattrs_frame.pack(fill=tk.X, side=tk.TOP)
+
+
+multattrs_frame = tk.LabelFrame(c_frame, text="乘法", padx=5, pady=5)
+multattrs_frame.pack(fill=tk.X, side=tk.TOP)
+
+divattrs_frame = tk.LabelFrame(c_frame, text="除法", padx=5, pady=5)
+divattrs_frame.pack(fill=tk.X, side=tk.TOP)
+
+multistep_frame = tk.LabelFrame(c_frame, text="多步运算题", padx=5, pady=5)
+multistep_frame.pack(fill=tk.X, side=tk.TOP)
+
 
-l_frame = tk.LabelFrame(c_frame, text="进退位设置", padx=5, pady=5)
-l_frame.pack(fill=tk.X, side=tk.TOP)
 
 c1_frame = tk.LabelFrame(top_frame, text="添加口算题到卷子", padx=5, pady=5)
 c1_frame.pack(fill=tk.X, side=tk.TOP)
@@ -236,10 +252,7 @@ ra4=tk.Radiobutton(t1_frame,text='除法',value='4',variable=ra1Var,command=filt
 ra4.pack(anchor=tk.W,side=tk.LEFT)
 ra1.select()
 
-sameVar = tk.IntVar()
-cbt = tk.Checkbutton(t3_frame,text='题可相同', variable = sameVar,)
-cbt.pack(anchor=tk.W,side=tk.LEFT)
-cbt.select()
+
 
 rc1Var = tk.IntVar()
 rc1=tk.Radiobutton(t2_frame,text='单步',value='1',variable=rc1Var)
@@ -250,45 +263,115 @@ rc3=tk.Radiobutton(t2_frame,text='三步',value='3',variable=rc1Var,state=tk.DIS
 rc3.pack(anchor=tk.W,side=tk.LEFT)
 rc1.select()
 
-###########数值范围及过滤选择############
-
-
-min_label = tk.Label(l1_frame, text="最小值:",font=("Symbol", 14))
-min_label.pack(side=tk.LEFT,fill=tk.X)
-min_entry = tk.Entry(l1_frame,width=8)
-min_entry.pack(fill=tk.X, side= tk.LEFT)
-min_entry.insert(0,'0')
 
-max_label = tk.Label(l1_frame, text="最大值:",font=("Symbol", 14))
-max_label.pack(side=tk.LEFT,fill=tk.X)
-max_entry = tk.Entry(l1_frame,width=8)
-max_entry.pack(fill=tk.X, side= tk.LEFT)
-max_entry.insert(0,'20')
-
-filter_label = tk.Label(l1_frame, text="过滤值:",font=("Symbol", 14))
-filter_label.pack(side=tk.LEFT,fill=tk.X)
-filter_entry = tk.Entry(l1_frame,width=8)
-filter_entry.pack(fill=tk.X, side= tk.LEFT)
-filter_entry.insert(0,'0,1')
 
 sumVar = tk.IntVar()
 sumVar.set("20")
-sum_label = tk.Label(l1_frame, text="生成数量:",font=("Symbol", 14))
+sum_label = tk.Label(t3_frame, text="生成数量:",font=("Symbol", 14))
 sum_label.pack(side=tk.LEFT,fill=tk.X)
-sum_entry = tk.Entry(l1_frame,width=8,textvariable=sumVar)
+sum_entry = tk.Entry(t3_frame,width=8,textvariable=sumVar)
 sum_entry.pack(fill=tk.X, side= tk.LEFT)
 
-###########口算题进退位选择############
-rb1Var = tk.IntVar()
-rb1=tk.Radiobutton(l_frame,text='随机',value='1',variable=rb1Var,command=filterPSM)
-rb1.pack(anchor=tk.W,side=tk.LEFT)
-rb2=tk.Radiobutton(l_frame,text='加法进位',value='2',variable=rb1Var,command=filterPSM)
-rb2.pack(anchor=tk.W,side=tk.LEFT)
-rb3=tk.Radiobutton(l_frame,text='减法退位',value='3',variable=rb1Var,command=filterPSM)
-rb3.pack(anchor=tk.W,side=tk.LEFT)
-rb4=tk.Radiobutton(l_frame,text='加法无进位或减法无退位',value='4',variable=rb1Var,command=filterPSM)
-rb4.pack(anchor=tk.W,side=tk.LEFT)
-rb1.select()
+###########addattrs############
+
+
+
+
+add2_label = tk.Label(addattrs_frame, text="运算结果范围:",font=("Symbol", 14))
+add2_label.pack(side=tk.LEFT,fill=tk.X)
+add2_entry = tk.Entry(addattrs_frame,width=8)
+add2_entry.pack(fill=tk.X, side= tk.LEFT)
+add2_entry.insert(0,'[1,20]')
+
+
+
+add1Var = tk.IntVar()
+add1=tk.Radiobutton(addattrs_frame,text='随机进位',value='1',variable=add1Var,command=filterPSM)
+add1.pack(anchor=tk.W,side=tk.LEFT)
+add2=tk.Radiobutton(addattrs_frame,text='加法进位',value='2',variable=add1Var,command=filterPSM)
+add2.pack(anchor=tk.W,side=tk.LEFT)
+add3=tk.Radiobutton(addattrs_frame,text='没有进位',value='3',variable=add1Var,command=filterPSM)
+add3.pack(anchor=tk.W,side=tk.LEFT)
+add1.select()
+
+
+
+
+###########subattrs############
+
+
+
+
+sub1_label = tk.Label(subattrs_frame, text="运算结果范围:",font=("Symbol", 14))
+sub1_label.pack(side=tk.LEFT,fill=tk.X)
+sub1_entry = tk.Entry(subattrs_frame,width=8)
+sub1_entry.pack(fill=tk.X, side= tk.LEFT)
+sub1_entry.insert(0,'[1,19]')
+
+sub1Var = tk.IntVar()
+sub1=tk.Radiobutton(subattrs_frame,text='随机退位',value='1',variable=sub1Var,command=filterPSM)
+sub1.pack(anchor=tk.W,side=tk.LEFT)
+sub2=tk.Radiobutton(subattrs_frame,text='减法退位',value='2',variable=sub1Var,command=filterPSM)
+sub2.pack(anchor=tk.W,side=tk.LEFT)
+sub3=tk.Radiobutton(subattrs_frame,text='没有退位',value='3',variable=sub1Var,command=filterPSM)
+sub3.pack(anchor=tk.W,side=tk.LEFT)
+sub1.select()
+
+
+
+
+###########multattrs############
+
+
+
+
+mult1_label = tk.Label(multattrs_frame, text="运算结果范围:",font=("Symbol", 14))
+mult1_label.pack(side=tk.LEFT,fill=tk.X)
+mult1_entry = tk.Entry(multattrs_frame,width=8)
+mult1_entry.pack(fill=tk.X, side= tk.LEFT)
+mult1_entry.insert(0,'[1,81]')
+
+
+
+
+
+###########divattrs############
+
+
+
+div1_label = tk.Label(divattrs_frame, text="运算结果范围:",font=("Symbol", 14))
+div1_label.pack(side=tk.LEFT,fill=tk.X)
+div1_entry = tk.Entry(divattrs_frame,width=8)
+div1_entry.pack(fill=tk.X, side= tk.LEFT)
+div1_entry.insert(0,'[1,9]')
+
+
+
+
+###########multistep############
+
+
+multistep1_label = tk.Label(multistep_frame, text="运算项数值范围:",font=("Symbol", 14))
+multistep1_label.pack(side=tk.LEFT,fill=tk.X)
+multistep1_entry = tk.Entry(multistep_frame,width=34)
+multistep1_entry.pack(fill=tk.X, side= tk.LEFT)
+multistep1_entry.insert(0,'[[1,9],[1,9],[1,9],[1,9]]')
+
+multistep2_label = tk.Label(multistep_frame, text="运算符号设置:",font=("Symbol", 14))
+multistep2_label.pack(side=tk.LEFT,fill=tk.X)
+multistep2_entry = tk.Entry(multistep_frame,width=22)
+multistep2_entry.pack(fill=tk.X, side= tk.LEFT)
+multistep2_entry.insert(0,'[[1,2,3],[1,2,3],[1,2],[1,2]]')
+
+
+
+multistep1=tk.Checkbutton(multistep_frame,text='使用括号',command=filterPSM)
+multistep1.pack(anchor=tk.W,side=tk.LEFT)
+
+
+
+
+###########subattrs############
 
 
 
diff --git a/PrintPreview.py b/PrintPreview.py
index 1919ba4..5c5b19f 100644
--- a/PrintPreview.py
+++ b/PrintPreview.py
@@ -31,8 +31,6 @@
 Author  : J.sky
 Mail    : bosichong@qq.com
 
-Author  : rcddup
-Mail    : 410093793@qq.com
 
 '''
 
@@ -41,6 +39,7 @@ from docx.shared import RGBColor
 from docx.shared import Pt
 from docx.enum.text import WD_ALIGN_PARAGRAPH
 
+__version__ = "1.0.0"
 
 class PrintPreview:
     '''本类负责生成完整的口算题文档使之适合打印机打印。可以生成多套题，生成数可以控。
diff --git a/Psmrcddup.py b/Psmrcddup.py
index 0dfc74b..231eef9 100644
--- a/Psmrcddup.py
+++ b/Psmrcddup.py
@@ -62,43 +62,47 @@ class Generator(object):
     signum = None
     step = None
     is_result = None
+    is_bracket =None
     number = None
     ########多步算式题选项设置######
     multistep = None
-
+    symbols = None
     data_list = None  # 生成的口算题
 
-    def __init__(self, addattrs, subattrs, multattrs, divattrs, signum, step, is_result,number, multistep):
+    def __init__(self, addattrs, subattrs, multattrs, divattrs, signum, step,number, is_result,is_bracket, multistep,symbols):
         '''
         :param addattrs: dict 加法设置属性，
-        包括 四项运算项及结果数值范围设置，进位随机选择项单选，随机1，进位2，不进位3
-        {"n1":[1,9],"n2":[1,9],"n3":[1,9],"n4":[1,9],"result":[10,20],"carry":1,}
+        包括 结果数值范围设置，进位随机选择项单选，随机1，进位2，不进位3
+        {"result":[10,20],"carry":1,}
 
         :param subattrs: dict 减法设置属性，
-        包括 四项运算项及结果数值范围设置，退位随机选择项单选，随机1，退位2，不退位3
-        {"n1":[1,9],"n2":[1,9],"n3":[1,9],"n4":[1,9],"result":[10,20],"abdication":1,}
+        包括 结果数值范围设置，退位随机选择项单选，随机1，退位2，不退位3
+        {"result":[10,20],"abdication":1,}
 
         :param:multattrs dict 乘法
-        包括 四项运算项及结果数值范围设置
-        {"n1":[1,9],"n2":[1,9],"n3":[1,9],"n4":[1,9],"result":[21,81],}
+        包括 及结果数值范围设置
+        {"result":[21,81],}
 
         :param:divattrs dict 除法
-        包括 四项运算项及结果数值范围设置
-        {"n1":[1,9],"n2":[1,9],"n3":[1,9],"n4":[1,9],"result":[1,9],}
+        包括 结果数值范围设置
+        {"result":[1,9],}
 
 
         :param signum: list 包含题型需要的 1+ 2- 3* 4/
         :param step: int 生成几步运算, 默认: 1 取值范围 1-3
         :param is_result :int 0求结果，1求运算项
+        is_bracket: int 是否需要括号 0不需要 1需要
         :param num: int 需要生成的题数
 
 
         :param multistep =None: dict 多步算式设置属性，
-        包括 四项运算项及结果数值范围设置，
-        is_bracket: int 是否需要括号 0不需要 1需要
+        包括 四个运算项及结果数值范围设置，
+        {"n1":[1,9],"n2":[1,9],"n3":[1,9],"n4":[1,9],"result":[10,20],"is_bracket":False,}
+
+        :param symbols list
         symbols: list 默认包括三组list,分别代表2或3步算式需要题型种类+-*/
         2+3-5  symbols = [[1,2],[1,]]  第一个运算符可以为+或-，第二个运算符只能为+
-        {"n1":[1,9],"n2":[1,9],"n3":[1,9],"n4":[1,9],"result":[10,20],"is_bracket":False,"symbols":[[1,2],[1,],[2,]],}
+
 
         '''
 
@@ -115,9 +119,11 @@ class Generator(object):
         self.signum = signum
         self.step = step
         self.is_result = is_result
+        self.is_bracket = is_bracket
         self.number = number
 
         self.multistep = multistep
+        self.symbols = symbols
 
         self.__data_list = []  # 生成的口算题
 
@@ -127,31 +133,31 @@ class Generator(object):
         if self.step == 1:
             if self.signum == 1:
                 formulas = getRandomNum(
-                    [self.addattrs["n1"], self.addattrs["n2"], self.addattrs["n3"], self.addattrs["n4"]], self.step)
+                    [self.multistep["n1"], self.multistep["n2"], ], self.step)
                 # 返回一步加法运算题
                 return getOneAdd(formulas, self.addattrs["result"], self.addattrs["carry"], self.is_result)
             if self.signum == 2:
                 formulas = getRandomNum(
-                    [self.subattrs["n1"], self.subattrs["n2"], self.subattrs["n3"], self.subattrs["n4"]],
+                    [self.multistep["n1"], self.multistep["n2"], ],
                     self.step)
                 # 返回一道减法运算
                 return getOneSub(formulas, self.subattrs["result"], self.subattrs["abdication"], self.is_result)
             if self.signum == 3:
                 formulas = getRandomNum(
-                    [self.multattrs["n1"], self.multattrs["n2"], self.multattrs["n3"], self.multattrs["n4"]],
+                    [self.multistep["n1"], self.multistep["n2"], ],
                     self.step)
                 return getOneMult(formulas, self.multattrs["result"], self.is_result)
             if self.signum == 4:
                 formulas = getRandomNum(
-                    [self.divattrs["n1"], self.divattrs["n2"], self.divattrs["n3"], self.divattrs["n4"]],
+                    [self.multistep["n1"], self.multistep["n2"], ],
                     self.step)
                 return getOneDiv(formulas, self.divattrs["result"], self.is_result)
         elif self.step == 2:  # 2步口算题
             formulas = getRandomNum(
                 [self.multistep["n1"], self.multistep["n2"], self.multistep["n3"], self.multistep["n4"]],
                 self.step)
-            return getTwoStep(formulas, self.multistep["result"], self.multistep['symbols'], self.addattrs["carry"], self.subattrs["abdication"],
-                              self.multistep["is_bracket"], self.is_result
+            return getTwoStep(formulas, self.multistep["result"], self.symbols, self.addattrs["carry"], self.subattrs["abdication"],
+                              self.is_bracket, self.is_result
                               )
 
     def generate_data(self):
@@ -195,21 +201,23 @@ class Generator(object):
 
 @get_time
 def main():
-    addlist = {"n1": [1, 9], "n2": [1, 9], "n3": [1, 9], "n4": [1, 9], "result": [0, 30], "carry": 1, }  # 加法设置
-    sublist = {"n1": [1, 20], "n2": [1, 20], "n3": [1, 20], "n4": [1, 20], "result": [1, 20], "abdication": 1, }  # 减法设置
-    multlist = {"n1": [1, 9], "n2": [1, 9], "n3": [1, 9], "n4": [1, 9], "result": [21, 81],}  # 乘法设置
-    divlist = {"n1": [1, 81], "n2": [1, 9], "n3": [1, 9], "n4": [1, 9], "result": [1, 9],}  # 除法设置
+    add = {"result": [0, 20], "carry": 1, }  # 加法设置
+    sub = {"result": [1, 19], "abdication": 1, }  # 减法设置
+    mult = {"result": [21, 81],}  # 乘法设置
+    div = {"result": [1, 9],}  # 除法设置
 
     signum = 1
-    step = 1
+    step = 2
     is_result = 0
     number = 20
+    is_bracket = 0
+
 
+    multistep = {"n1": [1, 9], "n2": [1, 9], "n3": [1, 9], "n4": [1, 9], "result": [0, 999],}
 
-    multistep = {"n1": [1, 9], "n2": [1, 9], "n3": [1, 9], "n4": [1, 9], "result": [0, 999],
-                 "symbols": [[1, 2], [1, 2], [2, ]], "is_bracket": 1, }
+    symbols= [[1, 2], [1, 2], [2, ]]
 
-    g = Generator(addlist, sublist, multlist, divlist, signum, step, is_result, number, multistep)
+    g = Generator(add, sub, mult, div, signum, step, number, is_result,is_bracket, multistep,symbols)
 
     datalist = g.generate_data()
     print(datalist)
-- 
GitLab