diff --git a/CCDpanelsetup.py b/CCDpanelsetup.py index fcef7f2..4c62b7e 100644 --- a/CCDpanelsetup.py +++ b/CCDpanelsetup.py @@ -245,6 +245,9 @@ class buildpanel(tk.Frame): kin_delta.set(2) kin_repeats = tk.IntVar() kin_repeats.set(10) + kin_time = tk.IntVar() + kin_time.set(0) + def darkline(): if (self.jf.do_save_darkline(config.rxData16)==1): @@ -266,15 +269,18 @@ class buildpanel(tk.Frame): self.jfsbase_absorption.config(state=tk.NORMAL) def messure(): + kin_time.set(kin_time.get()+1) self.bcollect.invoke() - print('now add to df ') + self.jf.add_kinetic(str(kin_delta.get()*kin_time.get())) kinetics() def kinetics(): if kin_repeats.get() > 0 : - kin_repeats.set(kin_repeats.get()-1) - self.after(kin_delta.get()*1000,messure) + kin_repeats.set(kin_repeats.get()-1) + self.after(kin_delta.get()*1000,messure) + else: + kin_time.set(0) diff --git a/JFSphoto.py b/JFSphoto.py index 59f169a..01f64c7 100644 --- a/JFSphoto.py +++ b/JFSphoto.py @@ -192,6 +192,8 @@ class Jfsphoto (object): self.set_nm_scale() return self.nmData16 + def add_kinetic(self,name): + print(name) def save_pandas(self): filename = filedialog.asksaveasfilename(defaultextension=".csv", title="Save file as")