Changeset c329f4d in sasview


Ignore:
Timestamp:
Aug 20, 2012 6:54:46 PM (12 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:
a338547
Parents:
5401f2a
Message:

changed sansview name to sansview (gui only)

Files:
12 edited

Legend:

Unmodified
Added
Removed

  • sansguiframe/src/sans/guiframe/gui_manager.py

    r96277b9 rc329f4d  
    6060        return os.path.abspath(os.getcwd()) 
    6161     
    62     # Finally, try the directory of the sansview module 
    63     #TODO: gui_manager will have to know about sansview until we 
     62    # Finally, try the directory of the sasview module 
     63    #TODO: gui_manager will have to know about sasview until we 
    6464    # clean all these module variables and put them into a config class 
    65     # that can be passed by sansview.py. 
     65    # that can be passed by sasview.py. 
    6666    logging.info(sys.executable) 
    6767    logging.info(str(sys.argv)) 
    68     from sans import sansview 
    69     app_path = os.path.dirname(sansview.__file__) 
     68    from sans import sansview as sasview 
     69    app_path = os.path.dirname(sasview.__file__) 
    7070    logging.info("Using application path: %s", app_path) 
    7171    return app_path 
    … …  
    7575        Returns the user's home directory 
    7676    """ 
    77     userdir = os.path.join(os.path.expanduser("~"),".sansview") 
     77    userdir = os.path.join(os.path.expanduser("~"),".sasview") 
    7878    if not os.path.isdir(userdir): 
    7979        os.makedirs(userdir) 
    … …  
    21042104    def _on_save_project(self, event): 
    21052105        """ 
    2106         save the state of the SansView as *.svs 
     2106        save the state of the SasView as *.svs 
    21072107        """ 
    21082108        if self._current_perspective is  None: 
    … …  
    21122112        extension = '*' + APPLICATION_STATE_EXTENSION 
    21132113        dlg = wx.FileDialog(self, "Save Project file", 
    2114                             self._default_save_location, "sansview_proj", 
     2114                            self._default_save_location, "sasview_proj", 
    21152115                             extension,  
    21162116                             wx.SAVE) 
    … …  
    28432843                self._data_panel.set_active_perspective(name) 
    28442844                self._check_applications_menu() 
    2845             #Set the SansView title 
     2845            #Set the SasView title 
    28462846            self._set_title_name(name) 
    28472847           
    … …  
    28492849    def _set_title_name(self, name): 
    28502850        """ 
    2851         Set the SansView title w/ the current application name 
     2851        Set the SasView title w/ the current application name 
    28522852         
    28532853        : param name: application name [string] 

  • sansview/MANIFEST.IN

    r5c7cb6f rc329f4d  
    33include README.txt 
    44include license.txt 
    5 include release_notes.txt 

  • sansview/README.txt

    re4d8cdf rc329f4d  
    22============= 
    33 
    4 SansView 2.1.1 (bug fixed) 
     4SasView 2.1.1 (bug fixed) 
    55         
    66        - Added DataInfo for data in the DataExplorer and plots 
    … …  
    4747        - More functionalities on plot panels 
    4848        - Combined Modeling and Fitting 
    49         - Save/open a SansView project or SansView analysis (subproject) 
    50         - Start the SansView application from a data file by double-clicking or from command line 
     49        - Save/open a SasView project or SasView analysis (subproject) 
     50        - Start the SasView application from a data file by double-clicking or from command line 
    5151        - Easy manipulation of data and plot 
    5252        - Provides Normalized residual plot 
    … …  
    94942- Downloading and Installing 
    9595         
    96         *** Note: If you have EXE or ZIP SansView installer, you don't need any of the following. 
     96        *** Note: If you have EXE or ZIP SasView installer, you don't need any of the following. 
    9797         
    9898        2.1- System Requirements: 
    … …  
    101101 
    102102        2.2- Installing from source: 
    103                 - Get the code from https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/sansview-x.x.x 
    104                         - run 'python setup.py install' under the 'sansview-x.x.x' folder 
    105                         - run 'python sansview.py' under the 'sansview' folder. 
     103                - Get the code from https://sasviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/sasview-x.x.x 
     104                        - run 'python setup.py install' under the 'sasview-x.x.x' folder 
     105                        - run 'python sasview.py' under the 'sasview' folder. 
    106106                - The following modules are required (version numbers are what are used in the release build): 
    107107                        - wxPython 2.8.12.1 (NOTE: do NOT use version 2.9) 
    … …  
    1601606- Installer download website 
    161161 
    162         - See: http://danse.chem.utk.edu/sansview.html 
     162        - See: http://danse.chem.utk.edu/sasview.html 

  • sansview/installer.iss

    r7f8cb75 rc329f4d  
    77 
    88ChangesAssociations=yes 
    9 AppName=SansView 
    10 AppVerName=SansView-2.1.1 
     9AppName=SasView 
     10AppVerName=SasView-2.1.1 
    1111AppPublisher=(c) 2009 - 2012, University of Tennessee 
    1212AppPublisherURL=http://danse.chem.utk.edu 
    … …  
    1414AppUpdatesURL=http://danse.chem.utk.edu  
    1515ChangesEnvironment=true  
    16 DefaultDirName={pf}\SansView 
    17 DefaultGroupName=DANSE\SansView-2.1.1 
     16DefaultDirName={pf}\SasView 
     17DefaultGroupName=.\SasView-2.1.1 
    1818DisableProgramGroupPage=yes 
    1919LicenseFile=license.txt 
    20 OutputBaseFilename=setupSansView 
     20OutputBaseFilename=setupSasView 
    2121SetupIconFile=images\ball.ico 
    2222Compression=lzma 
    … …  
    2727 
    2828[Registry] 
    29 Root: HKCR;     Subkey: ".xml\OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
    30 Root: HKCR;     Subkey: ".txt\OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
    31 Root: HKCR;     Subkey: ".asc\OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
    32 Root: HKCR;     Subkey: ".dat\OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
    33 Root: HKCR;     Subkey: ".tif\OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
    34 Root: HKCR;     Subkey: ".abs\OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
    35 Root: HKCR;     Subkey: ".d1d\OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
    36 Root: HKCR;     Subkey: ".sans\OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
    37 Root: HKCR; Subkey: "applications\SansView.exe\shell\open\command";     ValueType: string; ValueName: "";       ValueData: """{app}\SansView.exe""  ""%1""";     Flags: uninsdeletevalue noerror 
    38 Root: HKCU;     Subkey: "Software\Classes\.xml\OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
    39 Root: HKCU;     Subkey: "Software\Classes\.txt\OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
    40 Root: HKCU;     Subkey: "Software\Classes\.asc\OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
    41 Root: HKCU;     Subkey: "Software\Classes\.dat\OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
    42 Root: HKCU;     Subkey: "Software\Classes\.tif\OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
    43 Root: HKCU;     Subkey: "Software\Classes\.abs\OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
    44 Root: HKCU;     Subkey: "Software\Classes\.d1d\OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
    45 Root: HKCU;     Subkey: "Software\Classes\.sans\OpenWithList\SansView.exe";      Flags: uninsdeletekey noerror 
    46 Root: HKCU; Subkey: "Software\Classes\applications\SansView.exe\shell\open\command";    ValueType: string; ValueName: "";       ValueData: """{app}\SansView.exe""  ""%1""";     Flags: uninsdeletevalue noerror 
    47 Root: HKCR;     Subkey: ".svs"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue  noerror 
    48 Root: HKCR;     Subkey: ".fitv";        ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue  noerror 
    49 Root: HKCR;     Subkey: ".inv"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue  noerror 
    50 Root: HKCR;     Subkey: ".prv"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue  noerror 
    51 Root: HKCR; Subkey: "{app}\SansView.exe";       ValueType: string; ValueName: "";       ValueData: "{app}\SansView File";        Flags: uninsdeletekey  noerror          
    52 Root: HKCR; Subkey: "{app}\SansView.exe\shell\open\command";    ValueType: string; ValueName: "";       ValueData: """{app}\SansView.exe""  ""%1""";     Flags: uninsdeletevalue noerror         
    53 Root: HKCR; Subkey: "{app}\images\ball.ico";    ValueType: string; ValueName: "";       ValueData: "{app}\SansView.exe,0";       Flags: uninsdeletevalue noerror         
    54 Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment";     ValueType: expandsz; ValueName: "SANSVIEWPATH"; ValueData: "{app}";      Flags: uninsdeletevalue noerror 
     29Root: HKCR;     Subkey: ".xml\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
     30Root: HKCR;     Subkey: ".txt\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
     31Root: HKCR;     Subkey: ".asc\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
     32Root: HKCR;     Subkey: ".dat\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
     33Root: HKCR;     Subkey: ".tif\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
     34Root: HKCR;     Subkey: ".abs\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
     35Root: HKCR;     Subkey: ".d1d\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
     36Root: HKCR;     Subkey: ".sans\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
     37Root: HKCR;     Subkey: ".nxs\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
     38Root: HKCR; Subkey: "applications\SasView.exe\shell\open\command";      ValueType: string; ValueName: "";       ValueData: """{app}\SasView.exe""  ""%1""";      Flags: uninsdeletevalue noerror 
     39Root: HKCU;     Subkey: "Software\Classes\.xml\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
     40Root: HKCU;     Subkey: "Software\Classes\.txt\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
     41Root: HKCU;     Subkey: "Software\Classes\.asc\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
     42Root: HKCU;     Subkey: "Software\Classes\.dat\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
     43Root: HKCU;     Subkey: "Software\Classes\.tif\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
     44Root: HKCU;     Subkey: "Software\Classes\.abs\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
     45Root: HKCU;     Subkey: "Software\Classes\.d1d\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
     46Root: HKCU;     Subkey: "Software\Classes\.sans\OpenWithList\SasView.exe";       Flags: uninsdeletekey noerror 
     47Root: HKCU;     Subkey: "Software\Classes\.nxs\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
     48Root: HKCU; Subkey: "Software\Classes\applications\SasView.exe\shell\open\command";     ValueType: string; ValueName: "";       ValueData: """{app}\SasView.exe""  ""%1""";      Flags: uninsdeletevalue noerror 
     49Root: HKCR;     Subkey: ".svs"; ValueType: string;      ValueName: "";  ValueData: "{app}\SasView.exe";  Flags: uninsdeletevalue  noerror 
     50Root: HKCR;     Subkey: ".fitv";        ValueType: string;      ValueName: "";  ValueData: "{app}\SasView.exe";  Flags: uninsdeletevalue  noerror 
     51Root: HKCR;     Subkey: ".inv"; ValueType: string;      ValueName: "";  ValueData: "{app}\SasView.exe";  Flags: uninsdeletevalue  noerror 
     52Root: HKCR;     Subkey: ".prv"; ValueType: string;      ValueName: "";  ValueData: "{app}\SasView.exe";  Flags: uninsdeletevalue  noerror 
     53Root: HKCR; Subkey: "{app}\SasView.exe";        ValueType: string; ValueName: "";       ValueData: "{app}\SasView File";         Flags: uninsdeletekey  noerror          
     54Root: HKCR; Subkey: "{app}\SasView.exe\shell\open\command";     ValueType: string; ValueName: "";       ValueData: """{app}\SasView.exe""  ""%1""";      Flags: uninsdeletevalue noerror         
     55Root: HKCR; Subkey: "{app}\images\ball.ico";    ValueType: string; ValueName: "";       ValueData: "{app}\SasView.exe,0";        Flags: uninsdeletevalue noerror         
     56Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment";     ValueType: expandsz; ValueName: "SASVIEWPATH";  ValueData: "{app}";      Flags: uninsdeletevalue noerror 
    5557; Write to PATH (below) is disabled; need more tests 
    56 ;Root: HKCU; Subkey: "Environment";     ValueType: expandsz; ValueName: "PATH"; ValueData: "%SANSVIEWPATH%;{olddata}";   Check: NeedsAddPath() 
     58;Root: HKCU; Subkey: "Environment";     ValueType: expandsz; ValueName: "PATH"; ValueData: "%SASVIEWPATH%;{olddata}";    Check: NeedsAddPath() 
    5759 
    5860 
    … …  
    6769 
    6870[Files] 
    69 Source: "dist\SansView.exe";    DestDir: "{app}";       Flags: ignoreversion 
     71Source: "dist\SasView.exe";     DestDir: "{app}";       Flags: ignoreversion 
    7072Source: "dist\*";       DestDir: "{app}";       Flags: ignoreversion recursesubdirs createallsubdirs 
    71 Source: "dist\plugin_models\*"; DestDir: "{userappdata}\..\.sansview\plugin_models";    Flags: recursesubdirs createallsubdirs 
    72 Source: "dist\config\custom_config.py"; DestDir: "{userappdata}\..\.sansview\config";   Flags: recursesubdirs createallsubdirs 
     73Source: "dist\plugin_models\*"; DestDir: "{userappdata}\..\.sasview\plugin_models";     Flags: recursesubdirs createallsubdirs 
     74Source: "dist\config\custom_config.py"; DestDir: "{userappdata}\..\.sasview\config";    Flags: recursesubdirs createallsubdirs 
    7375;       NOTE: Don't use "Flags: ignoreversion" on any shared system files 
    7476 
    7577[Icons] 
    76 Name: "{group}\SansView";       Filename: "{app}\SansView.exe"; WorkingDir: "{app}"; IconFilename: "{app}\images\ball.ico"  
    77 Name: "{group}\{cm:UninstallProgram, SansView}";         Filename: "{uninstallexe}"  
    78 Name: "{commondesktop}\SansView-2.1.1"; Filename: "{app}\SansView.exe"; Tasks: desktopicon; WorkingDir: "{app}" ; IconFilename: "{app}\images\ball.ico"  
    79 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\SansView-2.1.1";  Filename: "{app}\SansView.exe"; Tasks: quicklaunchicon; WorkingDir: "{app}"; IconFilename: "{app}\images\ball.ico"  
     78Name: "{group}\SasView";        Filename: "{app}\SasView.exe";  WorkingDir: "{app}"; IconFilename: "{app}\images\ball.ico"  
     79Name: "{group}\{cm:UninstallProgram, SasView}";  Filename: "{uninstallexe}"  
     80Name: "{commondesktop}\SasView-2.1.1";  Filename: "{app}\SasView.exe";  Tasks: desktopicon; WorkingDir: "{app}" ; IconFilename: "{app}\images\ball.ico"  
     81Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\SasView-2.1.1";   Filename: "{app}\SasView.exe";  Tasks: quicklaunchicon; WorkingDir: "{app}"; IconFilename: "{app}\images\ball.ico"  
    8082 
    8183 
    8284[Run] 
    83 Filename: "{app}\SansView.exe"; Description: "{cm:LaunchProgram, SansView}";    Flags: nowait postinstall skipifsilent 
     85Filename: "{app}\SasView.exe";  Description: "{cm:LaunchProgram, SasView}";     Flags: nowait postinstall skipifsilent 
    8486; Install the Microsoft C++ DLL redistributable package if it is provided and the DLLs are not present on the target system. 
    8587; Note that the redistributable package is included if the app was built using Python 2.6 or 2.7, but not with 2.5. 
    … …  
    111113  RegQueryStringValue(HKEY_CURRENT_USER,'Environment','PATH', oldpath) 
    112114  oldpath := oldpath + ';'; 
    113   newpath := '%SANSVIEWPATH%'; 
     115  newpath := '%SASVIEWPATH%'; 
    114116  i := 0; 
    115117  while (Pos(';', oldpath) > 0) do begin 

  • sansview/installer_generator.py

    re3ef8dd4 rc329f4d  
    124124    msg += """ValueType: %s; """ % str('string') 
    125125    msg += """ValueName: "%s";\t""" % str('')  
    126     msg += """ValueData: "{app}\%s";\t""" % str("SansView File")  
     126    msg += """ValueData: "{app}\%s";\t""" % str("SasView File")  
    127127    msg += """ Flags: %s \t""" % str("uninsdeletekey  noerror") 
    128128    msg += "\n" 
    … …  
    145145 
    146146     
    147     #SANSVIEWPATH 
     147    #SASVIEWPATH 
    148148    msg += """Root: HKLM; Subkey: "%s";\t"""  %  str('SYSTEM\CurrentControlSet\Control\Session Manager\Environment') 
    149149    msg += """ValueType: %s; """ % str('expandsz') 
    150     msg += """ValueName: "%s";\t""" % str('SANSVIEWPATH')  
     150    msg += """ValueName: "%s";\t""" % str('SASVIEWPATH')  
    151151    msg += """ValueData: "{app}";\t""" 
    152152    msg += """ Flags: %s""" % str('uninsdeletevalue noerror') 
    … …  
    158158    msg += """ValueType: %s; """ % str('expandsz') 
    159159    msg += """ValueName: "%s";\t""" % str('PATH')  
    160     msg += """ValueData: "%s;{olddata}";\t""" % str('%SANSVIEWPATH%') 
     160    msg += """ValueData: "%s;{olddata}";\t""" % str('%SASVIEWPATH%') 
    161161    msg += """ Check: %s""" % str('NeedsAddPath()') 
    162162    msg += "\n" 
    … …  
    197197    msg += """Source: "dist\*";\tDestDir: "{app}";\t""" 
    198198    msg += """Flags: ignoreversion recursesubdirs createallsubdirs\n""" 
    199     msg += """Source: "dist\plugin_models\*";\tDestDir: "{userappdata}\..\.sansview\plugin_models";\t"""  
     199    msg += """Source: "dist\plugin_models\*";\tDestDir: "{userappdata}\..\.sasview\plugin_models";\t"""  
    200200    msg += """Flags: recursesubdirs createallsubdirs\n""" 
    201     msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userappdata}\..\.sansview\config";\t"""  
     201    msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userappdata}\..\.sasview\config";\t"""  
    202202    msg += """Flags: recursesubdirs createallsubdirs\n""" 
    203203    msg += """;\tNOTE: Don't use "Flags: ignoreversion" on any shared system files""" 
    … …  
    278278    msg += """'PATH', oldpath)\n""" 
    279279    msg += """  oldpath := oldpath + ';';\n""" 
    280     msg += """  newpath := '%SANSVIEWPATH%';\n""" 
     280    msg += """  newpath := '%SASVIEWPATH%';\n""" 
    281281    msg += """  i := 0;\n""" 
    282282    msg += """  while (Pos(';', oldpath) > 0) do begin\n""" 

  • sansview/license.txt

    rc5d2760 rc329f4d  
    1111we ask that you acknowledge the use of the software with the following sentence: 
    1212 
    13 "This work benefited from the use of the SansView application, originally developed under NSF award DMR-0520547."  
     13"This work benefited from the use of the SasView application, originally developed under NSF award DMR-0520547."  
    1414 
    1515See the DANSE project web site for license information: 

  • sansview/local_config.py

    r204548c rc329f4d  
    99 
    1010# Version of the application 
    11 __appname__ = "SansView" 
     11__appname__ = "SasView" 
    1212__version__ = sans.sansview.__version__ 
    1313__build__ = sans.sansview.__build__ 
    … …  
    5959 
    6060#edit the list of file state your plugin can read 
    61 APPLICATION_WLIST = 'SansView files (*.svs)|*.svs' 
     61APPLICATION_WLIST = 'SasView files (*.svs)|*.svs' 
    6262APPLICATION_STATE_EXTENSION = '.svs' 
    6363GUIFRAME_WIDTH = 1150 
    … …  
    9090SetupIconFile_win = os.path.join(icon_path, "ball.ico") 
    9191SetupIconFile_mac = os.path.join(icon_path, "ball.icns") 
    92 DefaultGroupName = "DANSE" 
    93 OutputBaseFilename = "setupSansView" 
     92DefaultGroupName = "." 
     93OutputBaseFilename = "setupSasView" 
    9494 
    9595FIXED_PANEL = True 

  • sansview/sansview.py

    r19e614a rc329f4d  
    1313logging.basicConfig(level=logging.INFO, 
    1414                    format='%(asctime)s %(levelname)s %(message)s', 
    15                     filename=os.path.join(os.path.expanduser("~"),'sansview.log')) 
     15                    filename=os.path.join(os.path.expanduser("~"),'sasview.log')) 
    1616 
    1717import wx 
    1818import sys 
    19 # The below will make sure that sansview application uses the matplotlib font  
    20 # bundled with sansview.  
     19# The below will make sure that sasview application uses the matplotlib font  
     20# bundled with sasview.  
    2121if hasattr(sys, 'frozen'): 
    2222    mplconfigdir = os.path.join(os.path.expanduser("~"), '.matplotlib') 
    … …  
    3333import local_config 
    3434PLUGIN_MODEL_DIR = 'plugin_models' 
    35  
     35APP_NAME = 'SasView' 
    3636def run(): 
    3737    sys.path.append(os.path.join("..","..","..")) 
    3838    from multiprocessing import freeze_support 
    3939    freeze_support() 
    40     sansview = SansView() 
     40    sasview = SasView() 
    4141         
    42 class SansViewApp(gui_manager.ViewApp): 
     42class SasViewApp(gui_manager.ViewApp): 
    4343    """ 
    4444    """ 
    4545   
    4646 
    47 class SansView(): 
     47class SasView(): 
    4848    """ 
    4949    """ 
    … …  
    5252        """ 
    5353        #from gui_manager import ViewApp 
    54         self.gui = SansViewApp(0)  
     54        self.gui = SasViewApp(0)  
    5555        # Set the application manager for the GUI 
    5656        self.gui.set_manager(self) 
    … …  
    6868            self.gui.add_perspective(fitting_plug) 
    6969        except: 
    70             logging.error("SansView: could not find Fitting plug-in module") 
     70            logging.error("%s: could not find Fitting plug-in module")% APP_NAME  
    7171            logging.error(sys.exc_value)   
    7272             
    … …  
    7777            self.gui.add_perspective(pr_plug) 
    7878        except: 
    79             logging.error("SansView: could not find P(r) plug-in module")  
     79            logging.error("%s: could not find P(r) plug-in module")% APP_NAME 
    8080            logging.error(sys.exc_value)   
    8181         
    … …  
    8787        except: 
    8888            raise 
    89             logging.error("SansView: could not find Invariant plug-in module")  
     89            logging.error("%s: could not find Invariant plug-in module")% \ 
     90                                                        APP_NAME  
    9091            logging.error(sys.exc_value)   
    9192         
    … …  
    9697            self.gui.add_perspective(calculator_plug) 
    9798        except: 
    98             logging.error("SansView: could not find Calculator plug-in module") 
     99            logging.error("%s: could not find Calculator plug-in module")% \ 
     100                                                        APP_NAME 
    99101            logging.error(sys.exc_value)   
    100102 
    … …  
    115117    from multiprocessing import freeze_support 
    116118    freeze_support() 
    117     #Process(target=SansView).start() 
    118     sansview = SansView() 
     119    #Process(target=SasView).start() 
     120    sasview = SasView() 
    119121 
    120122    

  • sansview/setup_exe.py

    r213b445 rc329f4d  
    1919if len(sys.argv) == 1: 
    2020    sys.argv.append('py2exe') 
    21 # When using the SansView build script, we need to be able to pass 
     21# When using the SasView build script, we need to be able to pass 
    2222# an extra path to be added to the python path. The extra arguments 
    2323# should be removed from the list so that the setup processing doesn't 
    … …  
    3131        sys.argv.remove('--extrapath') 
    3232except: 
    33     print "Error processing extra python path needed to build SansView\n  %s" % sys.exc_value 
     33    print "Error processing extra python path needed to build SasView\n  %s" % sys.exc_value 
    3434 
    3535from distutils.core import setup 
    … …  
    9696           type="win32" 
    9797       /> 
    98        <description>SansView</description> 
     98       <description>SasView</description> 
    9999       <dependency> 
    100100           <dependentAssembly> 
    … …  
    118118            version="5.0.0.0" 
    119119            processorArchitecture="x86" 
    120             name="SansView" 
     120            name="SasView" 
    121121            type="win32"> 
    122122          </assemblyIdentity> 
    123           <description>SansView</description> 
     123          <description>SasView</description> 
    124124          <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> 
    125125            <security> 
    … …  
    167167           type="win32" 
    168168       /> 
    169        <description>SansView</description> 
     169       <description>SasView</description> 
    170170       <dependency> 
    171171           <dependentAssembly> 
    … …  
    207207        self.company_name = "U Tennessee" 
    208208        self.copyright = "copyright 2009 - 2012" 
    209         self.name = "SansView" 
     209        self.name = "SasView" 
    210210         
    211211# 
    … …  
    317317 
    318318target_wx_client = Target( 
    319     description = 'SansView', 
     319    description = 'SasView', 
    320320    script = 'sansview.py', 
    321321    icon_resources = [(1, os.path.join(images_dir, "ball.ico"))], 
    322322    other_resources = [(24,1,manifest)], 
    323     dest_base = "SansView" 
     323    dest_base = "SasView" 
    324324    ) 
    325325 

  • sansview/setup_mac.py

    r270cc72e rc329f4d  
    9696plist = dict(CFBundleDocumentTypes=[dict(CFBundleTypeExtensions=EXTENSIONS_LIST, 
    9797                                         CFBundleTypeIconFile=ICON, 
    98                                    CFBundleTypeName="sansview file", 
     98                                   CFBundleTypeName="sasview file", 
    9999                                   CFBundleTypeRole="Shell" )],) 
    100100 

  • sansview/welcome_panel.py

    r4851fe9e rc329f4d  
    3636        wx.aui.AuiNotebook.__init__(self, parent, *args, **kwds) 
    3737        PanelBase.__init__(self) 
    38         #For sansview the parent is guiframe 
     38        #For sasview the parent is guiframe 
    3939        self.parent = parent 
    4040        

  • setup.py

    r5a313a3 rc329f4d  
    11""" 
    2     Setup for SansView 
     2    Setup for SasView 
    33    #TODO: Add checks to see that all the dependencies are on the system 
    44""" 
    … …  
    1919                                 "core","include") 
    2020    except: 
    21         msg = "\nNumpy is needed to build SansView. " 
     21        msg = "\nNumpy is needed to build SasView. " 
    2222        print msg, "Try easy_install numpy.\n  %s" % str(sys.exc_value) 
    2323        sys.exit(0) 
    … …  
    4343                     'sum_Ap1_1_Ap2.pyc', 'sum_p1_p2.pyc',  
    4444                     'testmodel_2.pyc', 'testmodel.pyc', 'plugins.log'] 
    45 sans_dir = os.path.join(os.path.expanduser("~"),'.sansview') 
     45sans_dir = os.path.join(os.path.expanduser("~"),'.sasview') 
    4646if os.path.isdir(sans_dir): 
    47     f_path = os.path.join(sans_dir, "sansview.log") 
     47    f_path = os.path.join(sans_dir, "sasview.log") 
    4848    if os.path.isfile(f_path): 
    4949        os.remove(f_path) 
    … …  
    323323                    ] ) 
    324324         
    325 # SansView 
     325# SasView 
    326326package_dir["sans.sansview"] = "sansview" 
    327327package_data['sans.sansview'] = ['images/*', 'media/*', 'test/*'] 
    … …  
    341341 
    342342    
    343  # Set up SansView     
     343 # Set up SasView     
    344344setup( 
    345     name="sansview", 
     345    name="sasview", 
    346346    version = VERSION, 
    347     description = "SansView application", 
     347    description = "SasView application", 
    348348    author = "University of Tennessee", 
    349349    author_email = "sansdanse@gmail.com", 
    350350    url = "http://danse.chem.utk.edu", 
    351351    license = "PSF", 
    352     keywords = "small-angle neutron scattering analysis", 
     352    keywords = "small-angle x-ray and neutron scattering analysis", 
    353353    download_url = "https://sourceforge.net/projects/sansviewproject/files/", 
    354354    package_dir = package_dir, 
Note: See TracChangeset for help on using the changeset viewer.