Changeset 457f735 in sasview for src/sas/sasgui/perspectives/corfunc


Ignore:
Timestamp:
Jul 11, 2017 5:05:13 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
412c509
Parents:
03e3902
Message:

Refactor in preparation for 3D transform

Location:
src/sas/sasgui/perspectives/corfunc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

    r7432acb r457f735  
    257257            StatusEvent(status=msg)) 
    258258 
    259     def transform_complete(self, transform=None): 
     259    def transform_complete(self, transforms=None): 
    260260        """ 
    261261        Called from FourierThread when calculation has completed 
    262262        """ 
    263263        self._transform_btn.SetLabel("Transform") 
    264         if transform is None: 
     264        if transforms is None: 
    265265            msg = "Error calculating Transform." 
    266266            if self.transform_type == 'hilbert': 
     
    270270            self._extract_btn.Disable() 
    271271            return 
    272         self._transformed_data = transform 
     272        self._transformed_data = transforms 
     273        (transform1, transform3) = transforms 
    273274        import numpy as np 
    274         plot_x = transform.x[np.where(transform.x <= 200)] 
    275         plot_y = transform.y[np.where(transform.x <= 200)] 
     275        plot_x = transform1.x[np.where(transform1.x <= 200)] 
     276        plot_y = transform1.y[np.where(transform1.x <= 200)] 
    276277        self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL1) 
    277278        # Only enable extract params button if a fourier trans. has been done 
     
    286287        """ 
    287288        try: 
    288             params = self._calculator.extract_parameters(self._transformed_data) 
     289            params = self._calculator.extract_parameters(self._transformed_data[0]) 
    289290        except: 
    290291            params = None 
  • src/sas/sasgui/perspectives/corfunc/corfunc_state.py

    r7432acb r457f735  
    5959        self.q = None 
    6060        self.iq = None 
    61         # TODO: Add extrapolated data and transformed data (when implemented) 
    6261 
    6362    def __str__(self): 
Note: See TracChangeset for help on using the changeset viewer.