Changeset 5b03122 in sasview


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • invariantview/perspectives/invariant/invariant_state.py

    r6ca38f3 r5b03122  
    55from xml.dom.minidom import parse 
    66from lxml import etree 
    7 """ 
    8 try: 
    9     import PIL.Image as Image 
    10     import PIL.PngImagePlugin as PngImagePlugin 
    11     Image._initialized = 2 
    12 except: 
    13     try: 
    14         import Image  
    15         import PngImagePlugin 
    16         Image._initialized = 2 
    17     except: 
    18         Image = None     
    19 """ 
    20  
    21  
    227from DataLoader.readers.cansas_reader import Reader as CansasReader 
    238from DataLoader.readers.cansas_reader import get_content 
     
    568553        """ 
    569554        # some imports 
    570         #import cStringIO 
    571         import matplotlib,wx 
     555        import wx 
    572556        import matplotlib.pyplot as plt 
    573557        from matplotlib.backends.backend_agg import FigureCanvasAgg 
  • invariantview/perspectives/invariant/report_dialog.py

    r178bfea r5b03122  
    6464         
    6565        # buttons 
    66         id = wx.NewId() 
    67         button_save = wx.Button(self, id, "Save" ) 
    68         button_save.SetToolTipString("Save this report.") 
    69         button_save.Bind(wx.EVT_BUTTON, self.onSave, id = button_save.GetId())  
    70         hbox.Add(button_save) 
     66        id = wx.ID_OK 
     67        button_close = wx.Button(self, id, "Close") 
     68        button_close.SetToolTipString("Close this report window.")  
     69        #hbox.Add((5,10), 1 , wx.EXPAND|wx.ADJUST_MINSIZE,0) 
     70        hbox.Add(button_close) 
     71        button_close.SetFocus() 
    7172 
    7273        id = wx.NewId() 
     
    8283        hbox.Add(button_print) 
    8384         
    84         id = wx.ID_OK 
    85         button_close = wx.Button(self, id, "Close") 
    86         button_close.SetToolTipString("Close this report window.")  
    87         hbox.Add((5,10), 1 , wx.EXPAND|wx.ADJUST_MINSIZE,0) 
    88         hbox.Add(button_close) 
    89         button_close.SetFocus() 
    90          
     85        id = wx.NewId() 
     86        button_save = wx.Button(self, id, "Save" ) 
     87        button_save.SetToolTipString("Save this report.") 
     88        button_save.Bind(wx.EVT_BUTTON, self.onSave, id = button_save.GetId())  
     89        hbox.Add(button_save)      
    9190         
    9291        # panel for report page 
     
    9493        vbox= wx.BoxSizer(wx.VERTICAL) 
    9594        # html window 
    96         self.hwindow = html.HtmlWindow(panel, -1,style=wx.BORDER,size=(700,500)) 
     95        self.hwindow = html.HtmlWindow(panel,style=wx.BORDER,size=(700,500)) 
    9796        # set the html page with the report string 
    9897        self.hwindow.SetPage(self.report_html) 
     98         
    9999        # add panels to boxsizers 
    100         #hbox.Add(bpanel) 
    101         vbox.Add(hbox,30, wx.EXPAND) 
    102         vbox.Add(panel,500, wx.EXPAND) 
     100        vbox.Add(hbox,30) 
     101        vbox.Add(panel,500, wx.EXPAND|wx.ALL) 
    103102 
    104103        self.SetSizerAndFit(vbox) 
Note: See TracChangeset for help on using the changeset viewer.