Changeset 384 for sans/Dev/trunk/NCNR_User_Procedures/SANS

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/NCNR_User_Procedures/SANS/Analysis/Models/Packages

Files:

• FilesToRemove++.itx (modified) (1 diff)
• NCNR_Install.ipf (modified) (3 diffs)
• Wrapper_v40.ipf (modified) (4 diffs)

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)