Changeset b699768 in sasview for sasview


Ignore:
Timestamp:
Feb 19, 2016 8:07:22 AM (8 years ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
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:
d7bb526
Parents:
792e6be
Message:

Initial commit of the refactored SasCalc? module.

Location:
sasview
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sasview/installer_generator.py

    r3a39c2e rb699768  
    4545         
    4646        #(ext, type, name, flags) 
    47         from sas.dataloader.loader import Loader 
     47        from sas.sascalc.dataloader.loader import Loader 
    4848        wild_cards = Loader().get_wildcards() 
    4949        for item in wild_cards: 
  • sasview/sasview.py

    r85130cb rb699768  
    137137            invariant_plug = module.Plugin() 
    138138            self.gui.add_perspective(invariant_plug) 
    139         except: 
     139        except Exception as e : 
    140140            logging.error("%s: could not find Invariant plug-in module"% \ 
    141141                          APP_NAME) 
  • sasview/setup_exe.py

    r24d3a40 rb699768  
    264264 
    265265# Copy the settings file for the sas.dataloader file extension associations 
    266 import sas.dataloader.readers 
     266import sas.sascalc.dataloader.readers 
    267267f = os.path.join(sas.dataloader.readers.get_data_path(), 'defaults.json') 
    268268if os.path.isfile(f): 
  • sasview/setup_mac.py

    re8e3e38 rb699768  
    1313from setuptools import setup 
    1414import periodictable.xsf 
    15 import sas.dataloader.readers  
     15import sas.sascalc.dataloader.readers  
    1616import os 
    1717import string 
     
    8383        list = [] 
    8484        EXCEPTION_LIST = ['*', '.', ''] 
    85         from sas.dataloader.loader import Loader 
     85        from sas.sascalc.dataloader.loader import Loader 
    8686        wild_cards = Loader().get_wildcards() 
    8787        for item in wild_cards: 
Note: See TracChangeset for help on using the changeset viewer.