Changeset 8f56250 in sasview for src/sans/guiframe

Timestamp:

Mar 31, 2014 7:20:26 AM (11 years ago)

Author:

Jeff Krzywon <jeffery.krzywon@…>

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:

663e988

Parents:

8599f56

Message:

I modified boxSlicer to fix the issue outlined in Trac ticket #210. More details are available in the ticket.

File:

• src/sans/guiframe/local_perspectives/plotting/boxSlicer.py (modified) (5 diffs)

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

@@ -27 +27 @@
         ##connecting artist
         self.connect = self.base.connect
+        ## which direction is the preferred interaction direction
+        self.direction = None
         ## determine x y  values
         self.x = 0.5 * min(math.fabs(self.base.data2D.xmax),
@@ -142 +144 @@
         
         """
+        if self.direction == None:
+            self.direction = direction
+            
         x_min = -1 * math.fabs(self.vertical_lines.x)
         x_max = math.fabs(self.vertical_lines.x)
@@ -154 +159 @@
                 raise ValueError, msg
             self.averager = new_slab
-        if direction == "X":
+        if self.direction == "X":
             if self.fold:
                 x_low = 0
@@ -160 +165 @@
                 x_low = math.fabs(x_min)
             bin_width = (x_max + x_low)/self.nbins
-        else:
+        elif self.direction == "Y":
             if self.fold:
                 y_low = 0
@@ -166 +171 @@
                 y_low = math.fabs(y_min)
             bin_width = (y_max + y_low)/self.nbins
+        else:
+            msg = "post data:no Box Average direction was supplied"
+            raise ValueError, msg
         ## Average data2D given Qx or Qy
         box = self.averager(x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max,