Changeset 936


Ignore:
Timestamp:
May 10, 2020 1:12:25 PM (2 years ago)
Author:
ilavsky
Message:

Add right click "save as jpg" and "save as pxp". Add Github instyaller version 1.10.

Location:
trunk
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/User Procedures/Indra 2/IN2_GeneralProcedures.ipf

    r930 r936  
    500500 //      "Clone this window with data", IN2G_CloneWindow()
    501501End
     502
     503Menu "GraphPopup"
     504       "Save as jpg", IN2G_SaveTopGraphJpg()
     505       "Save as pxp", IN2G_SaveTopGraphPXP()
     506       "Clone this window with data", IN2G_CloneWindow()
     507End
     508
     509Function IN2G_SaveTopGraphJpg()
     510                string topWindow=WinName(0,1)
     511                SavePICT/E=-6/B=288     as (topWindow)                          //this is jpg
     512end
     513Function IN2G_SaveTopGraphPXP()
     514                string topWindow=WinName(0,1)
     515                SaveGraphCopy /I /W=$(topWindow)                                                //this is pxp
     516end
    502517
    503518//************************************************************************************************
     
    25172532                if(StringMatch(line,"*ErrorBars*"))
    25182533                        String errorbar_names
    2519                         sscanf line,"%*[^=]=(%[^)])",errorbar_names
     2534                        SplitString/E=",.*" line
     2535                        sscanf S_value,"%*[^=]=(%[^)])",errorbar_names
    25202536                        for(j=0;j<2;j+=1)
    25212537                                String errorbar_path=StringFromList(j,errorbar_names,",")
    25222538                                sscanf errorbar_path,"%[^[])",errorbar_path
    25232539                                String errorbar_name=StringFromList(ItemsInList(errorbar_path,":")-1,errorbar_path,":")
    2524                                 Duplicate /o $("root:"+errorbar_path) $errorbar_name
     2540                                Duplicate /o $("root"+errorbar_path) $errorbar_name
    25252541                        endfor
    25262542                endif
  • trunk/User Procedures/Indra 2/Readme.txt

    r928 r936  
    1313Modification history:
    1414_____________________________________________________________________________________
    15 1.971 beta 4/20/2020
    16 no change in main code.
     151.972 beta
     16Added for every graph right click option to export as jpg and pxp. Also to duplicate, but that fails on some error bars fro now. 
     17
    1718
    1819
  • trunk/User Procedures/Irena/IR3_WAXSDiffraction.ipf

    r935 r936  
    55//local configurations
    66Strconstant  WAXSPDF4Location= "WAXS_PDFCards"
    7 constant IR3WversionNumber = 1.14       //Diffraction panel version number
     7constant IR3WversionNumber = 1.15       //Diffraction panel version number
    88
    99//*************************************************************************\
     
    1313//*************************************************************************/
    1414
     15//1.15 add "Distance correction" value which enables one to shift sticks to correct for poor calibration of distacne.
    1516//1.14 add button to open AMS www so users can search for cards easily.
    1617//1.13 add background parameters to recorded values and add GUI to extract them into table. Add Graph of peak areas.
     
    7778        NewPanel /K=1 /W=(2.25,43.25,550,800) as "Powder Diffraction/WAXS Fits"
    7879        DoWIndow/C IR3W_WAXSPanel
    79         TitleBox MainTitle title="\Zr220Powder diffraction/WAXS fits panel",pos={20,2},frame=0,fstyle=3, fixedSize=1,font= "Times New Roman", size={360,30},anchor=MC,fColor=(0,0,52224)
     80        TitleBox MainTitle title="\Zr200Powder diffraction/WAXS fits panel",pos={20,2},frame=0,fstyle=3, fixedSize=1,font= "Times New Roman", size={360,30},anchor=MC,fColor=(0,0,52224)
    8081        string UserDataTypes=""
    8182        string UserNameString=""
     
    12421243                SVAR ErrorWaveNameB = root:Packages:Irena:WAXSBackground:ErrorWaveName
    12431244
    1244                 if(stringmatch(DataFolderNameB,"*---*")||(DisplayBackg==0))
     1245                if(stringmatch(DataFolderNameB,"*---*")||(DisplayBackg==0)||strlen(DataFolderNameB)<3)
    12451246                        //to do: remove from graph!
    12461247                        RemoveFromGraph/Z BackgroundIntWave#0, BackgroundIntWave#1, BackgroundIntWave#2, BackgroundIntWave#3, BackgroundIntWave#4
     
    12491250                        Wave/Z BackgroundErrorWave=root:Packages:Irena:WAXS:BackgroundErrorWave
    12501251                        KillWaves/Z BackgroundIntWave, Background2ThetaWave, BackgroundErrorWave, BackgroundD2ThetaWave
     1252                        DisplayBackg = 0
    12511253                else
    12521254                        Wave/Z SourceBIntWv=$(DataFolderNameB+IntensityWaveNameB)
  • trunk/User Procedures/Irena/Modification history.txt

    r935 r936  
    1212********************************************
    13132.262 (beta)
     14Added for every graph right click option to export as jpg and pxp. Also to duplicate, but that fails on some error bars fro now. 
    1415WAXS - changed how JCPDS cards are named (using chemical name or formula+PDF number) + enabled long name support for Igor 8 and when user chooses.
    1516WAXS - added "Distance correction" for sticks. Tweaks calculated 2Theta angle using distance ratio correction. 
  • trunk/User Procedures/Nika/Modification history.txt

    r928 r936  
    1313Modification history:
    1414********************************************
    15 1.821 beta 4/20/2020
     151.822 beta
     16Added for every graph right click option to export as jpg and pxp. Also to duplicate, but that fails on some error bars fro now. 
    1617Main panel - change sorting option "_001". This will now look from the end of name for first number. This si to help with NSLS samples names MyName_00001_waxs.ext etc. Will work for normal files Myname_0001.ext also.
    1718Attempt to fix NXcanSAS data importer. WIP, no data to test against.
Note: See TracChangeset for help on using the changeset viewer.