Changeset 45802d4 in sasview

Timestamp:

Apr 6, 2010 11:51:54 AM (15 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:

f75ea4a

Parents:

4e74e13

Message:

add comment in panel

File:

• invariantview/perspectives/invariant/invariant_details.py (modified) (5 diffs)

invariantview/perspectives/invariant/invariant_details.py

@@ -2 +2 @@
 import wx
 import sys
-import colorsys
+
 import numpy
 from sans.guiframe.utils import format_number, check_float
@@ -30 +30 @@
     
 class InvariantContainer(wx.Object):
+    """
+        This class stores some values resulting resulting from invariant
+        calculations. Given the value of total invariant, this class can also 
+        determine the percentage of invariants resulting from extrapolation.
+    """
     def __init__(self):
         #invariant at low range
@@ -101 +106 @@
         This panel describes proportion of invariants 
     """
-    def __init__(self, parent=None, id=-1, qstar_container=None, title="",
-                 size=(PANEL_WIDTH, PANEL_HEIGHT)):
-        wx.Dialog.__init__(self, parent, id=id, title=title, size=size)
-        
-        #Font size 
-        self.SetWindowVariant(variant=FONT_VARIANT)
-        self.parent = parent
-        #self.qstar_container
-        self.qstar_container = qstar_container
-        #warning message
-        self.warning_msg = self.qstar_container.warning_msg
-   
-        #Define scale of each bar
-        self.low_inv_percent = self.qstar_container.qstar_low_percent
-        self.low_scale = self.get_scale(percentage=self.low_inv_percent,
-                                         scale_name="Extrapolated at Low Q")
-        self.inv_percent = self.qstar_container.qstar_percent
-        self.inv_scale = self.get_scale(percentage=self.inv_percent, 
-                                            scale_name="Inv in Q range")
-        self.high_inv_percent = self.qstar_container.qstar_high_percent
-        self.high_scale = self.get_scale(percentage=self.high_inv_percent,
-                                         scale_name="Extrapolated at High Q")
-        
-        #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)
-        #change color of high and low bar when necessary
-        self.set_color_bar()
-        #draw the panel itself
-        self._do_layout()
-        self.set_values()
+    def __init__(self, parent=None, id=-1, qstar_container=None, 
+                                    title="Invariant Details",
+                                    size=(PANEL_WIDTH, PANEL_HEIGHT)):
+        try:
+            wx.Dialog.__init__(self, parent=parent, id=id,title=title,size=size)
+            
+            #Font size 
+            self.SetWindowVariant(variant=FONT_VARIANT)
+            self.parent = parent
+            #self.qstar_container
+            self.qstar_container = qstar_container
+            #warning message
+            self.warning_msg = self.qstar_container.warning_msg
+       
+            #Define scale of each bar
+            self.low_inv_percent = self.qstar_container.qstar_low_percent
+            self.low_scale = self.get_scale(percentage=self.low_inv_percent,
+                                             scale_name="Extrapolated at Low Q")
+            self.inv_percent = self.qstar_container.qstar_percent
+            self.inv_scale = self.get_scale(percentage=self.inv_percent, 
+                                                scale_name="Inv in Q range")
+            self.high_inv_percent = self.qstar_container.qstar_high_percent
+            self.high_scale = self.get_scale(percentage=self.high_inv_percent,
+                                             scale_name="Extrapolated at High Q")
+            
+            #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)
+            #change color of high and low bar when necessary
+            self.set_color_bar()
+            #draw the panel itself
+            self._do_layout()
+            self.set_values()
+        except:
+            print "error", sys.exc_value()
    
     def _define_structure(self):
@@ -403 +412 @@
         gc.DrawPath(path)
         gc.PopState()
-        
-class InvariantDetailsWindow(wx.Dialog):
-    def __init__(self, parent, qstar_container=None, *args, **kwds):
-        kwds["size"]= (PANEL_WIDTH +100, 450)
-        wx.Dialog.__init__(self, parent, *args, **kwds)
-        self.container = qstar_container
-        if self.container is None:
-            self.container = InvariantContainer()
-            self.container.qstar_total = 1.0
-            self.container.qstar = 0.75
-            self.container.qstar_low = 0.60
-            self.container.qstar_high = 0.0049
-        self.panel = InvariantDetailsPanel(parent=self, 
-                                           qstar_container=self.container)
-        self.Centre()
-        self.ShowModal()
-        self.Destroy()
-
-class InvariantDetailsTest(wx.Frame):
-    def __init__(self, parent, qstar_container=None, *args, **kwds):
-        kwds["size"]= (PANEL_WIDTH , PANEL_HEIGHT)
-        wx.Frame.__init__(self, parent, *args, **kwds)
-        self.container = qstar_container
-        if self.container is None:
-            self.container = InvariantContainer()
-            self.container.qstar_total = 1.0
-            self.container.qstar = 0.75
-            self.container.qstar_low = 0.60
-            self.container.qstar_high = 0.0049
-        
-        self.panel = InvariantDetailsPanel(parent=self, 
-                                           qstar_container=self.container)
-        self.panel.ShowModal()
-        self.panel.Destroy()
-        self.Show()
-   
+
+
 if __name__ =="__main__":
     app  = wx.App()
-
     container = InvariantContainer()
     container.qstar_total = 100.0
@@ -448 +422 @@
     container.qstar_high = 100.0
     container.compute_percentage()
-   
-    window = InvariantDetailsTest(parent=None, id=-1,qstar_container=container,
-                                    title="Invariant Details")
-    window.Show()
+    dlg = InvariantDetailsPanel(qstar_container=container)
+    dlg.ShowModal()
     app.MainLoop()