Changeset 6d920cd in sasview

Timestamp:

Feb 27, 2009 8:52:28 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ed2ea6a

Parents:

8dddbd4

Message:

print statement removed

Location:

guiframe

Files:

• data_loader.py (modified) (8 diffs)
• gui_manager.py (modified) (10 diffs)
• history.py (deleted)
• local_perspectives/plotting/AnnulusSlicer.py (modified) (1 diff)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• local_perspectives/plotting/Plotter2D.py (modified) (4 diffs)
• local_perspectives/plotting/boxSum.py (modified) (2 diffs)
• local_perspectives/plotting/last_boxSlicer.py (added)
• local_perspectives/plotting/old_detector_dialog.py (added)
• local_perspectives/plotting/plotting.py (modified) (2 diffs)
• model_thread.py (modified) (1 diff)
• state.py (deleted)
• stateManager.py (deleted)

guiframe/data_loader.py

@@ -1 @@
-import os, sys
+import os, sys,numpy
 import wx
 from dataFitting import Data1D, Theory1D
@@ -28 +28 @@
         Load a 1D ascii file, with errors
     """
-    import numpy
     if path and os.path.isfile(path):
     
@@ -63 +62 @@
     return None, None, None
 
-def plot_data(parent, path, name="Loaded Data"):
+def plot_data(parent, path):
+    """
+        Use the DataLoader loader to created data to plot.
+        @param path: the path of the data to load
+    """
     from sans.guicomm.events import NewPlotEvent, StatusEvent
-   
     from DataLoader.loader import  Loader
-    import numpy
+    
     #Instantiate a loader 
     L = Loader()
@@ -98 +100 @@
             new_plot.x_bins=output.x_bins
             new_plot.y_bins=output.y_bins
-            #print "data_loader",output
         else:
-            #print "output.dx, output.dy",output.dx, output.dy
+           
             if output.dy ==None :
                 new_plot = Theory1D(output.x,output.y, dxl, dxw)
@@ -109 +110 @@
                 new_plot = Theory1D(output.x,output.y,output.dy, dxl, dxw)
             else:
-                    
                 new_plot = Data1D(x=output.x,y=output.y,dx=output.dx,dy=output.dy, dxl=dxl, dxw=dxw)
-       
+        if output.filename==None:
+            output.filename=str(filename)
         new_plot.source=output.source
         new_plot.name = output.filename
@@ -121 +122 @@
         if hasattr(output, "dxw"):
             new_plot.dxw = output.dxw
-        #print "loader output.detector",output.source
         new_plot.detector =output.detector
         
@@ -151 +151 @@
            
             new_plot.source=item.source
-            #new_plot.info=output
             new_plot.name = str(item.run[0])
             new_plot.interactive = True
-           
-            #print "loader output.detector",output.source
             new_plot.detector =item.detector
             # If the data file does not tell us what the axes are, just assume...
@@ -162 +159 @@
             new_plot.group_id = str(item.run[0])
             new_plot.id = str(item.run[0])
+            new_plot.info= item
+            
             if hasattr(item,"title"):
                 title= item.title

guiframe/gui_manager.py

@@ -35 +35 @@
     import config
     
-from sans.guicomm.events import EVT_STATUS,Model2DPanelEvent
+from sans.guicomm.events import EVT_STATUS
 from sans.guicomm.events import EVT_NEW_PLOT,EVT_SLICER_PARS_UPDATE
 import history
@@ -224 +224 @@
         self.defaultPanel    = DefaultPanel(self, -1, style=wx.RAISED_BORDER)
         
-        # History panel
-        #self.histPanel     = history.HistoryPanel(self, style=wx.RAISED_BORDER)
-        # self.build_gui()
        
         # Register the close event so it calls our own method
@@ -297 +294 @@
         """
         import imp
-        print "Looking for plug-ins in %s" % dir
+        #print "Looking for plug-ins in %s" % dir
         # List of plug-in objects
         
@@ -368 +365 @@
         # It also sets the size of the application windows
         self.panels["default"] = self.defaultPanel
-         # History panel
-        #self.panels["historyPanel"] = self.histPanel  
         
         self._mgr.AddPane(self.defaultPanel, wx.aui.AuiPaneInfo().
@@ -378 +373 @@
                               MinSize(wx.Size(self._window_width, self._window_height)).
                               Show())
-        """
-        self._mgr.AddPane(self.histPanel, wx.aui.AuiPaneInfo().
-                          Name("historyPanel").Caption("History").
-                          #Float().
-                          Bottom().
-                          Dock().
-                          TopDockable().
-                          BottomDockable().
-                          LeftDockable().
-                          RightDockable().
-                          MinimizeButton().
-                          Hide().
-                          #Show().
-                          BestSize(wx.Size(500,600)).
-                          MinSize(wx.Size(200,150)))
-        """
+     
 
         # Add the panels to the AUI manager
@@ -410 +390 @@
                                           BestSize(wx.Size(600,600)).
                                           MinSize(wx.Size(400,400)).
-                                          #BestSize(wx.Size(500,500)).
-                                          #MinSize(wx.Size(200,200)).
                                           Hide())
                 
@@ -418 +396 @@
                 self._mgr.AddPane(p, wx.aui.AuiPaneInfo().
                                   Name(p.window_name).Caption(p.window_caption).
-                                  #Floatable().
-                                  #Float().
                                   Right().
                                   Dock().
@@ -428 +404 @@
                                   MinimizeButton().
                                   Hide().
-                                  #Show().
                                   BestSize(wx.Size(600,600)).
                                   MinSize(wx.Size(500,500)))
-                                  #BestSize(wx.Size(400,400)).
-                                  #MinSize(wx.Size(300,300)))
+                               
 
                 
@@ -516 +490 @@
         filemenu.Append(id, '&Open', 'Open a file')
         wx.EVT_MENU(self, id, self._on_open)
-        
-        #id = wx.NewId()
-        #filemenu.Append(id, '&History', 'Register previous States')
-        #wx.EVT_MENU(self, id, self._onHistoryPanel)
-        
+    
         id = wx.NewId()
         filemenu.Append(id,'&Quit', 'Exit') 
@@ -652 +622 @@
                 
             self._mgr.Update()
-    """
-    def _onHistoryPanel(self, event):
-        print "on history"
-        if not self._mgr.GetPane("historyPanel").IsShown():
-            self._mgr.GetPane("historyPanel").Show()
-        self._mgr.Update()
-        return
-    """   
+   
     def _on_open(self, event):
    

guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -122 +122 @@
         rmax = max(math.fabs(self.inner_circle.get_radius()),
                    math.fabs(self.outer_circle.get_radius()))
-        print "rmin, rmax", rmin, rmax
+        #print "rmin, rmax", rmin, rmax
         if nbins==None:
             nbins = 20

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -263 +263 @@
         slicerpop.Append(id, '&Reset Graph')
         wx.EVT_MENU(self, id, self.onResetGraph)  
-        """
-        slicerpop.AppendSeparator() 
-        id = wx.NewId()
-        slicerpop.Append(id,'&Printer setup', 'Set image size')
-        wx.EVT_MENU(self, id, self.onPrinterSetup)
-        
-        id = wx.NewId()
-        slicerpop.Append(id,'&Printer Preview', 'Set image size')
-        wx.EVT_MENU(self, id, self.onPrinterPreview)
-        """
+       
         
 

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -93 +93 @@
         
     def _onEVT_SLICER_PARS(self, event):
-        print "paramaters entered on slicer panel", event.type, event.params
+        #print "paramaters entered on slicer panel", event.type, event.params
         self.slicer.set_params(event.params)
         #from sans.guicomm.events import SlicerPanelEvent
@@ -247 +247 @@
         slicerpop.AppendSeparator() 
        
-        """
-        # Option to save the data displayed
-        id = wx.NewId()
-        slicerpop.Append(id,'&Printer setup', 'Set image size')
-        wx.EVT_MENU(self, id, self.onPrinterSetup)
-        
-       
-        """
+     
         id = wx.NewId()
         slicerpop.Append(id, '&Toggle Linear/Log scale')
@@ -265 +258 @@
    
     def _onEditDetector(self, event):
-        print "edit detortor param",self.zmin_2D, self.zmax_2D
+        """
+        """
+        #print "edit detortor param",self.zmin_2D, self.zmax_2D
         import detector_dialog
         dialog = detector_dialog.DetectorDialog(self, -1,base=self.parent)
@@ -286 +281 @@
        
         dialog.Destroy()
-        print "zmn ,zmax", self.zmin_2D, self.zmax_2D
+        #print "zmn ,zmax", self.zmin_2D, self.zmax_2D
         self.image(data= self.data2D.data,
                    xmin= self.data2D.xmin,

guiframe/local_perspectives/plotting/boxSum.py

@@ -74 +74 @@
         #print "box sum  self.base.parent",self.base.parent
         self.base.Bind(EVT_SLICER_PARS, self._onEVT_SLICER_PARS)
+        
     def set_panel_name(self, name):
         self.panel_name= name
+        
+        
     def _onEVT_SLICER_PARS(self, event):
         wx.PostEvent(self.base.parent, StatusEvent(status="Boxsum._onEVT_SLICER_PARS"))
-        print "receiving value ",event.params
+        #print "receiving value ",event.params
         event.Skip()
         if event.type == self.__class__.__name__:
@@ -157 +160 @@
         y_min= self.vertical_lines.y2
         y_max= self.vertical_lines.y1
-        print "xmin, xmax, ymin , ymax", x_min, x_max, y_min, y_max
+        #print "xmin, xmax, ymin , ymax", x_min, x_max, y_min, y_max
         box =  Boxavg (x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max)
         self.count, self.error = box(self.base.data2D)
-        print "box_sum output",box(self.base.data2D)
+        #print "box_sum output",box(self.base.data2D)
                           
     def moveend(self, ev):

guiframe/local_perspectives/plotting/plotting.py

@@ -108 +108 @@
                         is_available = True
                         
-                        
                         panel._onEVT_1DREPLOT(event)
                         self.parent.show_panel(panel.uid)
-                        print "went here for replottiing", event.plot.name
+                        #print "went here for replottiing", event.plot.name
                         
                 else:
@@ -125 +124 @@
                 from Plotter1D import ModelPanel1D
                 if hasattr(event.plot,"xtransform"):
-                    print "went here"
+                    #print "went here"
                     xtransform = event.plot.xtransform
                 else:

guiframe/model_thread.py

@@ -163 +163 @@
                        "Error computing %s at [%g,%g]" %(self.model.name, self.x[i_x],self.y[i_y])))
                      pass
-        print "model thread ouput",output       
+        #print "model thread ouput",output       
         elapsed = time.time()-self.starttime
         self.complete(