Changeset 233c121 in sasview for sansview


Ignore:
Timestamp:
May 21, 2014 7:19:00 AM (10 years ago)
Author:
pkienzle
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:
bf5e985
Parents:
85a3b46 (diff), 099c355 (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:

refactor OnFit? handler to allow fit to current page only

Location:
sansview
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sansview/README.txt

    r69ef722 r099c355  
    165165                     www.sasview.org/trac/wiki. 
    166166    *** Note 2:  If you have EXE or ZIP SasView installer, you won't need any of 
    167                  the following. 
     167                 the following.  However it is highly recommended that any 
     168                 previous versions be un-installed prior to installing the 
     169                 new version. 
    168170 
    169171    2.1- System Requirements: 
     
    218220          constrained fit will likely not be correct 
    219221        - Save project does not store the state of all the windows 
     222        - Loading projects can be very slow 
     223        - Save Project only works once a data set has been associated with 
     224          a model.  Error is reported on status bar. 
    220225 
    221226    3.2- Windows: 
    222         - None 
     227        - If installed to same directory as old version without first removing 
     228          the old version, the old desktop icon will remain but point to the 
     229          new exe version. Likewise all the start menu folders and items will 
     230          have the old name even though pointing to the new version.  Usually 
     231          safest to uninstall old version prior to installing new version anyway. 
    223232                 
    224233    3.3- MAC: 
  • sansview/sansview.py

    re2271c5 r6fe5100  
    3636PLUGIN_MODEL_DIR = 'plugin_models' 
    3737APP_NAME = 'SasView' 
    38 def run(): 
    39     sys.path.append(os.path.join("..","..","..")) 
    40     from multiprocessing import freeze_support 
    41     freeze_support() 
    42     sasview = SasView() 
    43          
     38 
    4439class SasViewApp(gui_manager.ViewApp): 
    4540    """ 
     
    113108        self.gui.clean_plugin_models(PLUGIN_MODEL_DIR) 
    114109        # Start the main loop 
    115         self.gui.MainLoop()   
    116         
     110        self.gui.MainLoop() 
    117111 
    118112 
    119 if __name__ == "__main__":  
     113def run(): 
    120114    from multiprocessing import freeze_support 
    121115    freeze_support() 
    122     #Process(target=SasView).start() 
    123     sasview = SasView() 
     116    if len(sys.argv) > 1: 
     117        thing_to_run = sys.argv[1] 
     118        sys.argv = sys.argv[1:] 
     119        import runpy 
     120        if os.path.exists(thing_to_run): 
     121            runpy.run_path(thing_to_run) 
     122        else: 
     123            runpy.run_module(thing_to_run) 
     124    else: 
     125        SasView() 
    124126 
    125     
     127if __name__ == "__main__": 
     128    run() 
     129 
  • sansview/setup_exe.py

    r27b7acc r6fe5100  
    319319'reportlab.platypus', 
    320320]) 
     321packages.append('IPython') 
    321322includes = ['site'] 
    322323 
Note: See TracChangeset for help on using the changeset viewer.