Changeset 564 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf

Timestamp:

Oct 1, 2009 10:15:08 AM (13 years ago)

Author:

srkline

Message:

A variety of changes...

• fixed model strings for Sum_Model
• /Z flag for RTHelp, Transmission help, FIT help, MRED help
• added help and done buttons to SASCALC
• added comments in MonteCarlo?
• restored the 2-line buttons in USANS panels, now supported in Igor 6.1 (COR_Graph and Main_USANS)
• added simple text notebook of UCALC configuration, and a save of PNG of the whole panel
• added help and done buttons to UCALC

• added links in SANS_Reduction_Help to the simluation help file (not added to SVN yet)

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf

@@ -379 +379 @@
         PopupMenu popup0_2,pos={108,127},size={55,20},proc=DeltaLambdaPopMenuProc
         PopupMenu popup0_2,mode=2,value= root:Packages:NIST:SAS:gDeltaLambdaStr
-        Button FreezeButton title="Freeze",size={60,20},pos={307,166}
+        Button FreezeButton title="Freeze",size={60,20},pos={180,166}
         Button FreezeButton proc=FreezeButtonProc
-        Button ClearButton title="Clear",size={60,20},pos={377,166}
+        Button ClearButton title="Clear",size={60,20},pos={250,166}
         Button ClearButton proc=S_ClearButtonProc
         GroupBox group0,pos={6,1},size={108,36},title="Instrument"
@@ -395 +395 @@
         CheckBox checkSim,value=0
         
+        // help, done buttons
+        Button SC_helpButton,pos={340,166},size={25,20},proc=showSASCALCHelp,title="?"
+        Button SC_helpButton,help={"Show help file for simulation of SANS Data"}
+        Button SC_DoneButton,pos={380,166},size={50,20},proc=SASCALCDoneButton,title="Done"
+        Button SC_DoneButton,help={"This button will close the panel"}
+
         // set up a fake dependency to trigger recalculation
         //root:Packages:NIST:SAS:gCalculate := ReCalculateInten(root:Packages:NIST:SAS:gTouched)
 EndMacro
+
+//clean up
+Proc SASCALCDoneButton(ctrlName): ButtonControl
+        String ctrlName
+        DoWindow/K SASCALC
+        DoWindow/K Trial_Configuration
+        DoWindow/K Saved_Configurations
+        DoWindow/K MC_SASCALC
+        DoWindow/K Sim_1D_Panel
+end
+
+//
+Proc showSASCALCHelp(ctrlName): ButtonControl
+        String ctrlName
+        DisplayHelpTopic/K=1/Z "SASCALC"
+        if(V_flag !=0)
+                DoAlert 0,"The SANS Simulation Help file could not be found"
+        endif
+end
 
 // based on the instrument selected...