Changeset 1b068256 in sasview


Ignore:
Timestamp:
May 1, 2018 4:48:25 AM (2 years ago)
Author:
wojciech
Branches:
master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload
Children:
0a5d1a8
Parents:
666454e (diff), 7d5e7da (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://github.com/SasView/sasview into ticket-1084

Location:
src/sas
Files:
3 edited

Legend:

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

    r7432acb r1cf490b6  
    1818matplotlib.use('WXAgg') 
    1919from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas 
    20 from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar 
     20from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as Toolbar 
    2121from matplotlib.backend_bases import FigureManagerBase 
    2222# Wx-Pylab magic for displaying plots within an application's window. 
  • src/sas/sasgui/perspectives/fitting/basepage.py

    r5818dae rc192960  
    14701470            # we need to check here ourselves. 
    14711471            if not is_modified: 
    1472                 is_modified = (self._check_value_enter(self.fittable_param) 
    1473                                or self._check_value_enter(self.fixed_param) 
    1474                                or self._check_value_enter(self.parameters)) 
     1472                is_modified = self._check_value_enter(self.fittable_param) 
     1473                is_modified = self._check_value_enter( 
     1474                    self.fixed_param) or is_modified 
     1475                is_modified = self._check_value_enter( 
     1476                    self.parameters) or is_modified 
    14751477 
    14761478            # Here we should check whether the boundaries have been modified. 
     
    15341536                        data=[self.data]) 
    15351537            # Check the values 
    1536             is_modified = (self._check_value_enter(self.fittable_param) 
    1537                            or self._check_value_enter(self.fixed_param) 
    1538                            or self._check_value_enter(self.parameters)) 
     1538            is_modified = self._check_value_enter(self.fittable_param) 
     1539            is_modified = self._check_value_enter(self.fixed_param) or is_modified 
     1540            is_modified = self._check_value_enter(self.parameters) or is_modified 
    15391541 
    15401542            # If qmin and qmax have been modified, update qmin and qmax and 
     
    23222324 
    23232325            # Update value in model if it has changed 
    2324             if value != self.model.getParam(name): 
     2326            if (value != self.model.getParam(name) or 
     2327                    (np.isnan(value) and np.isnan(self.model.getParam(name)))): 
    23252328                self.model.setParam(name, value) 
    23262329                is_modified = True 
  • src/sas/sasview/sasview.py

    r20fa5fe r666454e  
    200200    Prepare sasmodels for running within sasview. 
    201201    """ 
     202    #Checking for the sasmodel compiler 
     203    if sys.platform == "darwin" and not os.path.exists("/Library/Developer/CommandLineTools/usr/bin/cc"): 
     204        raise RuntimeError("No compiler. Open Terminal.app and type 'cc' at the command prompt for more instructions.") 
    202205    # Set SAS_MODELPATH so sasmodels can find our custom models 
    203206    plugin_dir = os.path.join(sas.get_user_dir(), PLUGIN_MODEL_DIR) 
Note: See TracChangeset for help on using the changeset viewer.