Changeset 2929 for branch

Timestamp:

Jul 12, 2017 1:09:37 PM (6 years ago)

Author:

toby

Message:

fix seq. ref. window; screen positioning bug; read of multiple data files after use of defaults parms

File:

• branch/2frame/GSASIIdataGUI.py (modified) (5 diffs)

branch/2frame/GSASIIdataGUI.py

@@ -1822 +1822 @@
 #        lastVals = []
         self.EnablePlot = False
+        Iparms = {}
         for rd in rdlist:
             if 'Instrument Parameters' in rd.pwdparms:
                 Iparm1,Iparm2 = rd.pwdparms['Instrument Parameters']
+            elif Iparms and not lastIparmfile:
+                Iparm1,Iparm2 = Iparms
             else:
                 # get instrument parameters for each dataset, unless already set
@@ -1837 +1840 @@
                 if rd.repeat_instparm: 
                     lastIparmfile = rd.instfile
+                else:
+                    Iparms = {}
 #                    lastVals = (rd.powderdata[0].min(),rd.powderdata[0].max(),len(rd.powderdata[0]))
                 # override any keys in read instrument parameters with ones set in import
@@ -2875 +2880 @@
         self.G2plotNB = G2plt.G2PlotNoteBook(self.plotFrame,G2frame=self)
         self.plotFrame.Show()
-        
-        main_pos = eval(GSASIIpath.GetConfigValue('Main_Pos'))
-        self.SetPosition(main_pos)
+
+        try:
+            main_pos = eval(GSASIIpath.GetConfigValue('Main_Pos'))
+            self.SetPosition(main_pos)
+        except:
+            if GSASIIpath.GetConfigValue('Main_Pos'):
+                print('Value for config Main_Pos {} is invalid'.format(GSASIIpath.GetConfigValue('Main_Pos')))
 #        if not self.IsShownOnScreen():
 #            self.Centre()
-        plot_pos = eval(GSASIIpath.GetConfigValue('Plot_Pos'))
-        self.plotFrame.SetPosition(plot_pos)
+        try:
+            plot_pos = eval(GSASIIpath.GetConfigValue('Plot_Pos'))
+            self.plotFrame.SetPosition(plot_pos)
+        except:
+            if GSASIIpath.GetConfigValue('Plot_Pos'):
+                print('Value for config Plot_Pos {} is invalid'.format(GSASIIpath.GetConfigValue('Plot_Pos')))
 #        if not self.plotFrame.IsShownOnScreen():
 #            self.plotFrame.Centre()
@@ -7295 +7308 @@
             del G2frame.colSigs[l]
 
+    G2frame.dataWindow.ClearData()
     G2frame.dataWindow.currentGrids = []
     G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataWindow)
@@ -7321 +7335 @@
                 G2frame.dataDisplay.SetCellStyle(row,deltaChiCol,color=wx.Colour(255,255,0))
     G2frame.dataDisplay.InstallGridToolTip(GridSetToolTip,GridColLblToolTip)
-    G2frame.dataDisplay.SendSizeEvent() # resize needed on mac
-    G2frame.dataDisplay.Refresh() # shows colored text on mac
+    #G2frame.dataDisplay.SendSizeEvent() # resize needed on mac
+    #G2frame.dataDisplay.Refresh() # shows colored text on mac
+    G2frame.dataWindow.SetDataSize()
     
 ################################################################################