diff --git a/gui/LabRobot22.py b/gui/LabRobot22.py index 9ce7686..de13ba2 100644 --- a/gui/LabRobot22.py +++ b/gui/LabRobot22.py @@ -294,6 +294,7 @@ ttk.Label(fra2,textvariable=akttip).grid(row=0,column=4) fra3 = ttk.LabelFrame(downrightframe2,text=' Vessels') fra3.grid(row=2,column=0,sticky='nw') vess = tk.StringVar() +aktvess = tk.StringVar() def do_vessels(*args): global reakt reakt = LabReactBlock(vess_config[vess.get()]['rxoffset'], @@ -307,6 +308,8 @@ def do_vessels(*args): ) vessopt = ttk.OptionMenu(fra3,vess,vessels[0],*vessels,command= do_vessels) vessopt.grid(row=0,column=0) +ttk.Label(fra3,text='Vessel Nr').grid(row=0,column=1) +ttk.Label(fra3,textvariable=aktvess).grid(row=0,column=2) do_vessels() @@ -375,13 +378,13 @@ def load(): b13.config(command=load) def dispense(): - v = reacvol.get() + v = float(reacvol.get()) if pip.dispenseVol(v): command.append(pip.sendE().encode('utf-8')) else : takeChem() upTip() - command.append(pip.get_tip(react.same()).encode('utf-8')) + command.append(pip.get_tip(reakt.same()).encode('utf-8')) downTip() if pip.dispenseVol(v): command.append(pip.sendE().encode('utf-8')) @@ -407,7 +410,7 @@ b14.config(command=takeChem) def nextVessel(): upTip() command.append(pip.get_tip(reakt.next()).encode('utf-8')) - reakt.set(reakt.akt) + aktvess.set(reakt.akt) downTip() b15.config(command=nextVessel) @@ -426,7 +429,7 @@ def loadSerie(): for i in range(p,q): print(i) reakt.akt = i - reakt.set(reakt.akt) + aktvess.set(reakt.akt) upTip() command.append(pip.get_tip(reakt.same()).encode('utf-8')) downTip() diff --git a/gui/chemicals.ini b/gui/chemicals.ini index c069772..a602898 100644 --- a/gui/chemicals.ini +++ b/gui/chemicals.ini @@ -1,9 +1,9 @@ [Water] -x = 50 -y = 10 -z = 10 +x = 200 +y = 50 +z = 70 volume = 100 -z/ml = 0.1 +z/ml = 0.5 reakvolume = 100 [Propanol] diff --git a/gui/labrobot.py b/gui/labrobot.py index 1473814..d6029e1 100644 --- a/gui/labrobot.py +++ b/gui/labrobot.py @@ -165,20 +165,19 @@ class ChemLoc(): change of surface per ml """ def __init__(self,xloc,yloc,zloc,vol,deltaz,chemvol): - self.xloc = xloc - self.yloc = yloc - self.zloc = zloc - self.vol = vol - self.deltaz = deltaz - #self.tauch = tauch - self.chemvol = chemvol + self.xloc = float(xloc) + self.yloc = float(yloc) + self.zloc = float(zloc) + self.vol = float(vol) + self.deltaz = float(deltaz) + self.chemvol = float(chemvol) def getXY(self): return self.xloc,self.yloc def load(self,ml): if self.vol > ml: - z = self.zloc + self.tauch; + z = self.zloc self.zloc = self.zloc + self.deltaz*ml self.vol = self.vol - ml return z diff --git a/gui/pipettes.ini b/gui/pipettes.ini index 5c21a82..f2ef079 100644 --- a/gui/pipettes.ini +++ b/gui/pipettes.ini @@ -1,6 +1,6 @@ [1000] xoffset = 15.5 -yoffset = 5.5 +yoffset = 5 rows = 5 cols = 10 xspace = 12.0