Changeset 5878a9ea in sasview


Ignore:
Timestamp:
Jul 12, 2016 8:34:57 AM (7 years ago)
Author:
lewis
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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
e73e723
Parents:
815f7b8
Message:

Minor tweaks to UI and calculator behaviour

Location:
src/sas
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/corfunc/corfunc_calculator.py

    r8bdc103 r5878a9ea  
    6767        self.lowerq = lowerq 
    6868        self.upperq = upperq 
    69         self.background = 0 
     69        self.background = self.compute_background() 
    7070        self._transform_thread = None 
    7171 
     
    9999        if self._data is None: return 0 
    100100        elif upperq is None and self.upperq is not None: upperq = self.upperq 
    101         elif upperq == 0: return 0 
     101        elif upperq is None and self.upperq is None: return 0 
    102102        q = self._data.x 
    103103        mask = np.logical_and(q > upperq[0], q < upperq[1]) 
  • src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

    r8bdc103 r5878a9ea  
    194194            return 
    195195        # TODO: Find way to set xlim and ylim so full range of data can be 
    196         # plotted 
     196        # plotted but zoomed in 
    197197        maxq = self._data.x.max() 
    198198        mask = self._extrapolated_data.x <= maxq 
     
    202202        to_plot = Data1D(plot_x, plot_y) 
    203203        self._manager.show_data(to_plot, IQ_EXTRAPOLATED_DATA_LABEL) 
     204        # Update state of the GUI 
    204205        self._transform_btn.Enable() 
     206        self._extract_btn.Disable() 
     207        self.set_extracted_params(reset=True) 
    205208 
    206209    def compute_transform(self, event=None): 
Note: See TracChangeset for help on using the changeset viewer.