Changeset 5b03122 in sasview for invariantview

Timestamp:

Aug 3, 2010 10:22:17 AM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

0d21ac1

Parents:

6ca38f3

Message:

removed commented (unused) imports

Location:

invariantview/perspectives/invariant

Files:

• invariant_state.py (modified) (2 diffs)
• report_dialog.py (modified) (3 diffs)

invariantview/perspectives/invariant/invariant_state.py

@@ -5 +5 @@
 from xml.dom.minidom import parse
 from lxml import etree
-"""
-try:
-    import PIL.Image as Image
-    import PIL.PngImagePlugin as PngImagePlugin
-    Image._initialized = 2
-except:
-    try:
-        import Image 
-        import PngImagePlugin
-        Image._initialized = 2
-    except:
-        Image = None    
-"""
-
-
 from DataLoader.readers.cansas_reader import Reader as CansasReader
 from DataLoader.readers.cansas_reader import get_content
@@ -568 +553 @@
         """
         # some imports
-        #import cStringIO
-        import matplotlib,wx
+        import wx
         import matplotlib.pyplot as plt
         from matplotlib.backends.backend_agg import FigureCanvasAgg

invariantview/perspectives/invariant/report_dialog.py

@@ -64 +64 @@
         
         # buttons
-        id = wx.NewId()
-        button_save = wx.Button(self, id, "Save" )
-        button_save.SetToolTipString("Save this report.")
-        button_save.Bind(wx.EVT_BUTTON, self.onSave, id = button_save.GetId()) 
-        hbox.Add(button_save)
+        id = wx.ID_OK
+        button_close = wx.Button(self, id, "Close")
+        button_close.SetToolTipString("Close this report window.") 
+        #hbox.Add((5,10), 1 , wx.EXPAND|wx.ADJUST_MINSIZE,0)
+        hbox.Add(button_close)
+        button_close.SetFocus()
 
         id = wx.NewId()
@@ -82 +83 @@
         hbox.Add(button_print)
         
-        id = wx.ID_OK
-        button_close = wx.Button(self, id, "Close")
-        button_close.SetToolTipString("Close this report window.") 
-        hbox.Add((5,10), 1 , wx.EXPAND|wx.ADJUST_MINSIZE,0)
-        hbox.Add(button_close)
-        button_close.SetFocus()
-        
+        id = wx.NewId()
+        button_save = wx.Button(self, id, "Save" )
+        button_save.SetToolTipString("Save this report.")
+        button_save.Bind(wx.EVT_BUTTON, self.onSave, id = button_save.GetId()) 
+        hbox.Add(button_save)     
         
         # panel for report page
@@ -94 +93 @@
         vbox= wx.BoxSizer(wx.VERTICAL)
         # html window
-        self.hwindow = html.HtmlWindow(panel, -1,style=wx.BORDER,size=(700,500))
+        self.hwindow = html.HtmlWindow(panel,style=wx.BORDER,size=(700,500))
         # set the html page with the report string
         self.hwindow.SetPage(self.report_html)
+        
         # add panels to boxsizers
-        #hbox.Add(bpanel)
-        vbox.Add(hbox,30, wx.EXPAND)
-        vbox.Add(panel,500, wx.EXPAND)
+        vbox.Add(hbox,30)
+        vbox.Add(panel,500, wx.EXPAND|wx.ALL)
 
         self.SetSizerAndFit(vbox)