Changeset 8aac6e1 in sasview


Ignore:
Timestamp:
Feb 10, 2009 7:22:26 AM (16 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:
68fc3e4
Parents:
9dd69ec
Message:

Maximum data range displays only for 1D data fit. For 2D, it is not proper.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansview/perspectives/fitting/fitpage1D.py

    r264df67 r8aac6e1  
    109109        iy = 1 
    110110        #set maximum range for x in linear scale 
    111         self.text4_3 = wx.StaticText(self, -1, 'Maximum Data Range(Linear)', style=wx.ALIGN_LEFT) 
    112         self.sizer2.Add(self.text4_3,(iy,ix),(1,1),\ 
     111        if not hasattr(self.data,"data"): #Display only for 1D data fit 
     112            self.text4_3 = wx.StaticText(self, -1, 'Maximum Data Range(Linear)', style=wx.ALIGN_LEFT) 
     113            self.sizer2.Add(self.text4_3,(iy,ix),(1,1),\ 
    113114                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 
    114         ix += 2 
    115         self.sizer2.Add(wx.StaticText(self, -1, 'Min :'),(iy, ix),(1,1),\ 
     115            ix += 2 
     116            self.sizer2.Add(wx.StaticText(self, -1, 'Min :'),(iy, ix),(1,1),\ 
    116117                            wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
    117         ix += 1 
    118         self.sizer2.Add(self.data_min,(iy, ix),(1,1),\ 
     118            ix += 1 
     119            self.sizer2.Add(self.data_min,(iy, ix),(1,1),\ 
    119120                            wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
    120         ix += 1 
    121         self.sizer2.Add(wx.StaticText(self, -1, 'Max : '),(iy, ix),(1,1),\ 
     121            ix += 1 
     122            self.sizer2.Add(wx.StaticText(self, -1, 'Max : '),(iy, ix),(1,1),\ 
    122123                            wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
    123         ix += 1 
    124         self.sizer2.Add(self.data_max,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
     124            ix += 1 
     125            self.sizer2.Add(self.data_max,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
    125126         
    126127        #----sizer 3 draw-------------------------------- 
     
    238239        ix = 0 
    239240        iy += 1 
    240         self.sizer9.Add(wx.StaticText(self, -1, 'Qx range'),(iy, ix),(1,1),\ 
     241        self.sizer9.Add(wx.StaticText(self, -1, 'Q range'),(iy, ix),(1,1),\ 
    241242                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 
    242243        ix += 1 
Note: See TracChangeset for help on using the changeset viewer.