From c78c7ed4d847c7cb50b152956fe1b9854158ca22 Mon Sep 17 00:00:00 2001
From: jfsScience <science@jefro.de>
Date: Wed, 23 Dec 2020 14:56:05 +0100
Subject: [PATCH] methods prepared for lst tests

---
 CCDpanelsetup.py |  8 ++++----
 JFSphoto.py      | 45 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/CCDpanelsetup.py b/CCDpanelsetup.py
index 875cd15..ee214f3 100644
--- a/CCDpanelsetup.py
+++ b/CCDpanelsetup.py
@@ -331,10 +331,10 @@ class buildpanel(tk.Frame):
         self.jfskinl2.grid(row=1,column=0,sticky='w')
         self.jfspkine2 = tk.Entry(self.jfslf1,textvariable=kin_repeats,width=4)
         self.jfspkine2.grid(row=1,column=1,sticky='e')
-
-        #self.jfspdmath = tk.Button(self,text='Math..',fg="blue", command=lambda JFSphoto=Jfsphoto: self.jf.do_math(self))
-        self.jfspdmath = tk.Button(self,text='Math..',fg="blue", command=lambda JFSphoto=Jfsphoto: self.jf.do_methods(self))
-        self.jfspdmath.grid(row=save_row,column=4,sticky='e',padx=4)
+        self.jfspdmath = tk.Button(self.jfslf1,text='Math',fg="blue", command=lambda JFSphoto=Jfsphoto: self.jf.do_math(self))
+        self.jfspdmath.grid(row=2,column=0,sticky='w')
+        self.jfspdmeth = tk.Button(self,text='Methods',fg="blue", command=lambda JFSphoto=Jfsphoto: self.jf.do_methods(self))
+        self.jfspdmeth.grid(row=save_row,column=4,sticky='e',padx=4)
 
   ### Reset changes from loading phometerfile
   def reset_settings(self):
diff --git a/JFSphoto.py b/JFSphoto.py
index 99ba764..337a829 100644
--- a/JFSphoto.py
+++ b/JFSphoto.py
@@ -742,16 +742,35 @@ class Jfsphoto (object):
                         self.methods.remove(p)
 
         def do_zero_messurement():
-            for child in tree.get_children(l6['text']):
-                sh =int(tree.item(child)["values"][4])
-                icg =int(tree.item(child)["values"][5])
-                break
-            print(sh,icg)
-            panel.SHvalue.set(sh)
-            panel.ICGvalue.set(icg)
-            #print(panel.SHvalue.get(), panel.ICGvalue.get())
-            #print(int(tree.item(l6['text'])["values"][3]))
             print(l6['text'])
+            if l6['text'].find('Select')  >= 0:
+                tk.messagebox.showerror(title='Sorry',message='Select Method first')
+            else:
+                for child in tree.get_children(l6['text']):
+                    sh =int(tree.item(child)["values"][4])
+                    icg =int(tree.item(child)["values"][5])
+                    break
+                panel.SHvalue.set(sh)
+                panel.ICGvalue.set(icg)
+                if  tk.messagebox.askokcancel(title='Darkline', message='Insert the empty Cuvet\nturn lightsource [off]'):
+                    pass
+                    ## messure Darkline
+                    if  tk.messagebox.askokcancel(title='Baseline', message= 'Leave the empty Cuvet\nturn lightsource [on]'):
+                        pass
+                    ## messure Baseline
+
+        def do_messurement():
+            if  tk.messagebox.askokcancel(title='Messurements', message= 'Sample Cuvet inside \n lightsource [on]'):
+                x=[]
+                y=[]
+                for child in tree.get_children(l6['text']):
+                    x.append(float(tree.item(child)["values"][2]))
+                    y.append(float(tree.item(child)["values"][3]))
+                model = np.polyfit(x,y,1)
+                a = 0.5
+                #a = model[0]* c +model[1]
+                c = (a - model[1])/model[0]               
+                l8.config(text=str(round(c,3))+' '+tree.item(l6['text'])['values'][2])
 
         #### Tree 
         lf1 = tk.LabelFrame(win,text='Edit the method')
@@ -801,8 +820,14 @@ class Jfsphoto (object):
         lf3.grid(column=1,row=1,sticky='nw')
         l6 = tk.Label(lf3,text='Select Messurement')
         l6.grid(column=0,row=0,sticky='w')
-        lmb1=tk.Button(lf3,text=' Zero Messurements',command=do_zero_messurement)
+        lmb1=tk.Button(lf3,text='Zero Messurements',command=do_zero_messurement)
         lmb1.grid(column=0,row=1,sticky='w')
+        lmb2=tk.Button(lf3,text='Messurement',command=do_messurement)
+        lmb2.grid(column=0,row=2,sticky='w')
+        l7 = tk.Label(lf3,text='Result :',width=12)
+        l7.grid(column=1,row=1,sticky='e')
+        l8 = tk.Label(lf3,text='empty',width=12)
+        l8.grid(column=1,row=2,sticky='e')
         #### go on
         load_tree()