Changeset 2916 for branch

Timestamp:

Jul 7, 2017 3:17:52 PM (6 years ago)

Author:

toby

Message:

fix Add Peaks, etc.; document use of dataWindow

Location:

branch/2frame

Files:

• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)

branch/2frame/GSASIIdataGUI.py

@@ -3012 +3012 @@
         by G2frame.dataWindow.SetDataSize
         '''
+        # TOTO: diagnostic patch
+        print 'G2frame.SetDataSize called rather than dataWindow.SetDataSize'
+        G2obj.HowDidIgetHere(True)
         self.dataWindow.SetDataSize()
                                 
@@ -4652 +4655 @@
     the binding for the menus is done later in various GSASII*GUI modules,
     where the functions to be called are defined.
+
+    Use of the dataWindow scrolled panel
+    ====================================
+    
+    dataWindow has a “master” vertical BoxSizer: find it with
+    G2frame.dataWindow.GetSizer() and always use it. A call to
+    dataWindow.SetSizer() should not be needed. 
+
+    When placing a widget in the sizer that has its own scrolling
+    (e.g. G2G.GSNoteBook, anything else?) that one widget should be placed
+    in the sizer as
+
+         G2frame.dataWindow.GetSizer().Add(G2frame.<obj>,1,wx.ALL|wx.EXPAND)
+
+    [is wx.ALL superfluous here?] so that it consumes the full size of the
+    panel and so that the NoteBook widget does the scrolling.
+
+    For other uses, one will likely place a bunch of widgets and (other
+    [sub-]sizers) into the master sizer. In this case, DO NOT use wx.EXPAND,
+    as this will result in the widget resizing/repositioning as the window
+    resizes. Possible exceptions might be for widgets going into a fixed-size
+    panel that is inside the dataWindow (probably not being done). A call to
+    Sizer.Fit(dataWindow) will do bad things, though a call to
+    SubSizer.Fit(dataWindow.subpanel) could make sense.
+
+    Initial GUI draws to dataWindow will go through
+    GSASIIdataGUI.SelectDataTreeItem(), which is called after any changes to
+    data tree selection. SelectDataTreeItem places items in dataWindow or
+    calls that do that. Before it calls those routines, it calls 
+
+        G2frame.dataWindow.ClearData()
+
+    which deletes the contents of the master sizer. After the contents are
+    posted a call is made to 
+
+            G2frame.dataWindow.SetDataSize()
+
+    which repaints the window. For routines [such as GSASII.UpdatePeakGrid()]
+    that are called repeatedly to update the entire contents of dataWindow
+    themselves, it is important to add calls to 
+        G2frame.dataWindow.ClearData()
+    and
+            G2frame.dataWindow.SetDataSize()
+    at the beginning and end respectively to clear and refresh. This is not
+    needed for GSNoteBook repaints, which seem to be working mostly
+    automatically. If there is a problem, a call like 
+         wx.CallAfter(G2frame.phaseDisplay.SendSizeEvent)
+    might be needed. There are some calls to G2frame.dataWindow.SendSizeEvent()
+    that may be doing the same thing. 
     '''
     # TODO: debug code ######################################################################

branch/2frame/GSASIIpwdGUI.py

@@ -866 +866 @@
     for key in T: X.append(D[key])
     data['peaks'] = X
+    G2frame.dataWindow.ClearData()
     G2frame.GPXtree.SetItemPyData(G2frame.PickId,data)
     G2frame.PeakTable = G2G.Table(data['peaks'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
@@ -885 +886 @@
     mainSizer = G2frame.dataWindow.GetSizer()
     mainSizer.Add(reflGrid,1,wx.ALL|wx.EXPAND,1)
+    G2frame.dataWindow.SetDataSize()
 
 ################################################################################