Changeset 3779

Timestamp:

Jan 11, 2019 12:58:31 PM (5 years ago)

Author:

vondreele

Message:

fix problems with image sum
fix problem with samplechangerpos

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (6 diffs)
• GSASIIimgGUI.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -3196 +3196 @@
                 if self.dataType == 'PWDR':
                     self.dataGridSizer.Add(self.Avg,0,wx.RIGHT,10)
-                self.dataGridSizer.Add(wx.StaticText(self.panel,-1,' Result name: '+self.dataType),1,
+                self.dataGridSizer.Add(wx.StaticText(self.panel,-1,' Result type: '+self.dataType),1,
                     wx.LEFT|wx.ALIGN_CENTER_VERTICAL,1)
-                self.name = G2G.ValidatedTxtCtrl(self.panel,self.data,-1,size=wx.Size(300,20))
-                self.dataGridSizer.Add(self.name,0,wx.RIGHT|wx.TOP,10)
             mainSizer.Add(self.dataGridSizer,0,wx.EXPAND)
+            self.name = G2G.ValidatedTxtCtrl(self.panel,self.data,-1,size=wx.Size(300,20))
+            mainSizer.Add(self.name,0,wx.RIGHT|wx.TOP,10)
             self.OkBtn = wx.Button(self.panel,-1,"Ok")
             self.OkBtn.Bind(wx.EVT_BUTTON, self.OnOk)
@@ -3243 +3243 @@
                 self.selectVals = ChoiceVals
             else:
-                self.selectData = copy.copy(self.data[:-1])
+#                self.selectData = copy.copy(self.data[:-1])
                 self.selectVals = len(self.data)*[0.0,]
             wx.CallAfter(self.Draw)
             
+        def GetData(self):
+            if self.dataType == 'PWDR':
+                return self.selectData+[self.data[-1],],self.result
+            else:
+                return self.selectData+[self.data[-1],],self.selectVals
+                        
         def onChar(self,event):
             'Respond to keyboard events in the Filter box'
@@ -3287 +3293 @@
                     if lenX:
                         if lenX != len(x):
-                            self.ErrorDialog('Data length error','Data to be summed must have same number of points'+
+                            self.GetParent().ErrorDialog('Data length error','Data to be summed must have same number of points'+
                                 '\nExpected:'+str(lenX)+
                                 '\nFound:   '+str(len(x))+'\nfor '+name)
@@ -3295 +3301 @@
                     if Xminmax[1]:
                         if Xminmax != [x[0],x[-1]]:
-                            self.ErrorDialog('Data range error','Data to be summed must span same range'+
+                            self.GetParent().ErrorDialog('Data range error','Data to be summed must span same range'+
                                 '\nExpected:'+str(Xminmax[0])+' '+str(Xminmax[1])+
                                 '\nFound:   '+str(x[0])+' '+str(x[-1])+'\nfor '+name)
@@ -3344 +3350 @@
             self.EndModal(wx.ID_CANCEL)              
             
-        def GetData(self):
-            if self.dataType == 'PWDR':
-                return self.selectData+[self.data[-1],],self.result
-            else:
-                return self.selectData+[self.data[-1],],self.selectVals
-                        
     def OnPwdrSum(self,event):
         'Sum or Average together powder data(?)'
@@ -3446 +3446 @@
                     First = True
                     Found = False
-                    for i,name in enumerate(result[:-1]):
-                        scale = scales[i]
+                    for name,scale in zip(result,scales):
                         if scale:
                             Found = True                                
                             Comments.append("%10.3f %s" % (scale,' * '+name))
+                            i = TextList.index(name)
                             Npix,imagefile,imagetag = DataList[i]
                             imagefile = G2IO.GetCheckImageFile(self,IdList[i])[1]

trunk/GSASIIimgGUI.py

@@ -141 +141 @@
         min=0.,max=1.,typeHint=float),0,WACV)
     mainSizer.Add(distSizer,0)
-    if 'samplechangerpos' not in data:
+    if 'samplechangerpos' not in data or data['samplechangerpos'] is None:
         data['samplechangerpos'] = 0.0
     mainSizer.Add(wx.StaticText(G2frame.dataWindow,label='Sample changer position %.2f mm'%data['samplechangerpos']),0,WACV)