Changeset 749 in ETALON

Timestamp:

Nov 29, 2017, 9:44:42 AM (6 years ago)

Author:

delerue

Message:

CLIO graphical interface and analysis updated

Location:

CLIO/control

Files:

• CLIO_graphical_interface.py (modified) (9 diffs)
• clio_constants.py (modified) (2 diffs)

CLIO/control/CLIO_graphical_interface.py

@@ -26 +26 @@
 global data_directory
 global code_directory
+global temp_directory
 
 from clio_constants import *
@@ -70 +71 @@
         self.terminate=0
         self.refresh_loop=0
+        
+        #Scan variables
+        self.scanON=False
+        self.scanStart=4500000
+        self.scanStop=5500000
+        self.scanStep=10000
+        self.scanNextStep=0
+        self.scanDuration=0
+        self.scanWaitUntil=0
+        
         # canvas for image
         self.canvas = Canvas(self.parent, width=800, height=800)
@@ -143 +154 @@
         self.frameMotors.pack(side=LEFT)
         labelMotors=Label(self.frameMotors,text='Motors Control')
-        labelMotors.grid(row=0,column=0,columnspan=4)
-        buttonRetractFull = Button(self.frameMotors, text="Retract completely", command=self.onButtonRetract)
+        labelMotors.grid(row=0,column=0,columnspan=3)
+        buttonRetractFull = Button(self.frameMotors, text="Retract", command=self.onButtonRetract)
         buttonRetractFull.grid(row=1,column=0)
-        buttonInsert1 = Button(self.frameMotors, text="Insert to "+str(INSERTED_VALUE1), command=self.onButtonInsert1)
-        buttonInsert1.grid(row=2,column=0)
-        buttonBackward20k = Button(self.frameMotors, text="Backward 20k", command=self.onButtonBkd20k)
-        buttonBackward20k.grid(row=1,column=1)
-        buttonBackward100k = Button(self.frameMotors, text="Backward 100k", command=self.onButtonBkd100k)
-        buttonBackward100k.grid(row=1,column=2)
-        buttonBackward1m = Button(self.frameMotors, text="Backward 1M", command=self.onButtonBkd1m)
-        buttonBackward1m.grid(row=1,column=3)
-        buttonForward20k = Button(self.frameMotors, text="Forward 20k", command=self.onButtonFwd20k)
+        buttonInsert1 = Button(self.frameMotors, text="To "+str(INSERTED_VALUE1), command=self.onButtonInsert1)
+        buttonInsert1.grid(row=1,column=1)
+        buttonBackward20k = Button(self.frameMotors, text="-20k", command=self.onButtonBkd20k)
+        buttonBackward20k.grid(row=2,column=0)
+        buttonBackward100k = Button(self.frameMotors, text="-100k", command=self.onButtonBkd100k)
+        buttonBackward100k.grid(row=3,column=0)
+        buttonBackward1m = Button(self.frameMotors, text="-1M", command=self.onButtonBkd1m)
+        buttonBackward1m.grid(row=4,column=0)
+        buttonForward20k = Button(self.frameMotors, text="+20k", command=self.onButtonFwd20k)
         buttonForward20k.grid(row=2,column=1)
-        buttonForward100k = Button(self.frameMotors, text="Forward 100k", command=self.onButtonFwd100k)
-        buttonForward100k.grid(row=2,column=2)
-        buttonForward1m = Button(self.frameMotors, text="Forward 1M", command=self.onButtonFwd1m)
-        buttonForward1m.grid(row=2,column=3)
-        self.labelPositionStepTitle=Label(self.frameMotors,text='Position (steps):', bg='grey')
-        self.labelPositionStepTitle.grid(row=3,column=0,columnspan=1)
+        buttonForward100k = Button(self.frameMotors, text="+100k", command=self.onButtonFwd100k)
+        buttonForward100k.grid(row=3,column=1)
+        buttonForward1m = Button(self.frameMotors, text="+1M", command=self.onButtonFwd1m)
+        buttonForward1m.grid(row=4,column=1)
+        self.labelPositionStepTitle=Label(self.frameMotors,text='Pos.:', bg='grey')
+        self.labelPositionStepTitle.grid(row=1,column=2,columnspan=1)
         self.labelPositionStep=Label(self.frameMotors,text='Status: unkown', bg='blue')
-        self.labelPositionStep.grid(row=3,column=1,columnspan=1)
+        self.labelPositionStep.grid(row=2,column=2,columnspan=1)
       
-        self.labelPositionCurrentTitle=Label(self.frameMotors,text=' (current):', bg='grey')
-        self.labelPositionCurrentTitle.grid(row=3,column=2,columnspan=1)
+        #self.labelPositionCurrentTitle=Label(self.frameMotors,text=' (current):', bg='grey')
+        #self.labelPositionCurrentTitle.grid(row=3,column=2,columnspan=1)
         self.labelPositionCurrent=Label(self.frameMotors,text='Status: unkown', bg='blue')
-        self.labelPositionCurrent.grid(row=3,column=3,columnspan=1)
-
+        self.labelPositionCurrent.grid(row=3,column=2,columnspan=1)
+
+        buttonScanMotor = Button(self.frameMotors, text="Scan", command=self.onButtonScan)
+        buttonScanMotor.grid(row=4,column=2)
         
         #Check process status
@@ -283 +296 @@
             self.labelAcquisitionStatus.config(text="Enabled", bg='green',fg='black')
 
+        #check if we are doing a scan
+        self.scanCheck()
+            
         #check remote processes
+        sys.stdout.write(str(self.refresh_loop)+'\r')
+        sys.stdout.flush()
+        
+            
         if (self.refresh_loop%PROCESSES_REFRESH_INTERVAL==1):
-            response=os.system("ping -c 1 "+motor_controller_IP)
+            response=os.system("ping -c 1 "+motor_controller_IP+" > " + temp_directory + "ping.out")
             if response==0:
                 self.labelProcessWago.config(bg='green')
@@ -339 +359 @@
 
         if (self.refresh_loop%PROCESSES_REFRESH_INTERVAL==5):
-            response=os.system("ping -c 1 "+IP_POWER_IP)
+            response=os.system("ping -c 1 "+IP_POWER_IP+" > " + temp_directory + "ping.out")
             if response==0:
                 self.labelProcessIPPower.config(bg='green')
@@ -351 +371 @@
             fid=open(FILE_ACQ_INFO,'r')
             fileline=fid.readline()
-            print fileline
+            #print fileline
             key_values={}
             while len(fileline)>0:
-                print fileline
+                #print fileline
                 entries=fileline.replace('\n','').split(' ')
                 key_values[entries[0]]=entries[1]
@@ -372 +392 @@
             key_values={}
             while len(fileline)>0:
-                print fileline
+                #print fileline
                 entries=fileline.replace('#','').replace(' ','').replace('\n','').split('=')
                 key_values[entries[0]]=entries[1]
@@ -397 +417 @@
         #            print repr(values)
         for ipower in range(4):
-            print values[ipower].split('=')[1]
+            #print values[ipower].split('=')[1]
             if (values[ipower].split('=')[1]=='1'):
                 self.buttonPower[ipower].config(bg='green')
@@ -452 +472 @@
         self.moveMotor(1,1000000)
 
+    #----------------
+    def onButtonScan(self):
+        self.popup = Toplevel()
+#        win.grab_set()
+        self.popup.wm_title("Motors scan")
+
+        scanLabel = Label(self.popup, text="Select the scan parameters")
+        scanLabel.grid(row=0, column=0,columnspan=2)
+
+        scanLabelStart = Label(self.popup, text="Start position")
+        scanLabelStart.grid(row=1, column=0,columnspan=1)
+
+        scanLabelStop = Label(self.popup, text="Stop position")
+        scanLabelStop.grid(row=2, column=0,columnspan=1)
+
+        scanLabelStep = Label(self.popup, text="Step size")
+        scanLabelStep.grid(row=3, column=0,columnspan=1)
+
+        scanLabelDuration = Label(self.popup, text="Step time (s)")
+        scanLabelDuration.grid(row=4, column=0,columnspan=1)
+
+        self.buttonValueStart = Text(self.popup, height=1.5, width=10)
+        self.buttonValueStart.grid(row=1, column=1,columnspan=1)
+        self.buttonValueStart.insert(END,self.scanStart)
+
+        self.buttonValueStop = Text(self.popup, height=1, width=10)
+        self.buttonValueStop.grid(row=2, column=1,columnspan=1)
+        self.buttonValueStop.insert(END,self.scanStop)
+
+        self.buttonValueStep = Text(self.popup, height=1, width=10)
+        self.buttonValueStep.grid(row=3, column=1,columnspan=1)
+        self.buttonValueStep.insert(END,self.scanStep)
+
+        self.buttonValueDuration = Text(self.popup, height=1, width=10)
+        self.buttonValueDuration.grid(row=4, column=1,columnspan=1)
+        self.buttonValueDuration.insert(END,self.scanDuration)
+
+
+        buttonOk = Button(self.popup, text="Start scan", command=lambda: self.closeScanWindow(True))
+        buttonOk.grid(row=5, column=0,columnspan=1)
+
+        buttonNot = Button(self.popup, text="Don't scan", command=lambda: self.closeScanWindow(False))
+        buttonNot.grid(row=5, column=1,columnspan=1)
+
+#        self.popup.grab_release()
+#        self.wait_self.popupdow(self.popup)
+
+
+
+
+    def closeScanWindow(self,startScan):
+        print("self.buttonValueStart")
+        print(self.buttonValueStart.get("1.0","end-1c"))
+#        print(self.buttonValueStart.value)
+
+        self.scanStart=int(self.buttonValueStart.get("1.0","end-1c"))
+        self.scanStop=int(self.buttonValueStop.get("1.0","end-1c"))
+        self.scanStep=int(self.buttonValueStep.get("1.0","end-1c"))
+        self.scanNextStep=0
+        self.scanDuration=0
+        self.scanWaitUntil=0
+        self.scanON=startScan
+        self.popup.destroy()
+        
+    def scanCheck(self):
+        if (self.scanON):
+            print "Scan in progress"
+        else:
+            print "No scan"
+            
     def onButtonPower(self,value):
         print('Power value='+str(value))

CLIO/control/clio_constants.py

@@ -16 +16 @@
 global FILE_COMPARE
 global data_directory
+global temp_directory
 global data_dir
 global motor_controller_IP
@@ -45 +46 @@
     basedir="/home/etalon-admin/"
     code_directory=basedir+"control/"
+    temp_directory=basedir+"tmp/"
     FILE_PAUSE=basedir+'acquisition_data/pause_acquisition';
     FILE_STOP=basedir+'acquisition_data/stop_acquisition';