Changeset 927


Ignore:
Timestamp:
Jan 6, 2014 5:15:24 PM (8 years ago)
Author:
srkline
Message:

renaming canSASXML to cansasXML just to be consistent with CANSAS, as Pete Jemain wrote it. There may also be some conflict here lurking with Jan's macros, so nip it here.

The installer has been updated with new diagnostics of the local user folders. new PXP file in the next commit

Location:
sans/Dev/trunk/NCNR_User_Procedures/Common
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf

    r900 r927  
    6060        IH_err = FolderPermissionCheck("Igor Help Files:") 
    6161        IE_err = FolderPermissionCheck("Igor Extensions:")       
    62 //      Print UP_err,IH_err,IE_err 
     62//      Print "In install ", UP_err,IH_err,IE_err 
    6363 
    6464        String alertStr="" 
     
    533533        PathInfo Igor 
    534534        String IgorPathStr = S_Path 
    535         String fileNameStr = IgorPathStr + "User Procedures:NCNR_User_Procedures:InstalledVersion.txt" 
     535        String fileNameStr = SpecialDirPath("Igor Pro User Files",0,0,0) + "User Procedures:NCNR_User_Procedures:InstalledVersion.txt" 
    536536        String installedStr 
    537537        Variable refnum 
     
    553553        IE_err = FolderPermissionCheck("Igor Extensions:") 
    554554         
    555         Print UP_err,IH_err,IE_err 
     555//      Print UP_err,IH_err,IE_err 
    556556         
    557557        String alertStr="" 
    558558        if(UP_err != 0) 
    559                 alertStr += "User Procedures has no write permission. Error = "+num2Str(UP_err)+"\r" 
     559                alertStr += "(Application) User Procedures has no write permission. Error = "+num2Str(UP_err)+"\r" 
    560560        else 
    561561                alertStr += "User Procedures permission is OK.\r" 
    562562        endif 
    563563        if(IH_err != 0) 
    564                 alertStr += "Igor Help Files has no write permission. Error = "+num2Str(IH_err)+"\r" 
     564                alertStr += "(Application) Igor Help Files has no write permission. Error = "+num2Str(IH_err)+"\r" 
    565565        else 
    566566                alertStr += "Igor Help Files permission is OK.\r" 
    567567        endif 
    568568        if(IE_err != 0) 
    569                 alertStr += "Igor Extensions has no write permission. Error = "+num2Str(IE_err)+"\r" 
     569                alertStr += "(Application) Igor Extensions has no write permission. Error = "+num2Str(IE_err)+"\r" 
    570570        else 
    571571                alertStr += "Igor Extensions permission is OK.\r" 
     
    573573         
    574574        if(UP_err != 0 || IH_err != 0 || IE_err != 0) 
    575                 alertStr += "You will need to install manually." 
    576         endif 
    577          
    578         Notebook $nb text="\r\r**Folder Permissions**\r" 
     575                alertStr += "You may need to un-install some items manually." 
     576        endif 
     577         
     578        Notebook $nb text="\r\r** (Application) Folder Permissions**\r" 
    579579        Notebook $nb text=AlertStr +"\r" 
    580580         
     
    584584 
    585585// get listings of everything in each folder 
     586// -- TWO passes. once for the Application folder to make sure that there is nothing left there. Then 
     587// the second path to look in the (local) user folder where everything should be installed. 
     588 
    586589        string strfileList="" 
    587590 
     591// start with the Application folder. these should be free of NCNR stuff 
    588592// what is the listing of the Igor Extensions 
    589         Notebook $nb text="\r\r**Igor Extensions (files)**\r" 
     593        Notebook $nb text="\r\r**(Application) Igor Extensions (files)**\r" 
    590594        NewPath /Q/O ExPath, igorPathStr+"Igor Extensions:" 
    591595         
     
    596600 
    597601        //folders 
    598         Notebook $nb text="\r**Igor Extensions (folders)**\r" 
     602        Notebook $nb text="\r**(Application) Igor Extensions (folders)**\r" 
    599603        strFileList = IndexedDir(ExPath, -1, 0 ) 
    600604        textStr = ReplaceString(";", strFileList, "\r") 
     
    603607 
    604608// what is the listing of Igor Help files 
    605         Notebook $nb text="\r\r**Igor Help (files)**\r" 
     609        Notebook $nb text="\r\r**(Application) Igor Help (files)**\r" 
    606610        NewPath /Q/O IHPath, igorPathStr+"Igor Help Files:" 
    607611 
     
    612616 
    613617        //folders 
    614         Notebook $nb text="\r**Igor Help (folders)**\r" 
     618        Notebook $nb text="\r**(Application) Igor Help (folders)**\r" 
    615619        strFileList = IndexedDir(IHPath, -1, 0 ) 
    616620        textStr = ReplaceString(";", strFileList, "\r") 
     
    619623         
    620624// what is the listing of the User Procedures 
    621         Notebook $nb text="\r\r**User Procedures (files)**\r" 
     625        Notebook $nb text="\r\r**(Application) User Procedures (files)**\r" 
    622626        NewPath /Q/O UPPath, igorPathStr+"User Procedures:" 
    623627        //files 
     
    627631 
    628632        //folders 
    629         Notebook $nb text="\r**User Procedures (folders)**\r" 
     633        Notebook $nb text="\r**(Application) User Procedures (folders)**\r" 
    630634        strFileList = IndexedDir(UPPath, -1, 0 ) 
    631635        textStr = ReplaceString(";", strFileList, "\r") 
     
    638642// - then the path is "in use" and can't be killed... 
    639643// 
    640         Notebook $nb text="\r\r**Igor Procedures (files)**\r" 
     644        Notebook $nb text="\r\r**(Application) Igor Procedures (files)**\r" 
    641645        NewPath /Q/O IgorProcPath, igorPathStr+"Igor Procedures:" 
    642646 
     
    647651 
    648652        //folders 
    649         Notebook $nb text="\r**Igor Procedures (folders)**\r" 
     653        Notebook $nb text="\r**(Application) Igor Procedures (folders)**\r" 
    650654        strFileList = IndexedDir(IgorProcPath, -1, 0 ) 
    651655        textStr = ReplaceString(";", strFileList, "\r") 
    652656        Notebook $nb text=textStr+"\r" 
    653 // 
     657         
     658//////////////////////////       
     659 
     660         
     661// NOW - look in the local Special Path where all is installed 
     662// what is the listing of the Igor Extensions 
     663        Notebook $nb text="\r\r**(LOCAL) Igor Extensions (files)**\r" 
     664        NewPath /Q/O ExPath, SpecialDirPath("Igor Pro User Files",0,0,0)+"Igor Extensions:" 
     665         
     666        //files 
     667        strFileList = IndexedFile(ExPath, -1, "????" ) 
     668        textStr = ReplaceString(";", strFileList, "\r") 
     669        Notebook $nb text=textStr 
     670 
     671        //folders 
     672        Notebook $nb text="\r**(LOCAL) Igor Extensions (folders)**\r" 
     673        strFileList = IndexedDir(ExPath, -1, 0 ) 
     674        textStr = ReplaceString(";", strFileList, "\r") 
     675        Notebook $nb text=textStr+"\r" 
     676 
     677 
     678// what is the listing of Igor Help files 
     679        Notebook $nb text="\r\r**(LOCAL) Igor Help (files)**\r" 
     680        NewPath /Q/O IHPath, SpecialDirPath("Igor Pro User Files",0,0,0)+"Igor Help Files:" 
     681 
     682        //files 
     683        strFileList = IndexedFile(IHPath, -1, "????" ) 
     684        textStr = ReplaceString(";", strFileList, "\r") 
     685        Notebook $nb text=textStr 
     686 
     687        //folders 
     688        Notebook $nb text="\r**(LOCAL) Igor Help (folders)**\r" 
     689        strFileList = IndexedDir(IHPath, -1, 0 ) 
     690        textStr = ReplaceString(";", strFileList, "\r") 
     691        Notebook $nb text=textStr+"\r" 
     692         
     693         
     694// what is the listing of the User Procedures 
     695        Notebook $nb text="\r\r**(LOCAL) User Procedures (files)**\r" 
     696        NewPath /Q/O UPPath, SpecialDirPath("Igor Pro User Files",0,0,0)+"User Procedures:" 
     697        //files 
     698        strFileList = IndexedFile(UPPath, -1, "????" ) 
     699        textStr = ReplaceString(";", strFileList, "\r") 
     700        Notebook $nb text=textStr 
     701 
     702        //folders 
     703        Notebook $nb text="\r**(LOCAL) User Procedures (folders)**\r" 
     704        strFileList = IndexedDir(UPPath, -1, 0 ) 
     705        textStr = ReplaceString(";", strFileList, "\r") 
     706        Notebook $nb text=textStr+"\r" 
     707         
     708// what is the listing of the Igor Procedures 
     709 
     710//  generating a path for this seems to be problematic - since it can't be killed , or found on another computer 
     711// that is (apparently) because if there is anything included from the IgP folder (and there is on even the default installation) 
     712// - then the path is "in use" and can't be killed... 
     713// 
     714        Notebook $nb text="\r\r**(LOCAL) Igor Procedures (files)**\r" 
     715        NewPath /Q/O IgorProcPath, SpecialDirPath("Igor Pro User Files",0,0,0)+"Igor Procedures:" 
     716 
     717        //files 
     718        strFileList = IndexedFile(IgorProcPath, -1, "????" ) 
     719        textStr = ReplaceString(";", strFileList, "\r") 
     720        Notebook $nb text=textStr 
     721 
     722        //folders 
     723        Notebook $nb text="\r**(LOCAL) Igor Procedures (folders)**\r" 
     724        strFileList = IndexedDir(IgorProcPath, -1, 0 ) 
     725        textStr = ReplaceString(";", strFileList, "\r") 
     726        Notebook $nb text=textStr+"\r" 
     727         
     728                 
     729         
     730// 
     731// 
     732// -- 2014 -- files are always copied from the installer to the install location, so 
     733// there will always be a copy remaining with the installer (so it can be re-run multiple times) without error 
    654734// 
    655735        // then get a listing of the "home" directory. If files were not moved properly, they will still be here 
    656         Notebook $nb text="\r\r**Home (files)**\r" 
     736//      Notebook $nb text="\r\r**Home (files)**\r" 
    657737//      NewPath /Q/O IgorProcPath, igorPathStr+"Igor Procedures:" 
    658738 
    659739        //files 
    660         strFileList = IndexedFile(home, -1, "????" ) 
    661         textStr = ReplaceString(";", strFileList, "\r") 
    662         Notebook $nb text=textStr 
     740//      strFileList = IndexedFile(home, -1, "????" ) 
     741//      textStr = ReplaceString(";", strFileList, "\r") 
     742//      Notebook $nb text=textStr 
    663743 
    664744        //folders 
    665         Notebook $nb text="\r**Home (folders)**\r" 
    666         strFileList = IndexedDir(home, -1, 0 ) 
    667         textStr = ReplaceString(";", strFileList, "\r") 
    668         Notebook $nb text=textStr+"\r" 
     745//      Notebook $nb text="\r**Home (folders)**\r" 
     746//      strFileList = IndexedDir(home, -1, 0 ) 
     747//      textStr = ReplaceString(";", strFileList, "\r") 
     748//      Notebook $nb text=textStr+"\r" 
    669749         
    670750        //move to the beginning of the notebook 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtils2D_v40.ipf

    r925 r927  
    10471047//EndMacro 
    10481048 
    1049  
     1049// NaN or zero == value not used 
     1050// any non-zero data == value used for fit (I use 1) 
    10501051Function MakeBSMask(mask,rad) 
    10511052        Wave mask 
Note: See TracChangeset for help on using the changeset viewer.