add refresh button to refresh the file list

Former-commit-id: 621019cd36c634d6c2a9772925a24943256f684f

Author: XiaohaoYang

dpx/srxplanargui/live.py

@@ -57,7 +57,7 @@
 
 from dpx.confutils.tools import checkFileVal
 
-class LivingThread(threading.Thread):
+'''class LivingThread(threading.Thread):
 
     def __init__(self, wdir, maingui):
         threading.Thread.__init__(self)
@@ -88,17 +88,17 @@ def run(self):
                 maingui.newImages()
                 self.lastctime = os.path.getctime(wdir)
             time.sleep(0.5)
-        return
+        return'''
 
 
 class SrXguiLive(SrXgui):
 
     getxgui = Any
 
     def __init__(self, configfile=None, args=None, **kwargs):
-        '''
-        init the object, createt the notifications
-        '''
+        
+        # init the object, createt the notifications
+        
         self.splash = SplashScreen(image=ImageResource('01.png'), show_log_messages=False)
         self.splash.open()
 
@@ -117,8 +117,8 @@ def __init__(self, configfile=None, args=None, **kwargs):
         self.help = SrXguiHelp()
         self.calibration = Calibration(srx=self.srx, srxconfig=self.srxconfig)
 
-        self.liveplot = None
-        self.last10data = []
+        '''self.liveplot = None
+        self.last10data = []'''
 
         self.splash.close()
         return
@@ -144,7 +144,7 @@ def processSelected(self, summation=False):
             GUI.invoke_later(self.addNewImagesToGetXgui, newchifilelist)
         return
 
-    def _startCapturing(self):
+    '''def _startCapturing(self):
         self.capturing = True
 
         wdir = self.srxconfig.opendirectory
@@ -156,15 +156,15 @@ def _startCapturing(self):
         self.livingthread = LivingThread(wdir, self)
         self.livingthread.daemon = True
         self.livingthread.start()
-        return
+        return'''
 
-    def _stopCapturing(self):
+    '''def _stopCapturing(self):
         self.capturing = False
         self.livingthread.capturing = False
         self.livingthread.join()
-        return
+        return'''
 
-    ###LIVE###
+    '''###LIVE###
     def newImages(self):
         newexistfileset = self.srx.loadimage.genFileSet(fullpath=True)
         newfileset = newexistfileset - self.existfileset
@@ -179,7 +179,7 @@ def newImages(self):
             newchifilelist = [rv['filename'] for rv in rvlist]
             GUI.invoke_later(self.addNewImagesToGetXgui, newchifilelist)
             self.existfileset = newexistfileset
-        return
+        return'''
 
     def addNewImagesToGetXgui(self, filelist):
         '''
@@ -198,15 +198,15 @@ def addNewImagesToGetXgui(self, filelist):
             self.liveplot, liveplotpanel = self.getxgui.createNewPlot(newdatacontainers)
         return
 
-    capturing = Bool(False)
+    '''capturing = Bool(False)
     startcapturing_action = \
         Action(name='Start Capturing',
                action='_startCapturing',
                enabled_when='not capturing')
     stopcapturing_action = \
         Action(name='Stop Capturing',
                action='_stopCapturing',
-               enabled_when='capturing')
+               enabled_when='capturing')'''
     quickstart_action = \
         Action(name='Help ',
                action='_quickstart')
@@ -233,7 +233,7 @@ def addNewImagesToGetXgui(self, filelist):
                     HGroup(spring,
                            Item('selfcalibratebb', enabled_when='not capturing'),
                            Item('integratbb', enabled_when='not capturing'),
-                           Item('integratessbb', enabled_when='not capturing'),
+                           # Item('integratessbb', enabled_when='not capturing'),
                            spring,
                            show_labels=False,
                            ),

dpx/srxplanargui/selectfiles.py

@@ -169,6 +169,10 @@ def _plotbb_fired(self):
                 # imageplot.createPlot()
                 imageplot.edit_traits()
         return
+    
+    def _refreshbb_fired(self):
+        self.refreshdatalist = True
+        return
 
     #-- Traits UI Views --------------------------------------------------------
     tableeditor = TableEditor(
@@ -193,21 +197,29 @@ def _plotbb_fired(self):
         )
 
     selectallbb = Button('Select all')
-    plotbb = Button('Image and Mask')
+    refreshbb = Button('Refresh')
+    plotbb = Button('Mask')
+    sumbb = Button('Sum')
 
     traits_view = View(
         VGroup(
             VGroup(
                 HGroup(
                     Item('search', id='search', springy=True,
                          editor=TextEditor(auto_set=False)),
-                    Item('filetype', label='Type'),
                     ),
+                HGroup(spring,
+                       Item('selectallbb', show_label=False),
+                       Item('refreshbb', show_label=False),
+                       spring,
+                       Item('filetype', label='Type'),
+                       ),
                 Item('datafiles', id='datafiles', editor=tableeditor),
                 Item('summary', editor=TitleEditor()),
+                
                 HGroup(spring,
-                       Item('selectallbb', show_label=False),
                        Item('plotbb', show_label=False),
+                       Item('sumbb', show_label=False),
                        spring,
                        ),
                 dock='horizontal',

dpx/srxplanargui/srxgui.py

@@ -243,9 +243,9 @@ def _selfcalibratebb_changed(self):
         Action(name='Help ',
                action='_helpView')
 
-    integratbb = Button('Integrate separately')
+    integratbb = Button('Integrate')
     integratessbb = Button('Sum and Integrate')
-    selfcalibratebb = Button('Calibration')
+    selfcalibratebb = Button('Calibrate')
     helpbb = Button('Help')
 
     traits_view = \
@@ -262,7 +262,7 @@ def _selfcalibratebb_changed(self):
                     HGroup(spring,
                            Item('selfcalibratebb'),
                            Item('integratbb'),
-                           Item('integratessbb'),
+                           # Item('integratessbb'),
                            spring,
                            show_labels=False,
                            ),