Changeset 384 for sans/Dev

Timestamp:

Jun 12, 2008 2:56:20 PM (15 years ago)

Author:

srkline

Message:

New install instructions, for manual install

New diagnostics in the installer that check to see if proper permissions exist, and suggest manual instll if not OK.

Wrapper now behaves better when new data files are loaded, selecting and "popping" the new file in the dataSet popup. also some better behvior if useCursors is checked.

Location:

sans/Dev/trunk

Files:

• Install_Instructions.txt (modified) (3 diffs)
• NCNR_Install_or_Update.pxp (modified) (previous)
• NCNR_User_Procedures/InstalledVersion.txt (modified) (2 diffs)
• NCNR_User_Procedures/SANS/Analysis/Models/Packages/FilesToRemove++.itx (modified) (1 diff)
• NCNR_User_Procedures/SANS/Analysis/Models/Packages/NCNR_Install.ipf (modified) (3 diffs)
• NCNR_User_Procedures/SANS/Analysis/Models/Packages/Wrapper_v40.ipf (modified) (4 diffs)

sans/Dev/trunk/Install_Instructions.txt

@@ -3 +3 @@
 (1) - Unzip the downloaded package
 (2) - Double click on the NCNR_Install_or_Update.pxp experiment
-(3) - If there are any help files open, you will be asked to close them. NOTE: be
-        sure to hold down the option (or alt) key when closing them to kill them
-        not just hide them.
+(3) - If there are any help files open, you will be asked to close them. NOTE: be sure to hold down the option (or alt) key when closing them to kill them, not just hide them.
 (4) - Click on "Install SANS Macros"
-(5) - When the installer is finished, you will be asked to Quit Igor (yes, do it,
-        and save changes to the experiment.)
+(5) - When the installer is finished, you will be asked to Quit Igor (yes, do it, and save changes to the experiment.)
+(6) - If you were informed that some folders did not have proper permissions, skip down to the section for "Manual Install"
 
-- SANS_Reduction, USANS_Reduction, and Analysis templates are located in the same
-folder as the installer (these are the starting points)
+- SANS_Reduction, USANS_Reduction, and Analysis templates are located in the same folder as the installer (these are the starting points)
 - Example data for reduction and analysis are in NCNR_SANS_Utilities
-- A folder with instructions and a template for writing your own analysis function
-is included (Single_Model_Template)
-- Help files are integral to each template. Open any of the templates and click
-on "Help" or "?" from any of the panels to view the help files.
-- Any previous installations, including any files you may have modified are moved
-to the NCNR_Moved_Files folder. Look in here for anything that you may want to 
-save. 
-
+- A folder with instructions and a template for writing your own analysis function is included (Single_Model_Template)
+- Help files are integral to each template. Open any of the templates and click on "Help" or "?" from any of the panels to view the help files.
+- Any previous installations, including any files you may have modified are moved to the NCNR_Moved_Files folder. Look in here for anything that you may want to save. 
 
 
@@ -27 +19 @@
 (1) - double click on the NCNR_Install_or_Update.pxp experiment
 (2) - Click on "Check for Updates"
-(3) - The updater will check the version installed versus the version available
-on the NCNR website. If your version is out-of-date, you will be sent to the NCNR
-website.
-(4) If you need to update, download the current version (.zip), and run the installer
-as in the first step.
-
-
+(3) - The updater will check the version installed versus the version available on the NCNR website. If your version is out-of-date, you will be sent to the NCNR website.
+(4) If you need to update, download the current version (.zip), and run the installer as in the first step.
 
 
@@ -40 +27 @@
 (1) - double click on the NCNR_Install_or_Update.pxp experiment
 (2) - Click on "Print Diagnostics"
-(3) - Select and copy the entire contents of the notebook of diagnostics, and
-paste it into an e-mail.
+(3) - Select and copy the entire contents of the notebook of diagnostics, and paste it into an e-mail.
+
+
+-------------------------------------------------------------------
+*** Manual Install of the NCNR SANS/USANS Procedures ***
+-------------------------------------------------------------------
+
+If you were directed by the installer to perform a manual install, it is most likely because you do not have the proper permissions to copy the files into the necessary subfolders of the Igor Pro application folder.
+
+-------------------
+First, if possible, contact your system administrator. See if it is possible to grant you full read/write access to these three folders:
+
+(on Windows)
+/Program Files/WaveMetrics/Igor Pro/Igor Help Files
+/Program Files/WaveMetrics/Igor Pro/Igor Extensions
+/Program Files/WaveMetrics/Igor Pro/User Procedures
+
+(on Mac OSX)
+/Applications/Igor Pro/Igor Help Files
+/Applications/Igor Pro/Igor Extensions
+/Applications/Igor Pro/User Procedures
+
+If you or someone can reset the permissions on these folders so you can read and write, then re-run the installer, and it should work correctly without errors.
+
+
+If you can't get full permissions, you may still be able to use the macros. You must have at a minimum, permission to install in /User Procedures. If you can't get permission to install into /Igor Help Files, you can still open the help files manually as needed. If you can't get permission to install into /Igor Extensions, your calculations will be much slower, and you will not have access to any of the 2D analysis functions.
+
+------------------
+
+If you want to move the files and folders by hand, follow these steps, skipping those operations that you do not have permission to do:
+
+(0) Quit Igor, if it is open.
+
+(1) Clean out ALL of the older versions of the NCNR macros from the User Procedures folder. Move them to the trash/recycle, and be sure to EMPTY the trash/recycle. The files to remove will have a variety of names. See the listing at the bottom of this file.
+
+(2) Clean out all of the older versions of the NCNR Help Files from the Igor Help Files folder. Move them to the trash/recycle, and be sure to EMPTY the trash/recycle. Again, see the listing of possible names at the bottom of this file.
+
+(3) Clean out all of the older versions of the NCNR Extensions from the Igor Extensions folder. Move them to the trash/recycle, and be sure to EMPTY the trash/recycle. Again, see the listing of possible names at the bottom of this file.
+
+(4) From the downloaded package, move the entire folder NCNR_User_Procedures to the Igor Pro/User Procedures folder.
+
+(5) Move the entire folder NCNR_Help_Files to the Igor Pro/Igor Help Files folder.
+
+(6) In the NCNR_Extensions folder, move EITHER the Mac_XOP folder or the Win_XOP folder to Igor Pro/Igor Extensions, depending on your operating system. Delete the XOP for the platform that you are not using.
+
+(7) The NCNR_SANS_Utilities folder has the three templates for starting SANS or USANS Reduction experiment, and for an analysis experiment. If the templates open up correctly, you're likely OK. In this folder, there are also example data sets and a template for writing your own analysis model.
+
+
+-------------------
+"OLD" User Procedures could be any of the following:
+
+SANS_Reduction_v5.00
+SANS_Reduction_v5.0
+SANS Redn 28OCT03
+SANS Redn 18JUN04
+SANS Redn 23JAN04
+SANS Redn Beta
+SANS_Models_B 09MAY03
+SANS_Models (B)
+SANS_Models Beta
+SANS_Models Beta2
+SANS_Models_v3.00
+SANS_Models_v3.01
+USANS Procedures 13AUG02
+USANS_Procedures_14DEC04
+USANS_Procedures_15DEC05
+USANS Beta Procedures
+USANS Procedures v2.00
+USANS Procedures v2.20
+Put in User Procedures
+NCNR_User_Procedures
+NCNR_Extensions
+NCNR_Help_Files
+
+-------------------
+"OLD" Igor Help files could be any of the following:
+
+SANS_Reduction_Help_v5.ihf
+SANSReductionHelp_4p2.ihf
+SANS_Analysis_Docs_v3.00.ihf
+SANSAnalysisHelp(B).ihf
+SANS_Model_Docs_v3.00.ihf
+SANS_Model_Docs_v3.01.ihf
+USANSReductionHelp_v2.20.ihf
+USANSReductionHelp_v2.00.ihf
+USANSReductionHelp_v1.ihf
+SANS_Analysis_Docs_09JUN06.ihf
+SANS_Model_Docs_09JUN06.ihf
+Put in Igor Help Files
+NCNR_Help_Files
+
+-------------------
+"OLD" Igor Extensions could be any of the following:
+
+SANS_Analysis.xop
+NCNR_Extensions
+Mac_XOP
+Win_XOP
+-------------------
 
 
 
-May 2008 SRK
+
+June 2008 SRK

sans/Dev/trunk/NCNR_User_Procedures/InstalledVersion.txt

@@ -1 @@
-PACKAGE_VERSION=6.003;SANS_RED_VERSION=5.10;SANS_ANA_VERSION=4.00;USANS_RED_VERSION=2.21;
+PACKAGE_VERSION=6.004;SANS_RED_VERSION=5.10;SANS_ANA_VERSION=4.00;USANS_RED_VERSION=2.21;
 
 Only the first line of the file is read in.
@@ -6 +6 @@
 
 These are the current versions as of:
-29 MAY 2008 SRK
+11 JUN 2008 SRK
 

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/FilesToRemove++.itx

@@ -1 +1 @@
 IGOR
-WAVES/T IExtFolders     IExtFiles       IHFolders
+WAVES/T IExtFolders
 BEGIN
-        "Put in Igor Extensions"        "SANS_Analysis.xop"     "Put in Igor Help Files"
-        "NCNR_Extensions"       "NCNR_Extensions"       "NCNR_Help_Files"
+        "Put in Igor Extensions"
+        "NCNR_Extensions"
+        "Mac_XOP"
+        "Win_XOP"
 END
 X SetScale/P x 0,1,"", IExtFolders; SetScale y 0,0,"", IExtFolders
+
+WAVES/T IExtFiles       IHFolders
+BEGIN
+        "SANS_Analysis.xop"     "Put in Igor Help Files"
+        "NCNR_Extensions"       "NCNR_Help_Files"
+END
 X SetScale/P x 0,1,"", IExtFiles; SetScale y 0,0,"", IExtFiles
 X SetScale/P x 0,1,"", IHFolders; SetScale y 0,0,"", IHFolders

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/NCNR_Install.ipf

@@ -24 +24 @@
                 Abort "You've already run the installer. If you want to re-install, you'll need a fresh copy from the NCNR website."
         endif
+        
+        // check for install problems
+        // locked folders, OS errors _err will be non-zero if there is an error
+        Variable UP_err,IH_err,IE_err
+        UP_err = FolderPermissionCheck("User Procedures:")
+        IH_err = FolderPermissionCheck("Igor Help Files:")
+        IE_err = FolderPermissionCheck("Igor Extensions:")      
+//      Print UP_err,IH_err,IE_err
+
+        String alertStr=""
+        if(UP_err != 0)
+                alertStr += "User Procedures has no write permission.\r"
+        endif
+        if(IH_err != 0)
+                alertStr += "Igor Help Files has no write permission.\r"
+        endif
+        if(IE_err != 0)
+                alertStr += "Igor Extensions has no write permission.\r"
+        endif
+        
+        if(UP_err != 0 || IH_err != 0 || IE_err != 0)
+                alertStr += "You will need to install manually."
+                DoAlert 0,alertStr
+                return(0)
+        endif
+        
         
         // check the platform
@@ -319 +345 @@
         endif
         
+        // check for permissions
+        Variable UP_err,IH_err,IE_err
+        UP_err = FolderPermissionCheck("User Procedures:")
+        IH_err = FolderPermissionCheck("Igor Help Files:")
+        IE_err = FolderPermissionCheck("Igor Extensions:")
+        
+        Print UP_err,IH_err,IE_err
+        
+        String alertStr=""
+        if(UP_err != 0)
+                alertStr += "User Procedures has no write permission. Error = "+num2Str(UP_err)+"\r"
+        else
+                alertStr += "User Procedures permission is OK.\r"
+        endif
+        if(IH_err != 0)
+                alertStr += "Igor Help Files has no write permission. Error = "+num2Str(IH_err)+"\r"
+        else
+                alertStr += "Igor Help Files permission is OK.\r"
+        endif
+        if(IE_err != 0)
+                alertStr += "Igor Extensions has no write permission. Error = "+num2Str(IE_err)+"\r"
+        else
+                alertStr += "Igor Extensions permission is OK.\r"
+        endif
+        
+        if(UP_err != 0 || IH_err != 0 || IE_err != 0)
+                alertStr += "You will need to install manually."
+        endif
+        
+        Notebook $nb text="\r\r**Folder Permissions**\r"
+        Notebook $nb text=AlertStr +"\r"
+        
+        
         Notebook $nb text="\r\r**InstalledVersion.txt**\r"
         Notebook $nb text=textStr +"\r"
@@ -465 +524 @@
         return(0)
 End
+
+//check each of the three folders
+// folder string MUST have the trailing colon
+Function FolderPermissionCheck(folderStr)
+        String folderStr
+        Variable refnum
+        String str="delete me"
+        
+        String igorPathStr,resultStr=""
+        PathInfo Igor
+        igorPathStr = S_Path
+        
+        NewPath /Q/O tmpPath, igorPathStr+folderStr
+
+        
+        Open/Z/P=tmpPath refnum as "test.txt"
+        if(V_flag != 0)
+                return(V_flag)
+        else
+                FBinWrite refnum,str
+                Close refnum
+                
+//              Print "folder OK"
+                DeleteFile/Z/P=tmpPath  "test.txt"
+        endif
+        
+        
+        return(V_flag)
+end

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/Wrapper_v40.ipf

@@ -118 +118 @@
 
 
-//obvious use
+//obvious use, now finds the most recent data loaded, finds the folder, and pops the menu with that selection...
+//
 Function W_LoadDataButtonProc(ba) : ButtonControl
         STRUCT WMButtonAction &ba
@@ -130 +131 @@
                         endif
                         Execute "A_LoadOneDData()"
+                        
+                        ControlUpdate/W=WrapperPanel popup_0
+                        //instead of a simple controlUpdate, better to pop the menu to make sure that the other menus follow
+                        // convoluted method to find the right item and pop the menu.
+
+                        // data is plotted, so get the "new" top graph
+                        topGraph= WinName(0,1)  //this is the topmost graph, and should exist, but...
+                        if(cmpstr(topGraph,"")==0)
+                                return(0)
+                        endif
+                        String list,folderStr
+                        Variable num
+                        list = TraceNameList(topGraph,";",1)            //want the last item in the list
+                        num= ItemsInList(list)
+                        FolderStr = StringFromList(num-1,list,";")
+                        folderStr = folderStr[0,strlen(folderStr)-3]            //remove the "_i" that the loader enforced
+                        list = W_DataSetPopupList()
+                        num=WhichListItem(folderStr,list,";",0,0)
+                        if(num != -1)
+                                PopupMenu popup_0,mode=num+1,win=WrapperPanel
+                                ControlUpdate/W=WrapperPanel popup_0
+                                
+                                // fake mouse up
+                                Struct WMPopupAction ps
+                                ps.eventCode = 2                //fake mouse up
+        //                      ps.popStr = str
+                                DataSet_PopMenuProc(ps)
+                                
+                                // new data set has been selected, always uncheck the "use cursors", other checkboxes are benign.
+                                CheckBox check_0,win=WrapperPanel,value=0
+                        endif
                         break
         endswitch
 
-//      ControlUpdate/W=WrapperPanel popup_0
-        //instead of a simple controlUpdate, better to pop the menu to make sure that the other menus follow
-        // but not sure how to get the most recently loaded file as the selected item - bring the 
-        // wrapper panel back to the top - then pop - 
 
         return 0
@@ -398 +426 @@
 //                      print "str = ",str
                         //set the item in the coef popup, and pop it
-                        PopupMenu popup_2 mode=(num+1)
+                        PopupMenu popup_2 win=WrapperPanel,mode=(num+1)
                         
                         Struct WMPopupAction ps
@@ -1155 +1183 @@
         STRUCT WMCheckboxAction &cba
 
-        String topGraph= WinName(0,1)   //this is the topmost graph     
+        String topGraph= WinName(0,1)   //this is the topmost graph
+        if(cmpstr(topGraph,"")==0)      //no graphs, uncheck and exit
+                CheckBox check_0,value=0
+                return(0)
+        endif
+                
         String ciStr = CsrInfo(A , topGraph)