Changeset 4713

Timestamp:

Jan 4, 2021 4:08:43 PM (3 years ago)

Author:

toby

Message:

more installer work; xmgrace enhance from Carlo

Files:

• install/setversion.py (modified) (1 diff)
• trunk/GSASIIplot.py (modified) (1 diff)

install/setversion.py

@@ -68 +68 @@
         continue
     if sys.platform == "win32" and platform.architecture()[0] != '64bit':
-        print('changing for 32-bit windows')
-        out = out.replace('win-64','win-32')
-    if sys.platform.startswith("linux") and platform.architecture()[0] != '32bit':
-        print('changing for 32-bit linux')
-        out = out.replace('linux-64','linux-32')
+        if 'win-64' in out:
+            print('changing for 32-bit windows')
+            out = out.replace('win-64','win-32')
+    if sys.platform.startswith("linux") and platform.architecture()[0] != '64bit':
+        if 'linux-64' in out:
+            print('changing for 32-bit linux')
+            out = out.replace('linux-64','linux-32')
     out = out.replace('**pyversion**',pyversion)
     out = out.replace('**npversion**',npversion)

trunk/GSASIIplot.py

@@ -3678 +3678 @@
         fp.write('@{}axis ticklabel char size {}\n'.format('x',0)) # turns off axis labels
         if 'sqrt' in Plot.yaxis.get_label().get_text():
-            ylbl = 'sqrt(Intensity)' # perhaps there is a way to get the symbol in xmgrace but I did not find it
+            #ylbl = 'sqrt(Intensity)' # perhaps there is a way to get the symbol in xmgrace but I did not find it
+            ylbl = r'\x\#{d6}\f{}\oIntensity\O' # from Carlo Segre
         else:
             ylbl = 'Intensity'