Ignore:
Timestamp:
Apr 9, 2007 3:42:39 PM (15 years ago)
Author:
srkline
Message:

2nd pass of pulling out NCNR calls. Also cleared a lot of deadwood from the code, removing depricated functions that were mostly already commented out.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/Buttons.ipf

    r47 r76  
    183183End 
    184184 
    185 //sets the low cutoff of the color mapping (threshold) 
    186 //Function LowThreshSetVarProc(ctrlName,varNum,varStr,varName) : SetVariableControl 
    187 //      String ctrlName 
    188 //      Variable varNum 
    189 //      String varStr 
    190 //      String varName 
    191 //       
    192 //      ControlInfo/W=SANS_Data lowThresh 
    193 //      Variable loScale = V_Value 
    194 // 
    195 //      ControlInfo/W=SANS_Data highThresh 
    196 //      Variable hiScale = V_Value 
    197 // 
    198 //      String result = ImageInfo("SANS_Data","data",0) 
    199 //      String fullPath = StringByKey("ZWAVEDF", result, ":", ";") 
    200 //      fullpath += "data" 
    201 //      //Print fullpath 
    202 //      WaveStats/Q $fullpath 
    203 //      Variable maxData=V_max 
    204 // 
    205 //   WAVE NIHColors = $"root:myGlobals:NIHColors" 
    206 //      ScaleColorsToData((loScale*maxData),(hiScale*maxData),NIHColors) 
    207 //      ModifyImage/W=SANS_Data data cindex=NIHColors 
    208 ////    ModifyImage/W=SANS_Data vlegend cindex=NIHColors 
    209 // 
    210 //End 
    211  
    212 //sets the high cutoff of the color mapping (threshold) 
    213 //Function HighThreshSetVarProc(ctrlName,varNum,varStr,varName) : SetVariableControl 
    214 //      String ctrlName 
    215 //      Variable varNum 
    216 //      String varStr 
    217 //      String varName 
    218 // 
    219 //      ControlInfo/W=SANS_Data lowThresh 
    220 //      Variable loScale = V_Value 
    221 // 
    222 //      ControlInfo/W=SANS_Data highThresh 
    223 //      Variable hiScale = V_Value 
    224 // 
    225 //      String result = ImageInfo("SANS_Data","data",0) 
    226 //      String fullPath = StringByKey("ZWAVEDF", result, ":", ";") 
    227 //      fullpath += "data" 
    228 //      //Print fullpath 
    229 //      WaveStats/Q $fullpath 
    230 //      Variable maxData=V_max 
    231 // 
    232 //      WAVE NIHColors = $"root:myGlobals:NIHColors" 
    233 //      ScaleColorsToData((loScale*maxData),(hiScale*maxData),NIHColors) 
    234 //      ModifyImage/W=SANS_Data data cindex=NIHColors 
    235 ////    ModifyImage/W=SANS_Data vlegend cindex=NIHColors 
    236 //       
    237 //End 
    238  
    239185//button procedure to display previous RAW data file 
    240186//incremented by run number, not dependent on file prefix 
     
    328274 
    329275 
    330 //invoked by function key, (if menu declared)or the arrow button 
    331 //on Raw data display 
     276//invoked by function key, (if menu declared) 
    332277// if no window, or if display type is not RAW, do nothing 
    333278Function NextRawFile() 
     
    344289        LoadPlotAndDisplayRAW(1)                //go to next file 
    345290 
    346 //      //do the average (either the default, or what is on the panel currently 
    347 //      if(!DataFolderExists("root:myGlobals:Drawing")) 
    348 //              Execute "InitializeAveragePanel()" 
    349 //      endif 
    350 //      Panel_DoAverageButtonProc("")           //the avg panel does not need to be open, folders must exist 
    351291        return 0 
    352292end 
    353293 
    354 //invoked by function key, (if menu declared)or the arrow button 
    355 //on Raw data display 
     294//invoked by function key, (if menu declared) 
    356295// if no window, or if display type is not RAW, do nothing 
    357296Function PreviousRawFile() 
     
    368307        LoadPlotAndDisplayRAW(-1)               //go to previous file 
    369308 
    370 //      //do the average (either the default, or what is on the panel currently 
    371 //      if(!DataFolderExists("root:myGlobals:Drawing")) 
    372 //              Execute "InitializeAveragePanel()" 
    373 //      endif 
    374 //      Panel_DoAverageButtonProc("")           //the avg panel does not need to be open, folders must exist 
    375309        return 0 
    376310end 
    377  
    378311 
    379312//test function invoked by F5 
     
    388321        endif 
    389322        GetSelection table,CatVSTable,3 
    390 //      Print V_startRow 
    391323         
    392324        Wave/T fWave = $"root:myGlobals:CatVSHeaderInfo:Filenames" 
     
    400332        fRawWindowHook() 
    401333 
    402         //do the average (either the default, or what is on the panel currently 
     334        // if you want a plot, too 
     335        //do the average and plot (either the default, or what is on the panel currently 
    403336        if(!DataFolderExists("root:myGlobals:Drawing")) 
    404337                Execute "InitializeAveragePanel()" 
    405338        endif 
    406339        Panel_DoAverageButtonProc("")           //the avg panel does not need to be open, folders must exist 
     340         
    407341        return(0) 
    408342End 
Note: See TracChangeset for help on using the changeset viewer.