Changeset b99a4552 in sasview

Timestamp:

Jun 3, 2015 12:45:31 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

9d5427f

Parents:

e1442d4

Message:

avoid moving qrange bars beyond the edge of the data. Fixes #417

File:

• src/sas/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (3 diffs)

src/sas/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -217 +217 @@
             return
         if event.id in self.plots.keys():
+            ctrl = event.ctrl
+            self.cursor_id = event.id
             # Set line position and color
             colors = ['red', 'purple']
-            self.cursor_id = event.id
-            ctrl = event.ctrl
+            x_data = self.plots[self.cursor_id].x
+            values = [max(x_data.min(), float(ctrl[0].GetValue())),
+                      min(x_data.max(), float(ctrl[1].GetValue()))]
             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)
+                for c, v in zip(colors, values):
+                    h = self.subplot.axvline(x=v, color=c, lw=2.5, alpha=0.7)
+                    h.set_rasterized(True)
+                    self.ly.append(h)
             try:
                 # Display x,y in the status bar if possible
@@ -239 +242 @@
                 try:
                     is_moved = False
-                    for idx in range(len(self.ly)):
-                        val = float(ctrl[idx].GetValue())
+                    for h, v in zip(self.ly, values):
                         # check if vline moved
-                        if self.ly[idx].get_xdata() != val:
-                            self.ly[idx].set_xdata(val)
+                        if h.get_xdata() != v:
+                            h.set_xdata(v)
                             is_moved = True
                     if is_moved:
@@ -252 +254 @@
                 return
             self.q_ctrl = ctrl
-            pos_x_min = float(self.q_ctrl[0].GetValue())
-            pos_x_max = float(self.q_ctrl[1].GetValue())
-            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])
+            for h, c, v in zip(self.ly, colors, values):
+                h.set_color(c)
+                h.set_xdata(v)
             self.canvas.draw()
         else: