Changeset 5394

Timestamp:

Nov 21, 2022 11:16:11 AM (4 months ago)

Author:

toby

Message:

add G2 version in browse; new allowed numpy array in .gpx

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIctrlGUI.py (modified) (2 diffs)

trunk/GSASIIIO.py

@@ -580 +580 @@
     return
 
-objectScanIgnore = [int,bool,float,str,np.float64,np.float32,np.int32,np.int64,np.ndarray,G2obj.G2VarObj,G2obj.ExpressionObj]
+objectScanIgnore = [int,bool,float,str,np.float64,np.float32,np.int32,np.int64,np.ndarray,G2obj.G2VarObj,G2obj.ExpressionObj,np.bool_]
 try:
     objectScanIgnore += [ma.MaskedArray] # fails in doc builds

trunk/GSASIIctrlGUI.py

@@ -8527 +8527 @@
             if datum[0] == 'Notebook':
                 result[datum[0]] = datum[1][-1]
+            elif 'Controls' in datum[0]:
+#                datum[0]['Seq Data']
+                if 'LastSavedUsing' in datum[1]:
+                    result['last saved'] += ' (v' + datum[1]['LastSavedUsing'] +')'
+                    
             elif datum[0] == 'Covariance':
                 d = datum[1].get('Rvals')
@@ -8552 +8557 @@
             elif datum[0] == 'Sequential results':
                 note = 'Sequential results'
-#            elif 'Controls' in datum[0]:
-#                datum[0]['Seq Data']
             elif datum[0] in ('Constraints','Restraints','Rigid bodies'):
                 pass