Changeset 388 for sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis

Timestamp:

Jun 19, 2008 3:10:46 PM (15 years ago)

Author:

srkline

Message:

Last minute tweaks before summer school

File:

• sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/NCNR_Install.ipf (modified) (4 diffs)

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

@@ -10 +10 @@
 // - lots more diagnostics added
 
-Function InstallNCNRMacros()
+Function InstallNCNRMacros(forceInstall)
+        Variable forceInstall           // if == 1, install whatever possible, even if R/W errors from the OS
 
         //first step, check for Igor 6!!!
@@ -44 +45 @@
         endif
         
-        if(UP_err != 0 || IH_err != 0 || IE_err != 0)
-                alertStr += "You will need to install manually."
-                DoAlert 0,alertStr
-                return(0)
+        if(forceInstall == 0)
+                if(UP_err != 0 || IH_err != 0 || IE_err != 0)
+                        alertStr += "You will need to install manually."
+                        DoAlert 0,alertStr
+                        return(0)
+                endif
         endif
         
@@ -263 +266 @@
                 case 2: // mouse up
                         // click code here
-                        InstallNCNRMacros()
+                        InstallNCNRMacros(0)
                         break
         endswitch
@@ -553 +556 @@
         return(V_flag)
 end
+
+// this will "force" an install, even if there are R/W errors
+Macro ForceInstall()
+
+        Execute "InstallNCNRMacros(1)"
+end