Changeset 5789654 in sasview for guitools/plottables.py

Timestamp:

Apr 7, 2008 6:31:09 PM (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:

8742751

Parents:

fcaada5

Message:

modied fitdialog property dialog added fittings , modified plottables

File:

• guitools/plottables.py (modified) (9 diffs)

guitools/plottables.py

@@ -174 +174 @@
         if plottable in self.plottables:
             del self.plottables[plottable]
+        if self.color > 0:
+            self.color =  self.color -1
+        else:
+            self.color =0 
 
     def reset(self):
@@ -312 +316 @@
         self._yaxis = name
         self._yunit = units
+    def get_xaxis(self):
+        return self._xaxis, self._xunit
+    def get_yaxis(self):
+        return self._yaxis, self._yunit
 
     @classmethod
@@ -336 +344 @@
     def __init__(self):
         self.view = View()
+        self._xaxis = ""
+        self._xunit = ""
+        self._yaxis = ""
+        self._yunit = "" 
+        
     def set_View(self,x,y):
         """ Load View  """
@@ -345 +358 @@
         """ Reload view with new value to plot"""
         self.view = self.View(self.x, self.y, self.dx, self.dy)
-        print "the value of view x",self.view.x
-        print "the value of view y",self.view.y
+       
        
     
@@ -379 +391 @@
         self.view.transform_y(func, errfunc, self.y, self.dy)
         
-    def returnXvalueOfView(self):
+    def returnValuesOfView(self):
         return self.view.returnXview()
         
@@ -449 +461 @@
                      
         def returnXview(self):
-            return self.x
+            return self.x,self.y,self.dx,self.dy
+           
      
 class Data1D(Plottable):
@@ -468 +481 @@
         self.dx = dx
         self.dy = dy
-        
+        self.xaxis( 'q', 'A')
+        self.yaxis( 'intensity', 'cm')
         self.view = self.View(self.x, self.y, self.dx, self.dy)
         
@@ -497 +511 @@
         The title is the name that will show up on the legend.
         """
+        self.name= "theo"
         self.x = x
         self.y = y
         self.dy = dy
-        #Alina:added
+       
         self.view = self.View(self.x, self.y, None, self.dy)
     def render(self,plot,**kw):
@@ -508 +523 @@
     def changed(self):
         return False
-
+    @classmethod
+    def labels(cls, collection):
+        """Build a label mostly unique within a collection"""
+        map = {}
+        for item in collection:
+            #map[item] = label(item, collection)
+            map[item] = r"$\rm{%s}$" % item.name
+        return map
+