Changeset 3427

Timestamp:

Jun 10, 2018 3:17:30 PM (5 years ago)

Author:

toby

Message:

fix minor bugs

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIrestrGUI.py (modified) (1 diff)

trunk/GSASIIIO.py

@@ -564 +564 @@
     return
 
-objectScanIgnore = [int,bool,float,str,np.float64,np.ndarray]
+objectScanIgnore = [int,bool,float,str,long,np.float64,np.ndarray,G2obj.G2VarObj]
 if '2' in platform.python_version_tuple()[0]:
     objectScanIgnore += [unicode,]

trunk/GSASIIdataGUI.py

@@ -2739 +2739 @@
             self.dirname = os.path.abspath(os.path.dirname(arg[1]))
             if self.dirname:
+                self.GSASprojectfile = os.path.split(self.GSASprojectfile)[1]
                 os.chdir(self.dirname)
                 self.LastGPXdir = self.dirname

trunk/GSASIIrestrGUI.py

@@ -783 +783 @@
             if len(ids) > 0:
                 value = 1.0
-                dlg = G2G.SingleFloatDialog(G2frame,'Angle','Enter unit cell sum ',value,[-1.e6,1.e6],'%.2f')
+                dlg = G2G.SingleFloatDialog(G2frame,'Cell sum','Enter unit cell sum ',value,[-1.e6,1.e6],'%.2f')
                 if dlg.ShowModal() == wx.ID_OK:
                     value = dlg.GetValue()