Changeset 2416

Timestamp:

Aug 10, 2016 10:35:06 AM (7 years ago)

Author:

vondreele

Message:

fix issues with summing images & powder patterns - SumDialog? is now a scrolled window & image sum files now opened correctly after sum is finished

Location:

trunk

Files:

• GSASII.py (modified) (8 diffs)
• GSASIIctrls.py (modified) (1 diff)

trunk/GSASII.py

@@ -29 +29 @@
 import scipy as sp
 import wx
+import wx.lib.scrolledpanel as wxscroll
 try:  # patch for LANG environment var problem on occasional OSX machines
     import locale
@@ -2632 +2633 @@
         'Allows user to supply scale factor(s) when summing data'
         def __init__(self,parent,title,text,dataType,data):
-            wx.Dialog.__init__(self,parent,-1,title, 
-                pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE)
+            wx.Dialog.__init__(self,parent,-1,title,size=(400,250),
+                pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
             self.data = data
-            panel = wx.Panel(self)
+            size = (400,250)
+            panel = wxscroll.ScrolledPanel(self, wx.ID_ANY,size=size,
+                style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
             mainSizer = wx.BoxSizer(wx.VERTICAL)
             topLabl = wx.StaticText(panel,-1,text)
@@ -2643 +2646 @@
             dataGridSizer = wx.FlexGridSizer(cols=2,hgap=2,vgap=2)
             for id,item in enumerate(self.data[:-1]):
-                name = wx.TextCtrl(panel,-1,item[1],size=wx.Size(200,20))
+                name = wx.TextCtrl(panel,-1,item[1],size=wx.Size(300,20))
                 name.SetEditable(False)
                 scale = wx.TextCtrl(panel,id,'%.3f'%(item[0]),style=wx.TE_PROCESS_ENTER)
@@ -2653 +2656 @@
                 dataGridSizer.Add(wx.StaticText(panel,-1,'Sum result name: '+dataType),0, \
                     wx.LEFT|wx.TOP|wx.ALIGN_CENTER_VERTICAL,10)
-                self.name = wx.TextCtrl(panel,-1,self.data[-1],size=wx.Size(200,20),style=wx.TE_PROCESS_ENTER)
+                self.name = wx.TextCtrl(panel,-1,self.data[-1],size=wx.Size(300,20),style=wx.TE_PROCESS_ENTER)
                 self.name.Bind(wx.EVT_TEXT_ENTER,self.OnNameChange)
                 self.name.Bind(wx.EVT_KILL_FOCUS,self.OnNameChange)
@@ -2669 +2672 @@
             btnSizer.Add((20,20),1)
             
+            panel.SetSizer(mainSizer)
+            panel.SetAutoLayout(1)
+            panel.SetupScrolling()
             mainSizer.Add(btnSizer,0,wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
             panel.SetSizer(mainSizer)
@@ -2805 +2811 @@
 
     def OnImageSum(self,event):
-        'Sum together image data(?)'
+        'Sum together image data'
         TextList = []
         DataList = []
@@ -2875 +2881 @@
                     if Id:
                         pth = G2G.GetExportPath(self)
-                        dlg = wx.FileDialog(self, 'Choose sum image filename', pth, '', 
+                        dlg = wx.FileDialog(self, 'Choose sum image filename', pth,outname.split('IMG ')[1], 
                             'G2img files (*.G2img)|*.G2img', 
                             wx.SAVE|wx.FD_OVERWRITE_PROMPT)
@@ -2890 +2896 @@
                         if self.imageDefault:
                             Data = copy.copy(self.imageDefault)
+                        Data['formatName'] = 'GSAS-II image'
                         Data['showLines'] = True
                         Data['ring'] = []

trunk/GSASIIctrls.py

@@ -1151 +1151 @@
                 if sizevals[i]: kargs['size']=sizevals[i]
             if CopyButton:
-                import wx.lib.colourselect as wscs
+                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
-                                        # is there a way to test? 
-                                        parent=panel,
-                                        colour=(255,255,200),
-                                        size=wx.Size(30,23),
-                                        style=wx.RAISED_BORDER)
+                    parent=panel,colour=(255,255,200),size=wx.Size(30,23),
+                    style=wx.RAISED_BORDER)
                 but.Bind(wx.EVT_BUTTON, self._OnCopyButton)
                 but.SetToolTipString('Press to copy adjacent value to all rows below')