Ignore:
Timestamp:
Mar 20, 2019 8:06:22 AM (5 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
ticket-1249
Children:
9305b46
Parents:
09d7021
Message:

py3/wx4 compatibility changes for gui. Refs #1249

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/calculator/image_viewer.py

    r5251ec6 r34f23c8  
    6262                # Any other formats (tiff, jpeg, etc) are passed 
    6363                # to PIL which seems to have a problem in version 
    64                 # 1.1.7 that causes a close error which shows up in  
     64                # 1.1.7 that causes a close error which shows up in 
    6565                # the log file.  This does not seem to have any adverse 
    6666                # effects.  PDB   --- September 17, 2017. 
     
    383383                print(err_msg) 
    384384 
    385         self.OnClose(event) 
     385        self.EndModal(wx.ID_OK) 
    386386 
    387387    def convert_image(self, rgb, xmin, xmax, ymin, ymax, zscale): 
     
    417417        output.ymin = ymin 
    418418        output.ymax = ymax 
    419         output.xaxis('\\rm{Q_{x}}', '\AA^{-1}') 
    420         output.yaxis('\\rm{Q_{y}}', '\AA^{-1}') 
     419        output.xaxis(r'\rm{Q_{x}}', r'\AA^{-1}') 
     420        output.yaxis(r'\rm{Q_{y}}', r'\AA^{-1}') 
    421421        # Store loading process information 
    422422        output.meta_data['loader'] = self.title.split('.')[-1] + "Reader" 
     
    451451        # clear event 
    452452        event.Skip() 
    453         self.Destroy() 
     453        self.EndModal(wx.ID_CANCEL) 
     454        #self.Destroy() 
    454455 
    455456if __name__ == "__main__": 
Note: See TracChangeset for help on using the changeset viewer.