Melhorias no codigo e estrutura

Ewindow.py

@@ -52,7 +52,7 @@ def elem_select(i, button):
 
 ##############################################################################
 # Init
-def ewin_build(window, OFlabentries, mainwindow, calcbutton, distvar):
+def ewin_build(window, OFlabentries, mainwindow, calcbutton, distvar, modevar, Labelframe):
 
 ##############################################################################
 # Element addition
@@ -266,6 +266,15 @@ def ewin_build(window, OFlabentries, mainwindow, calcbutton, distvar):
             RL['state']='disabled'
             OFlabentries[9]['state']='disabled'
             OFlabentries[10]['state']='disabled'
+            for i in arange(6, 12):
+                Labentrys[i]['state']='disabled'
+            but['state']='disabled'
+            butrmv['state']='disabled'
+            butPTE['state']='disabled'
+            BUpdate['state']='disabled'
+            for n in arange(0, len(Ebuttons)):
+                Ebuttons[n]['state'] = 'disabled'
+
         elif str(distvar.get()) == 'drawing':
             BLayer['state']='disabled'
             BUpdateD['state']='normal'
@@ -273,6 +282,14 @@ def ewin_build(window, OFlabentries, mainwindow, calcbutton, distvar):
             RL['state']='normal'
             OFlabentries[9]['state']='normal'
             OFlabentries[10]['state']='normal'
+            for i in arange(6, 12):
+                Labentrys[i]['state']='normal'
+            but['state']='normal'
+            butrmv['state']='normal'
+            butPTE['state']='normal'
+            BUpdate['state']='normal'
+            for n in arange(0, len(Ebuttons)):
+                Ebuttons[n]['state'] = 'normal'
 
     def call_layers():
         layers()
@@ -294,6 +311,33 @@ def ewin_build(window, OFlabentries, mainwindow, calcbutton, distvar):
     RDra = tk.Radiobutton(Frames[7], text="Drawing", command=lambda i=int(Econtrol) :changestate(), variable=distvar, value='drawing')
     RDra.pack(side='right')
 
+##############################################################################
+# Experiment variations
+
+    def changemode():
+        if str(modevar.get()) == 'IONS':
+            for n in range(len(Ebuttons)):
+                Ebuttons[n]['state']='normal'
+            but['state'] = 'normal'
+            butrmv['state'] = 'normal'
+            butPTE['state'] = 'normal'
+            RLay['state'] = 'normal'
+
+        elif str(modevar.get()) == 'RRNA':
+            RDra.invoke()
+            elem_select(0,Ebuttons)
+            but['state'] = 'disabled'
+            butrmv['state'] = 'disabled'
+            RLay['state'] = 'disabled'
+            for n in arange(1, len(Ebuttons)):
+                Ebuttons[n]['state'] = 'disabled'
+
+    Rions = tk.Radiobutton(Labelframe, text="Ion Scattering", command=lambda i=i :changemode(), variable=modevar, value='IONS', width=18)
+    Rions.pack()
+    Rrrna = tk.Radiobutton(Labelframe, text="Resonant RNA", command=lambda i=i :changemode(), variable=modevar, value='RRNA', width=18)
+    Rrrna.pack()
+    Rions.select()
+
 ##############################################################################
 # Init
 

Hf.dat

 0 0
 1.22580645161 0.308673469388
 1.38461538462 0.188775510204
-2.03970223325 0.234693877551
-2.55583126551 0.135204081633
-4.20347394541 0.614540816327
-6.04962779156 0.454081632653
-8.23325062035 0.262755102041
-9.20595533499 0.108214285714
-9.841191067 0.0463775510204
 10.0 0

OpenFlatus.py

@@ -25,21 +25,24 @@ def init_calc():
     ionb['mass'] = float(OFlabentries[22].get())
     ionb['Z'] = float(OFlabentries[23].get())      
 
+    if str(modevar.get()) == 'IONS':
+        if str(distvar.get()) == 'drawing':
             for i in range(len(Edict)):
                 Edict[i]['dist'] = np.loadtxt(Edict[i]['symbol']+".prof")
-
-    if str(distvar.get()) == 'drawing':
             spectro(param, str(modelvar.get()), ionb, OFlabentries, int(LSvar.get()), int(CGvar.get()))
         elif str(distvar.get()) == 'layer':
             spectrolayer(param, str(modelvar.get()), ionb, OFlabentries, int(LSvar.get()), int(CGvar.get()))
 
+    elif str(modevar.get()) == 'RRNA':
+       return 0
+
 ##############################################################################
 # Main window
 
 root = tk.Tk()
-root.minsize(670,470)
+root.minsize(670,550)
 root.title('Open Flatus')
-root.geometry('670x470+200+400')
+root.geometry('670x500+200+400')
 
 ##############################################################################
 # Frames
@@ -48,6 +51,8 @@ MasterFrame1.pack(side='left')
 MasterFrame2 = tk.Frame(root)
 MasterFrame2.pack(side='top')
 
+Label0 = tk.LabelFrame(MasterFrame1, text = 'Experiment', relief='raised', bd=2)
+Label0.pack(side='top')
 Label2 = tk.LabelFrame(MasterFrame1, text = 'Parameters', relief='raised', bd=2)
 Label2.pack(side='top')
 Label3 = tk.LabelFrame(MasterFrame1, text = 'Ion parameters', relief='raised', bd=2)
@@ -133,6 +138,8 @@ OFlabentries[23].insert(0, ionb['Z'])
 ##############################################################################
 # Energy loss models
 
+modevar = tk.StringVar()
+modevar.set('IONS')
 modelvar = tk.StringVar()
 R1 = tk.Radiobutton(Label4, text="Gaussian", variable=modelvar, value='gaussiana')
 R1.pack()
@@ -163,7 +170,7 @@ CalcButton.pack()
 
 distvar = tk.StringVar()
 distvar.set('drawing')
-ewin_build(Label1, OFlabentries, root, CalcButton, distvar)
+ewin_build(Label1, OFlabentries, root, CalcButton, distvar, modevar, Label0)
 
 ##############################################################################
 

PTE.py

@@ -39,484 +39,362 @@ def PTable(Elem , Elembut, Labentrys):
     
     q1 = lambda: atomdef(H, Elem, Elembut)
     b1 = tk.Button(master, text="H", command=q1, width=1, height=1, bg='white')
-    b1.pack()
     
     q2 = lambda: atomdef(He, Elem, Elembut)
     b2 = tk.Button(master, text="He", command=q2, width=1, height=1, bg='pink')
-    b2.pack()
     
     q3 = lambda: atomdef(Li, Elem, Elembut)
     b3 = tk.Button(master, text="Li", command=q3, width=1, height=1, bg='yellow')
-    b3.pack()
     
     q4 = lambda: atomdef(Be, Elem, Elembut)
     b4 = tk.Button(master, text="Be", command=q4, width=1, height=1, bg='brown')
-    b4.pack()
     
     q5 = lambda: atomdef(B, Elem, Elembut)
     b5 = tk.Button(master, text="B", command=q5, width=1, height=1, bg='blue')
-    b5.pack()
     
     q6 = lambda: atomdef(C, Elem, Elembut)
     b6 = tk.Button(master, text="C", command=q6, width=1, height=1, bg='green')
-    b6.pack()
     
     q7 = lambda: atomdef(N, Elem, Elembut)
     b7 = tk.Button(master, text="N", command=q7, width=1, height=1, bg='green')
-    b7.pack()
     
     q8 = lambda: atomdef(O, Elem, Elembut)
     b8 = tk.Button(master, text="O", command=q8, width=1, height=1, bg='green')
-    b8.pack()
     
     q9 = lambda: atomdef(F, Elem, Elembut)  
     b9 = tk.Button(master, text="F", command=q9, width=1, height=1, bg='red')
-    b9.pack()
     
     q10 = lambda: atomdef(Ne, Elem, Elembut)
     b10 = tk.Button(master, text="Ne", command=q10, width=1, height=1, bg='pink')
-    b10.pack()
 
     q11 = lambda: atomdef(Na, Elem, Elembut)
     b11 = tk.Button(master, text="Na", command=q11, width=1, height=1, bg='yellow')
-    b11.pack()
 
     q12 = lambda: atomdef(Mg, Elem, Elembut)
     b12 = tk.Button(master, text="Mg", command=q12, width=1, height=1, bg='brown')
-    b12.pack()
  
     q13 = lambda: atomdef(Al, Elem, Elembut)
     b13 = tk.Button(master, text="Al", command=q13, width=1, height=1, bg='purple')
-    b13.pack()
 
     q14 = lambda: atomdef(Si, Elem, Elembut)
     b14 = tk.Button(master, text="Si", command=q14, width=1, height=1, bg='blue')
-    b14.pack()
 
     q15 = lambda: atomdef(P, Elem, Elembut)
     b15 = tk.Button(master, text="P", command=q15, width=1, height=1, bg='green')
-    b15.pack()
 
     q16 = lambda: atomdef(S, Elem, Elembut)
     b16 = tk.Button(master, text="S", command=q16, width=1, height=1, bg='green')
-    b16.pack()
 
     q17 = lambda: atomdef(Cl, Elem, Elembut)
     b17 = tk.Button(master, text="Cl", command=q17, width=1, height=1, bg='red')
-    b17.pack()
 
     q18 = lambda: atomdef(Ar, Elem, Elembut)
     b18 = tk.Button(master, text="Ar", command=q18, width=1, height=1, bg='pink')
-    b18.pack()    
 
     q19 = lambda: atomdef(K, Elem, Elembut)
     b19 = tk.Button(master, text="K", command=q19, width=1, height=1, bg='yellow')
-    b19.pack()
 
     q20 = lambda: atomdef(Ca, Elem, Elembut)
     b20 = tk.Button(master, text="Ca", command=q20, width=1, height=1, bg='brown')
-    b20.pack()
 
     q21 = lambda: atomdef(Sc, Elem, Elembut)
     b21 = tk.Button(master, text="Sc", command=q21, width=1, height=1)
-    b21.pack()
 
     q22 = lambda: atomdef(Ti, Elem, Elembut)
     b22 = tk.Button(master, text="Ti", command=q22, width=1, height=1)
-    b22.pack()
 
     q23 = lambda: atomdef(V, Elem, Elembut)
     b23 = tk.Button(master, text="V", command=q23, width=1, height=1)
-    b23.pack()
 
     q24 = lambda: atomdef(Cr, Elem, Elembut)
     b24 = tk.Button(master, text="Cr", command=q24, width=1, height=1)
-    b24.pack()
 
     q25 = lambda: atomdef(Mn, Elem, Elembut)
     b25 = tk.Button(master, text="Mn", command=q25, width=1, height=1)
-    b25.pack()
  
     q26 = lambda: atomdef(Fe, Elem, Elembut)
     b26 = tk.Button(master, text="Fe", command=q26, width=1, height=1)
-    b26.pack()
 
     q27 = lambda: atomdef(Co, Elem, Elembut)
     b27 = tk.Button(master, text="Co", command=q27, width=1, height=1)
-    b27.pack()
 
     q28 = lambda: atomdef(Ni, Elem, Elembut)
     b28 = tk.Button(master, text="Ni", command=q28, width=1, height=1)
-    b28.pack()
 
     q29 = lambda: atomdef(Cu, Elem, Elembut)
     b29 = tk.Button(master, text="Cu", command=q29, width=1, height=1)
-    b29.pack()
 
     q30 = lambda: atomdef(Zn, Elem, Elembut)
     b30 = tk.Button(master, text="Zn", command=q30, width=1, height=1)
-    b30.pack()
 
     q31 = lambda: atomdef(Ga, Elem, Elembut)
     b31 = tk.Button(master, text="Ga", command=q31, width=1, height=1, bg='purple')
-    b31.pack()
 
     q32 = lambda: atomdef(Ge, Elem, Elembut)
     b32 = tk.Button(master, text="Ge", command=q32, width=1, height=1, bg='blue')
-    b32.pack()
 
     q33 = lambda: atomdef(As, Elem, Elembut)
     b33 = tk.Button(master, text="As", command=q33, width=1, height=1, bg='blue')
-    b33.pack()
 
     q34 = lambda: atomdef(Se, Elem, Elembut)
     b34 = tk.Button(master, text="Se", command=q34, width=1, height=1, bg='green')
-    b34.pack()
 
     q35 = lambda: atomdef(Br, Elem, Elembut)
     b35 = tk.Button(master, text="Br", command=q35, width=1, height=1, bg='red')
-    b35.pack()
 
     q36 = lambda: atomdef(Kr, Elem, Elembut)
     b36 = tk.Button(master, text="Kr", command=q36, width=1, height=1, bg='pink')
-    b36.pack()
 
     q37 = lambda: atomdef(Rb, Elem, Elembut)
     b37 = tk.Button(master, text="Rb", command=q37, width=1, height=1, bg='yellow')
-    b37.pack()
 
     q38 = lambda: atomdef(Sr, Elem, Elembut)
     b38 = tk.Button(master, text="Sr", command=q38, width=1, height=1, bg='brown')
-    b38.pack()
  
     q39 = lambda: atomdef(Y, Elem, Elembut)
     b39 = tk.Button(master, text="Y", command=q39, width=1, height=1)
-    b39.pack()
 
     q40 = lambda: atomdef(Zr, Elem, Elembut)
     b40 = tk.Button(master, text="Zr", command=q40, width=1, height=1)
-    b40.pack()
 
     q41 = lambda: atomdef(Nb, Elem, Elembut)
     b41 = tk.Button(master, text="Nb", command=q41, width=1, height=1)
-    b41.pack()
 
     q42 = lambda: atomdef(Mo, Elem, Elembut)
     b42 = tk.Button(master, text="Mo", command=q42, width=1, height=1)
-    b42.pack()
 
     q43 = lambda: atomdef(Tc, Elem, Elembut)
     b43 = tk.Button(master, text="Tc", command=q43, width=1, height=1)
-    b43.pack()
 
     q44 = lambda: atomdef(Ru, Elem, Elembut)
     b44 = tk.Button(master, text="Ru", command=q44, width=1, height=1)
-    b44.pack()
 
     q45 = lambda: atomdef(Rh, Elem, Elembut)
     b45 = tk.Button(master, text="Rh", command=q45, width=1, height=1)
-    b45.pack()
 
     q46 = lambda: atomdef(Pd, Elem, Elembut)
     b46 = tk.Button(master, text="Pd", command=q46, width=1, height=1)
-    b46.pack()
 
     q47 = lambda: atomdef(Ag, Elem, Elembut)
     b47 = tk.Button(master, text="Ag", command=q47, width=1, height=1)
-    b47.pack()
 
     q48 = lambda: atomdef(Cd, Elem, Elembut)
     b48 = tk.Button(master, text="Cd", command=q48, width=1, height=1)
-    b48.pack()
  
     q49 = lambda: atomdef(In, Elem, Elembut)
     b49 = tk.Button(master, text="In", command=q49, width=1, height=1, bg='purple')
-    b49.pack()
 
     q50 = lambda: atomdef(Sn, Elem, Elembut)
     b50 = tk.Button(master, text="Sn", command=q50, width=1, height=1, bg='purple')    
-    b50.pack()    
     
     q51 = lambda: atomdef(Sb, Elem, Elembut)
     b51 = tk.Button(master, text="Sb", command=q51, width=1, height=1, bg='blue')
-    b51.pack()
 
     q52 = lambda: atomdef(Te, Elem, Elembut)
     b52 = tk.Button(master, text="Te", command=q52, width=1, height=1, bg='blue')
-    b52.pack()
 
     q53 = lambda: atomdef(I, Elem, Elembut)
     b53 = tk.Button(master, text="I", command=q53, width=1, height=1, bg='red')
-    b53.pack()
 
     q54 = lambda: atomdef(Xe, Elem, Elembut)
     b54 = tk.Button(master, text="Xe", command=q54, width=1, height=1, bg='pink')
-    b54.pack()
 
     q55 = lambda: atomdef(Cs, Elem, Elembut)
     b55 = tk.Button(master, text="Cs", command=q55, width=1, height=1, bg='yellow')
-    b55.pack()
 
     q56 = lambda: atomdef(Ba, Elem, Elembut)
     b56 = tk.Button(master, text="Ba", command=q56, width=1, height=1, bg='brown')
-    b56.pack()
     
     q57 = lambda: atomdef(La, Elem, Elembut)
     b57 = tk.Button(master, text="La", command=q57, width=1, height=1, bg='grey')
-    b57.pack()
     
     q58 = lambda: atomdef(Ce, Elem, Elembut)
     b58 = tk.Button(master, text="Ce", command=q58, width=1, height=1, bg='grey')
-    b58.pack()
     
     q59 = lambda: atomdef(Pr, Elem, Elembut)
     b59 = tk.Button(master, text="Pr", command=q59, width=1, height=1, bg='grey')
-    b59.pack()
     
     q60 = lambda: atomdef(Nd, Elem, Elembut)
     b60 = tk.Button(master, text="Nd", command=q60, width=1, height=1, bg='grey')