Changeset ee69839 in sasview

Timestamp:

Feb 4, 2009 11:22:04 AM (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:

a2b6c05f

Parents:

7ce6c72

Message:

small bug fixed for box sum

File:

• guiframe/local_perspectives/plotting/boxSum.py (modified) (13 diffs)

guiframe/local_perspectives/plotting/boxSum.py

@@ -27 +27 @@
         self.markers = []
         self.axes = axes
-        self.qmax = self.base.data2D.xmax
+        self.qmax = min(self.base.data2D.xmax, self.base.data2D.xmin)
         self.connect = self.base.connect
         self.xmin= -1* 0.5*min(math.fabs(self.base.data2D.xmax),math.fabs( self.base.data2D.xmin))
@@ -150 +150 @@
         data = self.base.data2D
         from DataLoader.manipulations import  Boxavg
-        radius = math.sqrt(math.pow(self.qmax,2)+math.pow(self.qmax,2))
-        x_min= self.vertical_lines.x2 
-        x_max= self.vertical_lines.x1 
+        #radius = math.sqrt(math.pow(self.qmax,2)+math.pow(self.qmax,2))
+        x_min= self.horizontal_lines.x2 
+        x_max= self.horizontal_lines.x1 
         y_min= self.vertical_lines.y2
         y_max= self.vertical_lines.y1
         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 "count, error",self.count, self.error
+        #print "count, error",self.count, self.error
                           
     def moveend(self, ev):
@@ -163 +163 @@
         # Post paramters
         self._post_data()
-        """
-        event = SlicerParameters.SlicerParameterEvent()
-        event.type = self.__class__.__name__
-        print "event type boxsum: ", event.type
-        event.params = self.get_params()
-        wx.PostEvent(self.base, event)
-        """
+       
         self.type= self.__class__.__name__
         params= self.get_params()
@@ -195 +189 @@
         params = {}
        
-        params["x"] = math.fabs(self.horizontal_lines.half_width)
-        params["y"] = math.fabs(self.vertical_lines.half_height) 
+        params["Width"] = math.fabs(self.vertical_lines.half_width)*2
+        params["Height"] = math.fabs(self.horizontal_lines.half_height)*2 
         
         params["center_x"] = self.center.x
@@ -218 +212 @@
     def set_params(self, params):
         
-        x_max = math.fabs(params["x"] )
-        y_max = math.fabs(params["y"] )
+        x_max = math.fabs(params["Width"] )/2
+        y_max = math.fabs(params["Height"] )/2
         
         self.center_x=params["center_x"] 
         self.center_y=params["center_y"]
-        
+        """
         self.center.update(center_x=self.center_x,center_y=self.center_y)
        
@@ -235 +229 @@
         self._post_data()
         
-        
+        """
         
     def freeze_axes(self):
@@ -410 +404 @@
         self.save_half_height= math.fabs(y)
         
-        self.half_width= math.fabs(x)
-        self.save_half_width=math.fabs(x)
+        self.half_width= math.fabs(self.x1- self.x2)/2
+        self.save_half_width=math.fabs(self.x1- self.x2)/2
         
         try:
@@ -470 +464 @@
         Draw the new roughness on the graph.
         """
+        print "self.half_height",self.half_height,self.half_width
         if width!=None:
             self.half_width= width
@@ -477 +472 @@
             self.center_x= center.x
             self.center_y= center.y
-            
+            print "vertical width",self.half_width ,self.center_x
             self.x1 = self.half_width + self.center_x
             self.x2= -self.half_width + self.center_x
@@ -516 +511 @@
         
         self.save_half_height= self.half_height
-        self.save_half_width =  self.half_width
+        #self.save_half_width = math.fabs(self.x1-self.x2)/2
+        self.save_half_width = self.half_width
         self.base.freeze_axes()
 
@@ -535 +531 @@
         
         self.half_height= self.save_half_height
+        #self.half_width= math.fabs(self.x1-self.x2)/2
         self.half_width= self.save_half_width
        
@@ -545 +542 @@
         self.x2= self.center_x - delta
         
-        self.half_width= math.fabs(self.x1)-self.center_x
+        self.half_width= math.fabs(self.x1-self.x2)/2
+        print "Move vert: vertical width",self.half_width ,self.center_x
         self.has_move=True
         self.base.base.update()
@@ -660 +658 @@
         Draw the new roughness on the graph.
         """
+        print "self.half_width",self.half_width
         if width!=None:
             self.half_width= width