Changeset 972


Ignore:
Timestamp:
Dec 4, 2015 3:51:48 PM (7 years ago)
Author:
srkline
Message:

more additions to the basic infrastructure for VSANS

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VSANS_Includes.ipf

    r971 r972  
    4545#include "V_Menu" 
    4646#include "V_VSANS_Preferences" 
     47#include "V_WorkFolderUtils" 
    4748 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_RW_Utils.ipf

    r971 r972  
    2828End 
    2929 
    30 // TODO -- move the initializtion of the raw data folder to be in the as-yet unwritten initialization routine for 
     30// TODO: 
     31//  x- move the initializtion of the raw data folder to be in the as-yet unwritten initialization routine for 
    3132// reduction. be sure that it's duplicated in the VCALC initialization too. 
    3233// 
    33 Proc V_LoadHDF5Data(file) 
     34Function V_LoadHDF5Data(file) 
    3435        String file 
    3536 
    36         NewDataFolder/O/S root:Packages:NIST:VSANS:RawVSANS 
     37        SetDataFolder root:Packages:NIST:VSANS:RawVSANS 
    3738//      SetDataFolder root: 
    3839        Variable err= V_LoadHDF5_NoAtt(file)    // reads into current folder 
    3940        SetDataFolder root: 
     41        return(err) 
    4042End 
    4143 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MainPanel.ipf

    r971 r972  
    5151        String ctrlName 
    5252 
    53         Variable err=   LoadRawSANSData("Select a Raw SANS data file") 
     53        Variable err=   V_LoadHDF5Data("")                      // load the data into RawVSANS storage folder (why am I doing this?) 
    5454        if(!err) 
    55                 UpdateDisplayInformation("RAW") 
     55                String hdfDF = root:file_name                   // last file loaded, may not be the safest way to pass 
     56                CopyHDFToWorkFolder(hdfDF,"RAW")                // copy what is needed for data processing (not the DAS_logs) 
     57                UpdateDisplayInformation("RAW")         // plot the data in whatever folder type 
    5658        endif 
    5759End 
     
    189191Proc HelpMainButtonProc(ctrlName) : ButtonControl 
    190192        String ctrlName 
    191         DisplayHelpTopic/Z/K=1 "SANS Data Reduction Tutorial" 
     193        DisplayHelpTopic/Z/K=1 "VSANS Data Reduction Tutorial" 
    192194        if(V_flag !=0) 
    193                 DoAlert 0,"The SANS Data Reduction Tutorial Help file could not be found" 
     195                DoAlert 0,"The VSANS Data Reduction Tutorial Help file could not be found" 
    194196        endif 
    195197End 
     
    293295        PauseUpdate; Silent 1           // building window... 
    294296        NewPanel /W=(500,60,924,320) /K=2 as "VSANS Reduction Controls" 
    295         ModifyPanel cbRGB=(65535,58981,27524) 
     297        ModifyPanel cbRGB=(47748,57192,54093) 
    296298        ModifyPanel fixedSize=1 
    297299////// 
     
    310312        TabControl MainTab,value=0 
    311313        // 
    312         TabControl MainTab labelBack=(65535,58981,27524) 
     314        TabControl MainTab labelBack=(47748,57192,54093) 
    313315         
    314316//on tab(0) - Raw Data - initially visible 
Note: See TracChangeset for help on using the changeset viewer.