From ba2888dfd71f85cfcf98a296735f3b21fe4796a1 Mon Sep 17 00:00:00 2001 From: jfsScience Date: Wed, 2 Dec 2020 11:42:01 +0100 Subject: [PATCH] Kinetik angefangen noch keine Funktion --- CCDpanelsetup.py | 42 +++++++++++++++++++++++++++++------------- JFSphoto.py | 5 ++--- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/CCDpanelsetup.py b/CCDpanelsetup.py index 1d5086a..2429db1 100644 --- a/CCDpanelsetup.py +++ b/CCDpanelsetup.py @@ -47,9 +47,9 @@ class buildpanel(tk.Frame): continuous_row = 30 avg_row = 40 collect_row = 50 - plotmode_row = 60 - save_row = 70 - update_row = 80 + plotmode_row = 60 #60 + save_row = 70 #70 + update_row = 80 #80 progress_var = tk.IntVar() @@ -62,14 +62,14 @@ class buildpanel(tk.Frame): self.grid_rowconfigure(device_row+3, minsize=20) #30 self.CCDparamfields(shicg_row) #insert vertical space - self.grid_rowconfigure(shicg_row+4, minsize=30) + self.grid_rowconfigure(shicg_row+4, minsize=20) #30 self.collectmodefields(continuous_row) self.avgfields(avg_row) #insert vertical space - self.grid_rowconfigure(avg_row+2, minsize=30) + self.grid_rowconfigure(avg_row+2, minsize=10) #30 self.collectfields(collect_row, SerQueue, progress_var) #vertical space - self.grid_rowconfigure(collect_row+2, minsize=30) + self.grid_rowconfigure(collect_row+2, minsize=10) #30 self.plotmodefields(plotmode_row, CCDplot) self.saveopenfields(save_row, CCDplot) self.updateplotfields(update_row, CCDplot) @@ -261,25 +261,41 @@ class buildpanel(tk.Frame): #self.jfstitel.config(font=("Courier",0)) self.jfstitel.grid(row=device_row,column=4,columnspan=2,sticky='w') self.jfs4cal = tk.Button(self,text='Calibration',fg="blue", command=self.jf.do_calibrate) - self.jfs4cal.grid(row=device_row+1,column=4,sticky='w') + self.jfs4cal.grid(row=device_row+1,column=4,sticky='e') self.jfs4nm_check = tk.Checkbutton(self,text="[nm] scale on/off",variable=self.jf.nm_checked,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot)) self.jfs4nm_check.grid(row=shicg_row-1,column=4,sticky='w') self.jfsdark = tk.Button(self,text='save Darkline',fg="blue", command= darkline) - self.jfsdark.grid(row=shicg_row,column=4,sticky='w') + self.jfsdark.grid(row=shicg_row,column=4,sticky='e') self.jfsdark_check = tk.Checkbutton(self,text="Darkline on/off",variable=self.jf.darkline_checked,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot)) self.jfsdark_check.grid(row=shicg_row+1,column=4,sticky='w') self.jfsbase = tk.Button(self,text='save Baseline',fg="blue", command= baseline) - self.jfsbase.grid(row=shicg_row+2,column=4,sticky='w') + self.jfsbase.grid(row=shicg_row+2,column=4,sticky='e') self.jfsbase_check = tk.Checkbutton(self,text="Baseline on/off",variable=self.jf.baseline_checked,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot)) self.jfsbase_check.grid(row=shicg_row+3,column=4,sticky='w') self.jfsbase_absorption = tk.Radiobutton(self,text="Absorption",variable=self.jf.abs_trans,value=0,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot)) - self.jfsbase_absorption.grid(row=con_row,column=4,sticky='wS') + self.jfsbase_absorption.grid(row=con_row,column=4,sticky='es') self.jfsbase_transmission = tk.Radiobutton(self,text="Transmision",variable=self.jf.abs_trans,value=1,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot)) - self.jfsbase_transmission.grid(row=avg_row,column=4,sticky='w') + self.jfsbase_transmission.grid(row=avg_row,column=4,sticky='e') self.jfspdsave = tk.Button(self,text='save Data',fg="blue", command=self.jf.save_pandas) - self.jfspdsave.grid(row=col_row,column=4,sticky='w') + self.jfspdsave.grid(row=col_row,column=4,sticky='e') self.jfspdload = tk.Button(self,text='load Data',fg="blue", command=loaddata) - self.jfspdload.grid(row=col_row+1,column=4,sticky='w') + self.jfspdload.grid(row=col_row+1,column=4,sticky='e') + #### LabelFrame + self.jfslf1 = tk.LabelFrame(self,text= 'kinetic') + self.jfslf1.grid(row=plt_row,column=4,sticky='e') + self.jfskinb = tk.Button(self.jfslf1,text='start Kinetic',fg="blue", command=loaddata) + self.jfskinb.grid(row=2,column=1,sticky='e') + self.jfskinl1 = tk.Label(self.jfslf1,text='Interval [s]',fg="blue") + self.jfskinl1.grid(row=0,column=0,sticky='w') + self.jfskine1 = tk.Entry(self.jfslf1,width=4) + self.jfskine1.grid(row=0,column=1,sticky='e') + self.jfskinl2 = tk.Label(self.jfslf1,text='Repetitions',fg="blue") + self.jfskinl2.grid(row=1,column=0,sticky='w') + self.jfspkine2 = tk.Entry(self.jfslf1,width=4) + self.jfspkine2.grid(row=1,column=1,sticky='e') + + self.jfspdmath = tk.Button(self,text='Math..',fg="blue", command=loaddata) + self.jfspdmath.grid(row=save_row,column=4,sticky='e') ### Callbacks for traces, buttons, etc ### def callback(self): diff --git a/JFSphoto.py b/JFSphoto.py index 67869fd..5fea863 100644 --- a/JFSphoto.py +++ b/JFSphoto.py @@ -133,10 +133,11 @@ class Jfsphoto (object): doIt = False self.baseData16[i] = 0 else: + ## 300 should be in the ini file job! if (base[i] > 300): left = False self.baseData16[i] = base[i]*1.0 - print(self.baseline_start," ",self.baseline_end) + #print(self.baseline_start," ",self.baseline_end) return 1 def get_baseline_checked(self): @@ -229,8 +230,6 @@ class Jfsphoto (object): self.nm2i = np.argmin(rxData16) self.tnm2i.set(str(self.nm2i)) self.checkit() - ## for testing - self.add_pandas(rxData16) except IOError: messagebox.showerror("By the great otter!","There's a problem opening the file.")