Changeset a17ffdf in sasview

Timestamp:

Jul 1, 2008 2:55:27 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

f168d02

Parents:

d0802c3

Message:

Fixed color management

Location:

guitools

Files:

• PlotPanel.py (modified) (2 diffs)
• plottable_interactor.py (modified) (2 diffs)
• plottables.py (modified) (2 diffs)

guitools/PlotPanel.py

@@ -572 +572 @@
         from plottable_interactor import PointInteractor
         p = PointInteractor(self, self.subplot, zorder=3, id=name)
-        p.points(x, y, dx, dy, color, symbol, label)
+        p.points(x, y, dx=dx, dy=dy, color=color, symbol=symbol, label=label)
         
         self.subplot.set_yscale(self.yscale)
@@ -584 +584 @@
         from plottable_interactor import PointInteractor
         p = PointInteractor(self, self.subplot, zorder=4, id=name)
-        p.curve(x, y, dy, color, symbol, label)
+        p.curve(x, y, dy=dy, color=color, symbol=symbol, label=label)
         
         self.subplot.set_yscale(self.yscale)

guitools/plottable_interactor.py

@@ -8 +8 @@
         self.zorder = zorder
         self.id = id
+        self.color=color
         self.colorlist = ['b','g','r','c','m','y']
         self.symbollist = ['o','x','^','v','<','>','+','s','d','D','h','H','p']
@@ -141 +142 @@
             Update
         """
-        print "update"
+        pass
      
      

guitools/plottables.py

@@ -43 +43 @@
 import numpy
 import math
+import sys
 
 if 'any' not in dir(__builtins__):
@@ -198 +199 @@
         if plottable in self.plottables:
             del self.plottables[plottable]
-        if self.color > 0:
-            self.color =  self.color -1
-        else:
-            self.color =0 
+            if self.color > 0:
+                self.color =  self.color -1
+            else:
+                self.color =0 
             
     def reset_scale(self):