Changeset 9cec2dd in sasview for invariantview/src/sans/perspectives/invariant/invariant_details.py

Timestamp:

Oct 21, 2011 2:17:13 PM (13 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:

3ecaa2b

Parents:

054f004

Message:

working on layout mac

File:

• invariantview/src/sans/perspectives/invariant/invariant_details.py (modified) (4 diffs)

invariantview/src/sans/perspectives/invariant/invariant_details.py

@@ -28 +28 @@
     FONT_VARIANT = 1
     
+ERROR_COLOR = wx.Colour(255,  0, 0, 128)
+EXTRAPOLATION_COLOR = wx.Colour(169,  169, 168, 128)
+INVARIANT_COLOR =  wx.Colour(67,  208,  128, 128)    
+  
   
 class InvariantContainer(wx.Object):
@@ -197 +201 @@
        
         #Default color the extrapolation bar is grey
-        self.extrapolation_color_low = wx.Colour(169,  169, 168, 128)
-        self.extrapolation_color_high = wx.Colour(169,  169, 168, 128)
-        self.invariant_color = wx.Colour(67,  208,  128, 128)
+        self.extrapolation_color_low = EXTRAPOLATION_COLOR
+        self.extrapolation_color_high = EXTRAPOLATION_COLOR
+        self.invariant_color = INVARIANT_COLOR
         #change color of high and low bar when necessary
         self.set_color_bar()
@@ -420 +424 @@
         Change the color for low and high bar when necessary
         """
-        ERROR_COLOR = wx.Colour(255,  0, 0, 128)
+        self.extrapolation_color_low = EXTRAPOLATION_COLOR
+        self.extrapolation_color_high = EXTRAPOLATION_COLOR
+        self.invariant_color = INVARIANT_COLOR
         #warning to the user when the extrapolated invariant is greater than %5
         if self.low_scale >= 0.05 or self.low_scale > 1 or self.low_scale < 0:
@@ -426 +432 @@
         if self.high_scale >= 0.05 or self.high_scale > 1 or self.high_scale < 0:
             self.extrapolation_color_high = ERROR_COLOR 
-        if self.inv_scale >= 0.05 or self.inv_scale > 1 or self.inv_scale < 0:
+        if self.inv_scale > 1 or self.inv_scale < 0:
             self.invariant_color = ERROR_COLOR  
-            
+    
     def on_close(self, event):
         """