Changeset 2018

Timestamp:

Oct 20, 2015 11:37:34 AM (7 years ago)

Author:

toby

Message:

fix export bugs; prevent exception if Cancel is used when locating a missing image

Location:

trunk

Files:

• GSASIIplot.py (modified) (1 diff)
• exports/G2export_FIT2D.py (modified) (2 diffs)
• exports/G2export_pwdr.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -3526 +3526 @@
     '''
     plotNo = G2frame.G2plotNB.nb.GetSelection()
+    if plotNo < 0: return # no plots
     if G2frame.G2plotNB.nb.GetPageText(plotNo) == '2D Powder Image':
         PlotImage(G2frame,newPlot,event,newImage=True)

trunk/exports/G2export_FIT2D.py

@@ -25 +25 @@
 import GSASIIpwd as G2pwd
 
-class ExportPowderCSV(G2IO.ExportBaseclass):
-    '''Used to create a csv file for a powder data set
+class ExportPowderCHI(G2IO.ExportBaseclass):
+    '''Used to create a CHI file for a powder data set
 
     :param wx.Frame G2frame: reference to main GSAS-II frame
@@ -43 +43 @@
         self.OpenFile(filename)
         histblk = self.Histograms[TreeName]
-        self.Write(os.path.split(self.fullpath)[1])
+        self.Write(str(TreeName)[5:]) # drop 'PWDR '
         self.Write("2-Theta Angle (Degrees)")
         self.Write("Intensity")

trunk/exports/G2export_pwdr.py

@@ -106 +106 @@
                 self.filename= os.path.splitext(self.filename)[0] + self.extension
 
-            prmname = self.WriteInstFile(TreeName,histblk['Instrument Parameters'][0])
+            histblk = self.Histograms[hist]
+            prmname = self.WriteInstFile(hist,histblk['Instrument Parameters'][0])
             self.Writer(hist,prmname=prmname)
             print('Histogram '+str(hist)+' written to file '+str(self.fullpath))