Changeset 4909

Timestamp:

May 19, 2021 9:32:00 PM (3 years ago)

Author:

toby

Message:

fix CIF exports

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (1 diff)
• exports/G2export_CIF.py (modified) (5 diffs)

trunk/GSASIIctrlGUI.py

@@ -1462 +1462 @@
                 if sizevals[i]: kargs['size']=sizevals[i]
             if CopyButton:
-                import wx.lib.colourselect as wscs  # is there a way to test? 
-                but = wscs.ColourSelect(label='v', # would like to use u'\u2193' or u'\u25BC' but not in WinXP
-                    parent=panel,colour=(255,255,200),size=wx.Size(30,23),
-                    style=wx.RAISED_BORDER)
-                but.Bind(wx.EVT_BUTTON, self._OnCopyButton)
-                if 'phoenix' in wx.version():
-                    but.SetToolTip('Press to copy adjacent value to all rows below')
+                if i+1 == len(dictlst):
+                    but = (-1,-1)
                 else:
-                    but.SetToolTipString('Press to copy adjacent value to all rows below')
-                self.ButtonIndex[but] = i
+                    import wx.lib.colourselect as wscs  # is there a way to test? 
+                    but = wscs.ColourSelect(label='v', # would like to use u'\u2193' or u'\u25BC' but not in WinXP
+                                            parent=panel,colour=(255,255,200),size=wx.Size(30,23),
+                                            style=wx.RAISED_BORDER)
+                    but.Bind(wx.EVT_BUTTON, self._OnCopyButton)
+                    if 'phoenix' in wx.version():
+                        but.SetToolTip('Press to copy adjacent value to all rows below')
+                    else:
+                        but.SetToolTipString('Press to copy adjacent value to all rows below')
+                    self.ButtonIndex[but] = i
                 subSizer.Add(but)
             # create the validated TextCrtl, store it and add it to the sizer

trunk/exports/G2export_CIF.py

@@ -1312 +1312 @@
                     pass
                 WriteCIFitem(self.fp,"_cell_measurement_temperature",T)
-                for h in phasedict['Histograms']:
+                for h in self.Histograms:
                     if self.Histograms[h]['ranId'] == hRanId:
                         pId = phasedict['pId']
@@ -1737 +1737 @@
                         s = ""
                     elif zero:
-                        s = PutInCol(G2mth.ValEsd(x.data-zero,-0.00009),10)
+                        s = PutInCol(G2mth.ValEsd(x-zero,-0.00009),10)
                     else:
-                        s = PutInCol(G2mth.ValEsd(x.data,-0.00009),10)
+                        s = PutInCol(G2mth.ValEsd(x,-0.00009),10)
                     s += PutInCol(Yfmt(ndec,yobs),12)
                     s += PutInCol(Yfmt(ndec,ycalc),12)
@@ -2193 +2193 @@
         self.CIFname = s
         
-        self.InitExport(event)
-        # load all of the tree into a set of dicts
-        self.loadTree()
-        # load saved CIF author name
-        self.author = self.OverallParms['Controls'].get("Author",'?').strip()
-        # initialize dict for Selection of Hist for unit cell reporting
-        self.OverallParms['Controls']['CellHistSelection'] = self.OverallParms[
-            'Controls'].get('CellHistSelection',{})
-        self.CellHistSelection = self.OverallParms['Controls']['CellHistSelection']
         #=================================================================
         # write quick CIFs
@@ -2236 +2227 @@
         # the export process for a full CIF starts here
         #===============================================================================
+        # load saved CIF author name
+        self.author = self.OverallParms['Controls'].get("Author",'?').strip()
+        # initialize dict for Selection of Hist for unit cell reporting
+        self.OverallParms['Controls']['CellHistSelection'] = self.OverallParms[
+            'Controls'].get('CellHistSelection',{})
+        self.CellHistSelection = self.OverallParms['Controls']['CellHistSelection']
         # create a dict with refined values and their uncertainties
         self.loadParmDict()
@@ -2607 +2604 @@
 
     def Exporter(self,event=None):
+        self.InitExport(event)
+        # load all of the tree into a set of dicts
+        self.loadTree()
         self._Exporter(event=event)
         self.CloseFile()