Changeset 1001 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf

Timestamp:

Jun 10, 2016 3:40:55 PM (7 years ago)

Author:

srkline

Message:

A number of simple fixes to make the macros compatible with Igor 7, and in some places back-compatible with Igor 6. There were only a few instances where the IgorVersion? was checked, so it does not caues a huge disruption.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf

@@ -56 +56 @@
         
         if(cmpstr("Macintosh",IgorInfo(2)) == 0)
-                String/G root:Packages:NIST:gAngstStr = num2char(-127)
+                if(IgorVersion() >= 7)
+                        String/G root:Packages:NIST:gAngstStr = num2char(8491)
+                else
+                        String/G root:Packages:NIST:gAngstStr = num2char(-127)
+                endif
 //              Variable/G root:myGlobals:gIsMac = 1
         else
                 //either Windows or Windows NT
-                String/G root:Packages:NIST:gAngstStr = num2char(-59)
+                if(IgorVersion() >= 7)
+                        String/G root:Packages:NIST:gAngstStr = num2char(8491)
+                else
+                        String/G root:Packages:NIST:gAngstStr = num2char(-59)
+                endif
 //              Variable/G root:myGlobals:gIsMac = 0
                 //SetIgorOption to keep some PC's (graphics cards?) from smoothing the 2D image