Changeset 2246

Timestamp:

May 10, 2016 9:51:51 AM (6 years ago)

Author:

vondreele

Message:

trap another Id=0 problem after Refine finishes (G2.py)
rearrange routines in G2plot; refactor OnPageChanged? to allow (currently commented out) diagnostic prints. "fix" flashing problem by commenting out self.skipPageChange = False line.

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASII.py

@@ -3680 +3680 @@
                         Id = G2gd.GetPatternTreeItemId(self, Id, txt)
                     self.PickIdText = None  #force reload of page
-                    self.PickId = Id
-                    self.PatternTree.SelectItem(Id)
-                    G2gd.MovePatternTreeToGrid(self,Id) # reload current tree item, should update current plot
+                    if Id:
+                        self.PickId = Id
+                        self.PatternTree.SelectItem(Id)
+                        G2gd.MovePatternTreeToGrid(self,Id) # reload current tree item, should update current plot
             finally:
                 dlg2.Destroy()

trunk/GSASIIplot.py

@@ -190 +190 @@
             self.treeItem[plotLabel][1] = self.G2frame.dataDisplayPhaseText
                 
-    def RaisePageNoRefresh(self,Page):
-        'Raises a plot tab without triggering a refresh via OnPageChanged'
-        self.skipPageChange = True
-        Page.SetFocus()
-        self.skipPageChange = False
-        
-    def SetSelectionNoRefresh(self,plotNum): 
-        'Raises a plot tab without triggering a refresh via OnPageChanged' 
-        self.skipPageChange = True
-        self.nb.SetSelection(plotNum) # raises plot tab 
-        Page = self.G2frame.G2plotNB.nb.GetPage(plotNum)
-        Page.SetFocus()
-        self.skipPageChange = False 
-                                 
     def addMpl(self,name=""):
         'Add a tabbed page with a matplotlib plot'
@@ -252 +238 @@
             return      
         
+    def RaisePageNoRefresh(self,Page):
+        'Raises a plot tab without triggering a refresh via OnPageChanged'
+#        print 'Raise',str(self).split('0x')[1]
+        self.skipPageChange = True
+        Page.SetFocus()
+        self.skipPageChange = False
+        
+    def SetSelectionNoRefresh(self,plotNum): 
+        'Raises a plot tab without triggering a refresh via OnPageChanged' 
+#        print 'Select',str(self).split('0x')[1]
+        self.skipPageChange = True
+        self.nb.SetSelection(plotNum) # raises plot tab 
+        Page = self.G2frame.G2plotNB.nb.GetPage(plotNum)
+        Page.SetFocus()
+        self.skipPageChange = False
+                                 
     def OnPageChanged(self,event):
         '''respond to someone pressing a tab on the plot window.
@@ -259 +261 @@
         repeated replotting.
         '''
+        tabLabel = event.GetEventObject().GetPageText(event.GetSelection())
+#        print 'PageChanged, self=',str(self).split('0x')[1],tabLabel,self.skipPageChange
+#        print 'event type=',event.GetEventType()
         self.status.DestroyChildren()    #get rid of special stuff on status bar
         self.status.SetFields(['',''])  # clear old status message
         self.status.SetStatusWidths([150,-1])
         if self.skipPageChange:
-            self.skipPageChange = False
+#            self.skipPageChange = False
+#            if tabLabel in self.treeItem:
+#                del self.treeItem[tabLabel]
             return
         page = self.panelList[self.nb.GetSelection()]   #GetCurrentPage() not in wx 2.7
-        tabLabel = event.GetEventObject().GetPageText(event.GetSelection())
         if tabLabel in self.treeItem:
             treeItems, tabname = self.treeItem[tabLabel]
-            id = self.G2frame.root
+            pid = self.G2frame.root
             for item in treeItems:
-                id = G2gd.GetPatternTreeItemId(self.G2frame, id, item)
-            wx.CallLater(100,self.InvokeTreeItem,id)
+                pid = G2gd.GetPatternTreeItemId(self.G2frame, pid, item)
+            wx.CallLater(100,self.InvokeTreeItem,pid)
         else:
             print 'OnPageChanged: not found:',tabLabel
             
-    def InvokeTreeItem(self,id):
+    def InvokeTreeItem(self,pid):
         '''This is called to select an item from the tree using the self.allowZoomReset
         flag to prevent a reset to the zoom of the plot (where implemented)
         '''
         self.allowZoomReset = False 
-        if id: self.G2frame.PatternTree.SelectItem(id)
-        self.allowZoomReset = True 
+        if pid: self.G2frame.PatternTree.SelectItem(pid)
+        self.allowZoomReset = True
+ #       print 'invoke',str(self).split('0x')[1]
             
 class GSASIItoolbar(Toolbar):