From 270b9e46561b7785bba7bc236eb84f4f6b315562 Mon Sep 17 00:00:00 2001 From: jens Date: Fri, 18 Dec 2020 11:51:52 +0100 Subject: [PATCH] please change method concentration to be saved --- JFSphoto.py | 54 +++++++++++++++++++++++++++++++---------------------- config.ini | 2 +- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/JFSphoto.py b/JFSphoto.py index bd830dd..9d91636 100644 --- a/JFSphoto.py +++ b/JFSphoto.py @@ -54,6 +54,11 @@ class Methods(object) : def __str__(self): return self.name + def save(self): + s = self.id+','+self.nm+','+self.units+','+self.absorbanz+','+self.step+','+self.final + for p in self.messures: + s = s+'|'+str(p.conc)+','+str(p.absorbanz) + return s def update(self,data): self.messures.clear() @@ -350,6 +355,10 @@ class Jfsphoto (object): config.set('main','nm_left',str(self.nm_left)) config.set('main','nm_right',str(self.nm_right)) config.set('main','nm_step',str(self.nm_step)) + if ('methods') not in lis: + config.add_section('methods') + for p in self.methods: + config.set('methods',p.get_name(),p.save()) with open('config.ini','w') as f: config.write(f) @@ -589,36 +598,35 @@ class Jfsphoto (object): tree.insert(a.name,'end',b.name,text=b.name,values=('','',b.conc,b.absorbanz)) def save_tree(): - name = e1.get() - data = str(e2.get())+','+str(e3.get())+','+e4.get()+','+str(e5.get())+','+str(e6.get()) - old = [p.get_name() for p in self.methods] - print(old) for child in tree.get_children(): name = child s= ",".join(str(x) for x in tree.item(child)["values"]) - #print(s) for items in tree.get_children(child): ss = ",".join(str(x) for x in tree.item(items)["values"] if len(str(x))>0) s = s +'|'+ss - for p in self.methods: - if p.get_name() == name: + if p.get_name()== name: p.update(s) - print('update') - break - else: - self.methods.append(Methods(name,s)) - print('append') - break - + print(f'{name} >> {s}') + 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())) - stp = e6.get()/e5.get() - for i in range(1,e5.get()+1): - na = e1.get()+' '+str(i) - tree.insert(e1.get(),'end',na,text= na ,values=(i,'',stp * (i))) - + tree.insert("",'end',e1.get(),text=e1.get(),values=(e2.get(),e3.get(),e4.get(),e7.get(),e5.get(),e6.get())) + stp = e6.get()/e5.get() + for i in range(1,e5.get()+1): + na = e1.get()+' '+str(i) + tree.insert(e1.get(),'end',na,text= na ,values=(i,'',stp * (i))) + s= ",".join(str(x) for x in tree.item(e1.get())["values"]) + for items in tree.get_children(e1.get()): + ss = ",".join(str(x) for x in tree.item(items)["values"] if len(str(x))>0) + s = s +'|'+ss + self.methods.append(Methods(e1.get(),s)) + + def del_method(): + curItem = tree.focus() + name =tree.item(curItem,"text") + if tk.messagebox.askyesno(title='Delete', message='You you really want to delete '+name ): + tree.delete(curItem) lf1 = tk.LabelFrame(win,text='Edit the method') @@ -649,8 +657,10 @@ class Jfsphoto (object): le6.grid(column=1,row=5,sticky='w') lb1 = tk.Button(lf1,text='Add Method',command=add_method) lb1.grid(column=0,row=6,sticky='w') - lb1 = tk.Button(lf1,text='Save Methods',command=save_tree) - lb1.grid(column=1,row=6,sticky='w') + lb2 = tk.Button(lf1,text='Delete Method',command=del_method) + 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') load_tree() # def cb(event): diff --git a/config.ini b/config.ini index 96f12b8..b8b5c3d 100644 --- a/config.ini +++ b/config.ini @@ -4,5 +4,5 @@ nm_right = 811.0 nm_step = 0.13279 [methods] -crystal = 1,530,mymol,0,5,20|1,1.23|2,2.4|3,3.65|4,4.8|5,6.05 +crystal = 1,530,mymol,0,5,20|16.0,1.23|32.0,2.4|48.0,3.65|64.0,4.8|80.0,6.05