Changeset c8cf215 in sasview


Ignore:
Timestamp:
Aug 17, 2016 4:51:02 AM (8 years ago)
Author:
wojciech
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:
e4c897b
Parents:
8096b446 (diff), 1a8e2e8e (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:

Sphinx build adds mag_img folder

Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/plottools/PlotPanel.py

    rfa1cbee r1a8e2e8e  
    666666                dlg.setFitRange(self.xminView, self.xmaxView, 
    667667                                self.xmin, self.xmax) 
     668            else: 
     669                xlim = self.subplot.get_xlim() 
     670                ylim = self.subplot.get_ylim() 
     671                dlg.setFitRange(xlim[0], xlim[1], ylim[0], ylim[1]) 
    668672            # It would be nice for this to NOT be modal (i.e. Show). 
    669673            # Not sure about other ramifications - for example 
     
    18941898 
    18951899        """ 
     1900        xlim = self.subplot.get_xlim() 
     1901        ylim = self.subplot.get_ylim() 
     1902 
    18961903        # Saving value to redisplay in Fit Dialog when it is opened again 
    18971904        self.Avalue, self.Bvalue, self.ErrAvalue, \ 
     
    19241931            self.fit_result.name = 'Fit' 
    19251932            self.plots[fit_id] = self.fit_result 
     1933        self.subplot.set_xlim(xlim) 
     1934        self.subplot.set_ylim(ylim) 
    19261935        self.subplot.figure.canvas.draw_idle() 
    19271936 
  • docs/sphinx-docs/build_sphinx.py

    r18a1f2b r8096b446  
    3636SASMODELS_SOURCE_PROLOG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc") 
    3737SASMODELS_SOURCE_MAGNETISM = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "ref", "magnetism") 
     38SASMODELS_SOURCE_MAGIMG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "ref", "magnetism", "mag_img") 
    3839SASMODELS_SOURCE_REF_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "ref", "models") 
    3940SASMODELS_SOURCE_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "model") 
     
    4445SASMODELS_DEST_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "source", "user", "models") 
    4546SASMODELS_DEST_IMG = os.path.join(CURRENT_SCRIPT_DIR,  "source", "user", "model-imgs", "new-models") 
     47SASMODELS_DEST_MAGIMG = os.path.join(CURRENT_SCRIPT_DIR,  "source", "user", "mag_img") 
    4648SASMODELS_DEST_BUILDIMG = os.path.join(CURRENT_SCRIPT_DIR,  "source", "user", "models", "img") 
    4749 
     
    137139 
    138140            copy_tree(docs, dest_dir) 
    139              
     141 
    140142    # Now pickup testdata_help.rst 
    141143#    print os.path.abspath(SASVIEW_TEST) 
     
    144146    if os.path.exists(SASVIEW_TEST): 
    145147       print "Found docs folder at ", SASVIEW_TEST 
    146        shutil.copytree(SASVIEW_TEST, SPHINX_SOURCE_TEST)        
    147  
    148     print "=== And the Sasmodels Docs ==="  
     148       shutil.copytree(SASVIEW_TEST, SPHINX_SOURCE_TEST) 
     149 
     150    print "=== And the Sasmodels Docs ===" 
    149151    # Make sure we have the relevant images for the new sasmodels documentation 
    150152    # First(!) we'll make a local reference copy for SasView (/new-models will be cleaned each build) 
     
    175177            shutil.copy(fromhere,tohere) 
    176178        else: print "no source directorty",SASMODELS_SOURCE_AUTOIMG ,"was found" 
    177      
     179 
    178180    # And the rst prolog with the unit substitutions 
    179181    if os.path.exists(SASMODELS_SOURCE_PROLOG): 
     
    198200                    tohere=os.path.join(SASMODELS_DEST_REF_MODELS,files) 
    199201                    shutil.copy(fromhere,tohere) 
     202 
     203    if os.path.exists(SASMODELS_SOURCE_MAGIMG): 
     204        print "Found img  folder SASMODELS_SOURCE_MAGIMG    at ", SASMODELS_SOURCE_MAGIMG 
     205        if not os.path.exists(SASMODELS_DEST_MAGIMG): 
     206            print "Missing docs folder SASMODELS_DEST_MAGIMG at ", SASMODELS_DEST_MAGIMG 
     207            os.makedirs(SASMODELS_DEST_MAGIMG) 
     208            print "created SASMODELS_DEST_MAGIMG at ", SASMODELS_DEST_MAGIMG 
     209        print "Copying sasmodels model auto-generated image files..." 
     210        for files in os.listdir(SASMODELS_SOURCE_MAGIMG): 
     211            fromhere=os.path.join(SASMODELS_SOURCE_MAGIMG,files) 
     212            tohere=os.path.join(SASMODELS_DEST_MAGIMG,files) 
     213            shutil.copy(fromhere,tohere) 
     214        else: print "no source directorty",SASMODELS_SOURCE_MAGIMG ,"was found" 
    200215 
    201216    if os.path.exists(SASMODELS_SOURCE_REF_MODELS): 
Note: See TracChangeset for help on using the changeset viewer.