jens/otterpy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

metods works

Browse Source
This commit is contained in:
jens 2020-12-21 17:09:54 +01:00
parent 7eaf5c1a3f
commit 269724431d
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
JFSphoto.py
View File

@ -185,6 +185,7 @@ class Jfsphoto (object):
return 0
else :
self.darkData16 = dark*1.0
self.df['darkline']=self.darkData16
return 1
def get_darkline_checked(self):
@ -216,6 +217,7 @@ class Jfsphoto (object):
left = False
self.baseData16[i] = base[i]*1.0
#print(self.baseline_start," ",self.baseline_end)
self.df['baseline']=self.baseData16
return 1
def get_baseline_checked(self):
@ -255,7 +257,7 @@ class Jfsphoto (object):
def set_nm_scale(self):
if (self.nm_scale_ok):
self.nmData16 = np.linspace(self.nm_left,self.nm_right,3694)
self.df['nmscale']=self.nmData16
def get_nm_scale(self):
self.set_nm_scale()
@ -583,6 +585,9 @@ class Jfsphoto (object):
def do_methods(self,panel):
def waitfor():
pass
def cb(event):
if self.check_requirement() == True:
# get selected and save values
@ -598,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()
panel.after(3000,waitfor)
self.df['m1'] = config.rxData16
d = self.df.iloc[p]['darkline']
b = self.df.iloc[p]['baseline']
@ -616,7 +622,6 @@ class Jfsphoto (object):
tree.grid(column=0,row=0)
tree["columns"]=('id','nm','konz','absorbanz','interval','last')
tree.column("#0",width=100,minwidth=100,stretch=tk.NO)
#tree.column("name",width=50,minwidth=50,stretch=tk.NO)
tree.column("id",width=20,minwidth=20,stretch=tk.NO)
tree.column("nm",width=40,minwidth=40,stretch=tk.NO)
tree.column("konz",width=60,minwidth=60,stretch=tk.NO)
@ -662,7 +667,6 @@ class Jfsphoto (object):
for p in self.methods:
if p.get_name()== name:
p.update(s)
#print(f'{name} >> {s}')
self.conf_write()
def add_method():
@ -722,26 +726,7 @@ class Jfsphoto (object):
lb3.grid(column=0,row=7,sticky='w')
load_tree()
# def cb(event):
# print(tree.selection())
# #panel.bcollect.invoke()
# tree.tag_bind('cb','<<TreeviewSelect>>',cb)
# tree.insert('', 'end', 'widgets', text='Widgets',tags=('cb'))
# tree.insert('', 0, 'apps', text='Applications',tags=('cb'))
# tree['columns'] = ('size', 'modified')
# tree.column('size', width=50, anchor='center')
# tree.heading('size', text='Size')
# tree.heading('modified', text='Modified')
# tree.set('widgets', 'size', '12KB')
# tree.set('widgets', 'modified', 'Last week')
# tree.insert('', 'end', text='Canvas', values=('25KB Today'),tags=('cb'))
# tree.insert('apps', 'end', text='Browser', values=('115KB Yesterday'),tags=('cb'))
win.focus_set()
win.grab_set()
win.wait_window()

4
config.ini
View File

@ -4,6 +4,6 @@ nm_right = 811.0
nm_step = 0.13279
[methods]
crystal = 1,530,mymol,0,5,20|1,4.0,1.23|2,8.0,2.4|3,12.0,3.65|4,16.0,4.8|5,20.0,6.05
eisen = 2,405,mymol,0.0,3,60|1,20.0,0.0|2,40.0,0.0|3,60.0,0.0
crystal = 1,576,mymol,0.0,5,15|1,3.0,0.22895393029132272|2,6.0,0.48872693662130523|3,9.0,0.7151233139883822|4,12.0,0.8900731939852544|5,15.0,1.1073861897687294
crystalx = 0,576,mymol,0.0,5,15|1,3.0,0.23572229297382125|2,6.0,0.49418983232280744|3,9.0,0.6972117246796802|4,12.0,0.8832872046419623|5,15.0,1.0800630625574945