Changeset d3fac18 in sasview

Timestamp:

Mar 24, 2010 5:35:22 PM (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:

a0a4486

Parents:

518d35d

Message:

change invariant panel to dialog

Location:

invariantview/perspectives/invariant

Files:

• invariant_details.py (modified) (5 diffs)
• invariant_panel.py (modified) (2 diffs)

invariantview/perspectives/invariant/invariant_details.py

@@ -27 +27 @@
     
     
-class InvariantDetailsPanel(wx.ScrolledWindow):
+class InvariantDetailsPanel(wx.Dialog):
     """
         This panel describes proportion of invariants 
     """
-    def __init__(self, parent, qstar_container=None):
-        wx.ScrolledWindow.__init__(self, parent, 
-                                    style=wx.FULL_REPAINT_ON_RESIZE)
+    def __init__(self, parent=None, id=-1, qstar_container=None, title="",
+                 size=(PANEL_WIDTH +100, 450)):
+        wx.Dialog.__init__(self, parent, id=id, title=title, size=size)
        
         #Font size 
@@ -200 +200 @@
                                   (self.button_sizer, 0, wx.ALL, 10)])
         self.SetSizer(self.main_sizer)
-        self.SetScrollbars(20,20,25,65)
-        self.SetAutoLayout(True)
+       
         
     def set_values(self):
@@ -275 +274 @@
         """
         self.Close()
-        self.parent.Close()
-        
+     
     def on_paint(self, event):
         """
@@ -343 +341 @@
         gc.PopState()
         
-class InvariantDetailsWindow(wx.Frame):
+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:
+            from invariant_panel import InvariantContainer
+            self.container = InvariantContainer()
+            self.container.qstar_total = 1
+            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 +100, 450)
@@ -355 +371 @@
             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()
-    window = InvariantDetailsWindow(parent=None, title="Source Editor")
+    from invariant_panel import InvariantContainer
+    container = InvariantContainer()
+    container.qstar_total = 1
+    container.qstar = 0.75
+    container.qstar_low = 0.60
+    container.qstar_high = 0.0049
+    window = InvariantDetailsTest(parent=None, id=-1,qstar_container=container,
+                                    title="Source Editor")
+    window.Show()
     app.MainLoop()

invariantview/perspectives/invariant/invariant_panel.py

@@ -10 +10 @@
 from sans.guiframe.utils import format_number, check_float
 from sans.guicomm.events import NewPlotEvent, StatusEvent
-from invariant_details import InvariantDetailsWindow
+from invariant_details import InvariantDetailsPanel
 from invariant_widgets import OutputTextCtrl, InvTextCtrl
 # The minimum q-value to be used when extrapolating
@@ -329 +329 @@
             open another panel for more details on invariant calculation
         """
-        panel = InvariantDetailsWindow(parent=self.parent,
-                                       qstar_container=self.inv_container)
+        #panel = InvariantDetailsWindow(parent=self.parent,
+        #                               qstar_container=self.inv_container)
+        panel = InvariantDetailsPanel(parent=self, 
+                                           qstar_container=self.inv_container)
+        panel.ShowModal()
+        panel.Destroy()
         
     def compute_invariant(self, event):