Changeset 3e001f9 in sasview

Timestamp:

Apr 6, 2013 1:36:03 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

4bdd4fdb

Parents:

cb270ad2

Message:

Added tools, imageviwer and qrange cursors

Files:

• calculatorview/src/sans/perspectives/calculator/calculator.py (modified) (4 diffs)
• calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py (modified) (4 diffs)
• calculatorview/src/sans/perspectives/calculator/help_panel.py (modified) (1 diff)
• calculatorview/src/sans/perspectives/calculator/image_viewer.py (added)
• calculatorview/src/sans/perspectives/calculator/media/load_image.bmp (added)
• calculatorview/src/sans/perspectives/calculator/media/load_image_help.html (added)
• calculatorview/src/sans/perspectives/calculator/media/pic_convert.bmp (added)
• calculatorview/src/sans/perspectives/calculator/media/pic_plot.bmp (added)
• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (4 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (4 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter2D.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py (modified) (2 diffs)

calculatorview/src/sans/perspectives/calculator/calculator.py

@@ -66 +66 @@
         gensans_help = "Generic SANS"
         pyconsole_help = "Python Console."
+        imageviewer_help = "Load an image file and display the image."
         #data_editor_help = "Meta Data Editor"
         return [("Data Operation", 
@@ -80 +81 @@
                 ("Generic Scattering Calculator", 
                         gensans_help, self.on_gen_model),
-                ("Python Shell/Editor", pyconsole_help, self.on_python_console)]
+                ("Python Shell/Editor", pyconsole_help, self.on_python_console),
+                ("Image Viewer", imageviewer_help, self.on_image_viewer),]
               
     def on_edit_data(self, event):
@@ -162 +164 @@
         self.put_icon(frame)
         frame.Show(True) 
+
+    def on_image_viewer(self, event):
+        """
+        Get choose an image file dialog
+        
+        :param event: menu event
+        """
+        from sans.perspectives.calculator.image_viewer import ImageView
+        image_view = ImageView(parent=self.parent)
+        image_view.load()
         
     def on_python_console(self, event):
@@ -193 +205 @@
                 except:
                     pass      
-  
-    

calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py

@@ -662 +662 @@
         output = self.sld_data  
         #frame_size = wx.Size(470, 470)    
-        self.plot_frame = PlotFrame(self, -1, 'testView')
+        self.plot_frame = PlotFrame(self.parent.parent, -1, 'testView')
         frame = self.plot_frame
         frame.Show(False)
@@ -1790 +1790 @@
         return flag
 
-class SasGenWindow(wx.Frame):
+class SasGenWindow(wx.MDIChildFrame):
     """
     GEN SAS main window
@@ -1802 +1802 @@
         kwds['title'] = title
         
-        wx.Frame.__init__(self, parent, *args, **kwds)
+        wx.MDIChildFrame.__init__(self, parent, *args, **kwds)
         self.parent = parent
         self.omfpanel = OmfPanel(parent=self)
@@ -2002 +2002 @@
         """
         """
-        frame = PlotFrame(self, -1, 'testView', self.scale2d)
+        frame = PlotFrame(self.parent, -1, 'testView', self.scale2d)
         add_icon(self.parent, frame)
         frame.add_plot(plot)

calculatorview/src/sans/perspectives/calculator/help_panel.py

@@ -84 +84 @@
             <li><a href ="pycrust_help.html" 
             target ="showframe">Python Shell</a><br></li>
+            <li><a href ="load_image_help.html" 
+            target ="showframe">Image Viewer</a><br></li>
             </ul>
             </body>

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -12 +12 @@
 from sans.guiframe.events import StatusEvent
 from sans.guiframe.events import NewPlotEvent
+from sans.guiframe.events import PlotQrangeEvent
 from sans.guiframe.dataFitting import check_data_validity
 from sans.guiframe.utils import format_number
@@ -516 +517 @@
         self.qmin = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
                                     style=wx.TE_PROCESS_ENTER,
-                                    text_enter_callback=self._onQrangeEnter)
+                                    set_focus_callback=self.qrang_set_focus,
+                                    text_enter_callback=self._onQrangeEnter,
+                                    name='qmin')
         self.qmin.SetValue(str(self.qmin_x))
-        self.qmin.SetToolTipString("Minimun value of Q in linear scale.")
+        q_tip = "Click outside of the axes\n to remove the lines."
+        qmin_tip = "Minimun value of Q.\n"
+        qmin_tip += q_tip
+        self.qmin.SetToolTipString(qmin_tip)
      
         self.qmax = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
                                        style=wx.TE_PROCESS_ENTER,
-                                       text_enter_callback=self._onQrangeEnter)
+                                       set_focus_callback=self.qrang_set_focus,
+                                       text_enter_callback=self._onQrangeEnter,
+                                       name='qmax')
         self.qmax.SetValue(str(self.qmax_x))
-        self.qmax.SetToolTipString("Maximum value of Q in linear scale.")
+        qmax_tip = "Maximum value of Q.\n"
+        qmax_tip += q_tip
+        self.qmax.SetToolTipString(qmax_tip)
+        self.qmin.Bind(wx.EVT_MOUSE_EVENTS, self.qrange_click)
+        self.qmax.Bind(wx.EVT_MOUSE_EVENTS, self.qrange_click)
+        self.qmin.Bind(wx.EVT_KEY_DOWN, self.on_key)
+        self.qmax.Bind(wx.EVT_KEY_DOWN, self.on_key)
+        self.qmin.Bind(wx.EVT_TEXT, self.on_qrange_text)
+        self.qmax.Bind(wx.EVT_TEXT, self.on_qrange_text)
         id = wx.NewId()
         self.reset_qrange = wx.Button(self, id, 'Reset', size=(77, 20))
@@ -1318 +1334 @@
         wx.PostEvent(self.parent, event)
         self.state_change = False
-         
+        
+    def qrang_set_focus(self, event=None):  
+        """
+        ON Qrange focus
+        """
+        if event != None:
+            event.Skip()
+        #tcrtl = event.GetEventObject()
+        self._validate_qrange(self.qmin, self.qmax)
+        
+    def qrange_click(self, event):
+        """
+        On Qrange textctrl click, make the qrange lines in the plot
+        """
+        if event != None:
+            event.Skip()
+        if self.data.__class__.__name__ == "Data2D":
+            return
+        is_click = event.LeftDown()
+        if is_click:
+            d_id = self.data.id
+            d_group_id = self.data.group_id
+            act_ctrl = event.GetEventObject()
+            wx.PostEvent(self.parent.parent, 
+                         PlotQrangeEvent(ctrl=[self.qmin, self.qmax], id=d_id, 
+                                     group_id=d_group_id, leftdown=is_click,
+                                     active=act_ctrl))
+            
+    def on_qrange_text(self, event):
+        """
+        #On q range value updated. DO not combine with qrange_click().
+        """
+        if event != None:
+            event.Skip()
+        if self.data.__class__.__name__ == "Data2D":
+            return
+        act_ctrl = event.GetEventObject()
+        d_id = self.data.id
+        d_group_id = self.data.group_id
+        wx.PostEvent(self.parent.parent, 
+                     PlotQrangeEvent(ctrl=[self.qmin, self.qmax], id=d_id, 
+                                     group_id=d_group_id, leftdown=False, 
+                                     active=act_ctrl))
+        self._validate_qrange(self.qmin, self.qmax)
+    
+    def on_key(self, event):   
+        """
+        On Key down
+        """
+        event.Skip()
+        if self.data.__class__.__name__ == "Data2D":
+            return
+        ctrl = event.GetEventObject()
+        try:
+            x_data = float(ctrl.GetValue())
+        except:
+            return 
+        key = event.GetKeyCode()
+        length = len(self.data.x)
+        indx = (numpy.abs(self.data.x - x_data)).argmin()
+        #return array.flat[idx]
+        if key == wx.WXK_PAGEUP or key == wx.WXK_NUMPAD_PAGEUP:
+            indx += 1
+            if indx >= length:
+                indx = length - 1
+        elif key == wx.WXK_PAGEDOWN or key == wx.WXK_NUMPAD_PAGEDOWN:
+            indx -= 1
+            if indx < 0:
+                indx = 0
+        else:
+            return
+        ctrl.SetValue(str(self.data.x[indx]))
+        self._validate_qrange(self.qmin, self.qmax)
+               
     def _onQrangeEnter(self, event):
         """
@@ -1799 +1888 @@
                 self._set_bookmark_flag(not self.batch_on)
                 self._keep.Enable(not self.batch_on)
-                
-            self._set_save_flag(True)
-            self._set_preview_flag(True)
+            if self.data.is_data:    
+                self._set_save_flag(True)
+                self._set_preview_flag(True)
 
             self._set_smear(data)

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -93 +93 @@
         ## Default locations
         #self._default_save_location = os.getcwd() 
-        self.size = None       
+        self.size = None  
+        self.vl_ind = 0     
         ## Graph        
         #self.graph = Graph()
@@ -99 +100 @@
         self.graph.yaxis("\\rm{Intensity} ", "cm^{-1}")
         self.graph.render(self)
+        self.cursor_id = None
         
         # In resizing event
@@ -217 +219 @@
         wx.CallAfter(self.parent.disable_app_menu,self)
         
+    def on_plot_qrange(self, event=None):
+        """
+        On Qmin Qmax vertical line event
+        """
+        if event == None:
+            return
+        event.Skip() 
+        active_ctrl = event.active
+        if active_ctrl == None:
+            return
+        if event.id in self.plots.keys():
+            # Set line position and color
+            colors = ['red', 'purple']
+            self.cursor_id = event.id
+            ctrl = event.ctrl
+            if self.ly == None:
+                self.ly = []
+                for ind_ly in range(len(colors)):
+                    self.ly.append(self.subplot.axvline(color=colors[ind_ly], 
+                                                        lw=2.5, alpha=0.7))
+                    self.ly[ind_ly].set_rasterized(True)      
+            try:
+                # Display x,y in the status bar if possible
+                xval = float(active_ctrl.GetValue())
+                position = self.get_data_xy_vals(xval)
+                if position != None:
+                    wx.PostEvent(self.parent, StatusEvent(status=position))
+            except:
+                pass
+            if not event.leftdown:
+                # text event 
+                try:
+                    is_moved = False
+                    for idx in range(len(self.ly)):
+                        val = float(ctrl[idx].GetValue())
+                        # check if vline moved
+                        if self.ly[idx].get_xdata() != val:
+                            self.ly[idx].set_xdata(val)
+                            is_moved = True
+                    if is_moved:
+                        self.canvas.draw() 
+                except:
+                    pass
+                event.Skip() 
+                return
+            self.q_ctrl = ctrl
+            try:
+                pos_x_min = float(self.q_ctrl[0].GetValue())
+            except:
+                pos_x_min = xmin
+            try:
+                pos_x_max = float(self.q_ctrl[1].GetValue())
+            except:
+                pos_x_max = xmax
+            pos_x = [pos_x_min, pos_x_max]
+            for ind_ly in range(len(colors)):
+                self.ly[ind_ly].set_color(colors[ind_ly])
+                self.ly[ind_ly].set_xdata(pos_x[ind_ly])
+            self.canvas.draw()
+        else:
+            self.q_ctrl = None
+    
+    def get_data_xy_vals(self, xval):
+        """
+        Get x, y data values near x = x_val
+        """
+        try:
+            x_data = self.plots[self.cursor_id].x
+            y_data = self.plots[self.cursor_id].y
+            indx = self._find_nearest(x_data, xval)
+            pos_x = x_data[indx]
+            pos_y = y_data[indx]
+            position = str(pos_x), str(pos_y)
+            return position
+        except:
+            return None
+           
+    def _find_nearest(self, array, value):
+        """
+        Find and return the nearest value in array to the value.
+        Used in cusor_line()
+        :Param array: numpy array
+        :Param value: float
+        """
+        idx = (numpy.abs(array - value)).argmin()
+        return int(idx)#array.flat[idx]
+    
+    def _check_line_positions(self, pos_x=None, nop=None):
+        """
+        Check vertical line positions
+        :Param pos_x: position of the current line [float]
+        :Param nop: number of plots [int]
+        """
+        ly = self.ly
+        ly0x = ly[0].get_xdata()
+        ly1x = ly[1].get_xdata()
+        self.q_ctrl[0].SetBackgroundColour('white')
+        self.q_ctrl[1].SetBackgroundColour('white')
+        if ly0x >= ly1x:
+            if self.vl_ind == 0:
+                ly[1].set_xdata(pos_x)
+                ly[1].set_zorder(nop)
+                self.q_ctrl[1].SetValue(str(pos_x))
+                self.q_ctrl[0].SetBackgroundColour('pink')
+            elif self.vl_ind == 1:
+                ly[0].set_xdata(pos_x)
+                ly[0].set_zorder(nop)
+                self.q_ctrl[0].SetValue(str(pos_x))
+                self.q_ctrl[1].SetBackgroundColour('pink')
+                
+    def _get_cusor_lines(self, event):
+        """
+        Revmove or switch cursor line if drawn
+        :Param event: LeftClick mouse event
+        """  
+        ax = event.inaxes
+        dclick = event.action == 'dclick'
+        if ax == None or dclick:
+            # remove the vline
+            self._check_zoom_plot()
+            self.canvas.draw()
+            self.q_ctrl = None
+            return 
+        if self.ly != None and event.xdata != None:
+            # Selecting a new line if cursor lines are displayed already
+            dqmin = math.fabs(event.xdata - self.ly[0].get_xdata())
+            dqmax = math.fabs(event.xdata - self.ly[1].get_xdata())
+            is_qmax = dqmin > dqmax
+            if is_qmax:
+                self.vl_ind = 1
+            else:
+                self.vl_ind = 0 
+                     
+    def cusor_line(self, event):
+        """
+        Move the cursor line to write Q range
+        """
+        if self.q_ctrl == None:
+            return
+        #release a q range vline
+        if self.ly != None and not self.leftdown:
+            for ly in self.ly:
+                ly.set_alpha(0.7)
+                self.canvas.draw()
+            return
+        ax = event.inaxes
+        if ax == None or not hasattr(event, 'action'):
+            return
+        end_drag = event.action != 'drag' and event.xdata != None
+        nop = len(self.plots)
+        pos_x, pos_y = float(event.xdata), float(event.ydata)
+        try:
+            ly = self.ly
+            ly0x = ly[0].get_xdata()
+            ly1x = ly[1].get_xdata()
+            if ly0x == ly1x:
+                if ly[0].get_zorder() > ly[1].get_zorder():
+                    self.vl_ind = 0
+                else:
+                    self.vl_ind = 1
+            vl_ind = self.vl_ind
+            x_data = self.plots[self.cursor_id].x
+            y_data = self.plots[self.cursor_id].y
+            xmin = x_data.min()
+            xmax = x_data.max()
+            indx = self._find_nearest(x_data, pos_x)
+            #pos_x = self._find_nearest(x_data, pos_x)
+            #indx = int(numpy.searchsorted(x_data, [pos_x])[0])
+            # Need to hold LeftButton to drag
+            if end_drag:
+                if event.button:
+                    self._check_line_positions(pos_x, nop)
+                return   
+            if indx >= len(x_data):
+                indx = len(x_data) - 1
+            pos_x = x_data[indx]
+            pos_y = y_data[indx]
+            if xmin == ly1x:
+                vl_ind = 1
+            elif xmax == ly0x:
+                vl_ind = 0
+            else:
+                ly[vl_ind].set_xdata(pos_x)
+                ly[vl_ind].set_zorder(nop + 1)
+                self._check_line_positions(pos_x, nop)
+            ly[vl_ind].set_xdata(pos_x)
+            ly[vl_ind].set_alpha(1.0)
+            ly[vl_ind].set_zorder(nop + 1)
+            self.canvas.draw()
+            self.q_ctrl[vl_ind].SetValue(str(pos_x))
+        except:
+            pass
+               
     def set_resizing(self, resizing=False):
         """
@@ -340 +535 @@
         Display the position of the mouse on the statusbar
         """
+        self._get_cusor_lines(event)
+        ax = event.inaxes
         PlotPanel.onLeftDown(self, event)
-        ax = event.inaxes
+
         if ax != None:
             try:

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -142 +142 @@
         self.default_zmin_ctl = self.zmin_2D
         self.default_zmax_ctl = self.zmax_2D
-       
+
+    def on_plot_qrange(self, event=None):
+        """
+        On Qmin Qmax vertical line event
+        """
+        # Not implemented
+        if event == None:
+            return
+        event.Skip() 
+                       
     def onLeftDown(self, event): 
         """

sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py

@@ -15 +15 @@
 import sys
 from sans.guiframe.events import EVT_NEW_PLOT
+from sans.guiframe.events import EVT_PLOT_QRANGE
 from sans.guiframe.events import StatusEvent 
 from sans.guiframe.events import DeletePlotPanelEvent
@@ -82 +83 @@
         # Connect to plotting events
         self.parent.Bind(EVT_NEW_PLOT, self._on_plot_event)
+        self.parent.Bind(EVT_PLOT_QRANGE, self._on_plot_qrange)
         # We have no initial panels for this plug-in
         return []
-   
+    
+    def _on_plot_qrange(self, event= None):
+        """
+        On Qmin Qmax vertical line event
+        """
+        if event == None:
+            return
+        if event.id in self.plot_panels.keys():
+            panel = self.plot_panels[event.id]
+        elif event.group_id in self.plot_panels.keys():
+            panel = self.plot_panels[event.group_id]
+        else:
+            return
+        panel.on_plot_qrange(event)
+            
     def _on_show_panel(self, event):
         """show plug-in panel"""