Changeset 6c4130a in sasview

Timestamp:

Jul 7, 2012 4:53:54 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:

e4cd34c

Parents:

88a65e2

Message:

Added more curve styles and fixed minor error on deleting a data from plot

Files:

• plottools/src/danse/common/plottools/canvas.py (modified) (1 diff)
• plottools/src/danse/common/plottools/plottable_interactor.py (modified) (7 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (4 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/appearanceDialog.py (modified) (1 diff)

plottools/src/danse/common/plottools/canvas.py

@@ -152 +152 @@
         """
         self.panel.subplot.grid(self.panel.grid_on)
-        if self.panel.legend_pos_loc:
+        if self.panel.legend != None and self.panel.legend_pos_loc:
             self.panel.legend._loc = self.panel.legend_pos_loc
         self.idletimer.Restart(5, *args, **kwargs)  # Delay by 5 ms

plottools/src/danse/common/plottools/plottable_interactor.py

@@ -4 +4 @@
 import plottables
 from BaseInteractor import _BaseInteractor
-
 
 class PointInteractor(_BaseInteractor):
@@ -18 +17 @@
         self.colorlist = ['b', 'g', 'r', 'c', 'm', 'y', 'k']
         self.symbollist = ['o', 'x', '^', 'v', '<', '>',
-                           '+', 's', 'd', 'D', 'h', 'H', 'p', '-']
+                           '+', 's', 'd', 'D', 'h', 'H', 'p', '-', '--',
+                           'vline', 'step']
         self.markersize = None
         self.marker = None
@@ -40 +40 @@
         """
         #Draw curve
-        if self._symbol(symbol) == '-':
+        if self._symbol(symbol) == '-' or self._symbol(symbol) == '--':
             l_width = markersize * 0.4
-            return self.curve(x=x, y=y, color=color, label=label, width=l_width)
+            return self.curve(x=x, y=y, color=color, symbol=symbol, 
+                              label=label, width=l_width)
             #return
+        if self._symbol(symbol) == 'vline':
+            l_width = markersize * 0.4
+            return self.vline(x=x, y=y, color=color, 
+                                label=label, width=l_width)
+        if self._symbol(symbol) == 'step':
+            l_width = markersize * 0.4
+            return self.step(x=x, y=y, color=color, 
+                                label=label, width=l_width)
         if not self.marker == None:
             self.base.connect.clear([self.marker])
@@ -54 +63 @@
         if dy != None and type(dy) == type(()):
             dy = nx.vstack((y-dy[0], dy[1]-y)).transpose()
-        
+        zorder = self.zorder
         if dx == None and dy == None:
-            zorder = 1
+            #zorder = 1
             self.marker = self.axes.plot(x, y, color=self.color,
                                          marker=self._symbol(symbol),
@@ -65 +74 @@
             
             if hide_error:
-                zorder = 1
+                #zorder = 1
                 self.marker = self.axes.plot(x, y, color=self.color,
                                              marker=self._symbol(symbol),
@@ -72 +81 @@
                                              zorder=zorder)[0]
             else:
-                zorder = 2
+                #zorder = 2
                 self.marker = self.axes.errorbar(x, y, yerr=dy,
                                                  xerr=None,
@@ -97 +106 @@
         self.color = self._color(color)
         self.marker = self.axes.plot(x, y, color=self.color, lw=width,
-                                     marker='', linestyle='-', label=label)[0]
-            
-        self.connect_markers([self.marker])
-        self.update()
-        
+                                     marker='', linestyle=self._symbol(symbol),
+                                     label=label, zorder=self.zorder)[0]
+            
+        self.connect_markers([self.marker])
+        self.update()
+
+        
+    def vline(self, x, y, dy=None, color=0, symbol=0, label=None, width=2.0):
+        """
+        """
+        if not self.marker == None:
+            self.base.connect.clear([self.marker])
+        self.color = self._color(color)
+        if min(y) < 0:
+            y_min = 0.0
+        else:
+            y_min = min(y)*9/10
+        self.marker = self.axes.vlines(x=x, ymin=y_min, ymax=y, 
+                                      color=self.color, 
+                                      linestyle='-', label=label,
+                                      lw=width, zorder=self.zorder)    
+        self.connect_markers([self.marker])
+        self.update()
+
+    def step(self, x, y, dy=None, color=0, symbol=0, label=None, width=2.0):
+        """
+        """
+        if not self.marker == None:
+            self.base.connect.clear([self.marker])
+        self.color = self._color(color)
+        if self.markersize != None:
+            markersize = self.markersize
+            
+        self.marker = self.axes.step(x, y, color=self.color,
+                                         marker='',
+                                         linestyle='-', label=label,
+                                         lw=width, zorder=self.zorder)[0]
+        self.connect_markers([self.marker])
+        self.update()
+               
     def connect_markers(self, markers):
         """

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

@@ -139 +139 @@
         i += 1
         _labels['Line'] = i
+        i += 1
+        _labels['Dash'] = i
+        i += 1
+        _labels['Vline'] = i
+        i += 1
+        _labels['Step'] = i
         return _labels
     
@@ -268 +274 @@
         if data.__class__.__name__ == 'Data2D':
             return
-        if data.id in self.plots.keys():
+        plot_keys = self.plots.keys()
+        if data.id in plot_keys:
             #Recover panel prop.s
             xlo, xhi = self.subplot.get_xlim()
@@ -279 +286 @@
                 data.symbol = old_data.symbol
                 data.markersize = old_data.markersize
+                data.zorder = len(plot_keys)
             # Replace data
             self.graph.replace(data)
@@ -298 +306 @@
             self.plots[data.id] = data
             self.graph.add(self.plots[data.id]) 
+            data.zorder = len(plot_keys)
             ## Set the view scale for all plots
             try:

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

@@ -217 +217 @@
         i += 1
         _labels['Line'] = i
+        i += 1
+        _labels['Dash'] = i
+        i += 1
+        _labels['Vline'] = i
+        i += 1
+        _labels['Step'] = i
         return _labels