diff --git a/JFSphoto.py b/JFSphoto.py index b7dcad3..fc54a8a 100644 --- a/JFSphoto.py +++ b/JFSphoto.py @@ -603,6 +603,7 @@ class Jfsphoto (object): s = 'Is a Cuvet for '+x[0]+' in concentration\n of '+s1+' in the photometer ? ' if tk.messagebox.askokcancel(title='Messurement', message=s): panel.bcollect.invoke() + ## 3000 shoud be calculated panel.after(3000,waitfor) self.df['m1'] = config.rxData16 d = self.df.iloc[p]['darkline'] @@ -611,14 +612,24 @@ class Jfsphoto (object): #print(d,b,w,d-w, np.log10(b/(d-w))) val[3]= np.log10(b/(d-w)) tree.item(x, text=name,values=val) + + + def cb2(event): + y = [] + x = [] + name = tree.selection() + for child in tree.get_children(name): + x.append(tree.item(child)["values"][2]) + y.append(tree.item(child)["values"][3]) + print(x,y) - win = tk.Toplevel() tree = ttk.Treeview(win) tree.tag_bind('cb','<>',cb) + tree.tag_bind('cb2','<>',cb2) tree.grid(column=0,row=0) tree["columns"]=('id','nm','konz','absorbanz','interval','last') tree.column("#0",width=100,minwidth=100,stretch=tk.NO) @@ -653,7 +664,7 @@ class Jfsphoto (object): def load_tree(): for a in self.methods: - tree.insert("",'end',a.name,text=a.name,values=(a.id,a.nm,a.units,a.absorbanz,a.step,a.final)) + tree.insert("",'end',a.name,text=a.name,values=(a.id,a.nm,a.units,a.absorbanz,a.step,a.final),tags=('cb2')) for b in a.messures: tree.insert(a.name,'end',b.name,text=b.name,values=(b.id,'',b.conc,b.absorbanz),tags=('cb')) @@ -670,7 +681,7 @@ class Jfsphoto (object): self.conf_write() def add_method(): - tree.insert("",'end',e1.get(),text=e1.get(),values=(e2.get(),e3.get(),e4.get(),e7.get(),e5.get(),e6.get())) + tree.insert("",'end',e1.get(),text=e1.get(),values=(e2.get(),e3.get(),e4.get(),e7.get(),e5.get(),e6.get()),tags=('cb2')) stp = e6.get()/e5.get() for i in range(1,e5.get()+1): na = e1.get()+' '+str(i) @@ -691,7 +702,7 @@ class Jfsphoto (object): self.methods.remove(p) - + #### Tree lf1 = tk.LabelFrame(win,text='Edit the method') lf1.grid(column=0,row=1,sticky='w') l1 = tk.Label(lf1,text='Name of the Method') @@ -724,6 +735,18 @@ class Jfsphoto (object): lb2.grid(column=1,row=6,sticky='w') lb3 = tk.Button(lf1,text='Save Methods',command=save_tree) lb3.grid(column=0,row=7,sticky='w') + #### canvas + lf2 = tk.LabelFrame(win,text='Canvas') + lf2.grid(column=1,row=0,sticky='w') + fig = plt.Figure(figsize=(3,2),dpi=120) + plt.rc('legend',fontsize=8) + ax1 = fig.add_subplot(111) + canvas = FigureCanvasTkAgg(fig, master = lf2) + t = arange(0.0, 3.0, 0.01) + s = sin(2*pi*t) + ax1.plot(t, s, linewidth=0.6) + canvas.draw() + load_tree()