Changeset 4979

Timestamp:

Jun 26, 2021 1:05:17 PM (2 years ago)

Author:

vondreele

Message:

add new function UpdateSelection?() to G2TreeCtrl, used it in a few places for test: OnDataDelete? (both versions), UpdateDrawOptions?, & UpdateTexture?

Location:

trunk

Files:

• G2compare.py (modified) (1 diff)
• GSASIIctrlGUI.py (modified) (1 diff)
• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (7 diffs)

trunk/G2compare.py

@@ -599 +599 @@
             filep.close()
             wx.EndBusyCursor()
-
+            
     def OnDataTreeSelChanged(self,event):
         def ClearData(self):

trunk/GSASIIctrlGUI.py

@@ -248 +248 @@
         else:
             return wx.TreeCtrl.SetItemPyData(self,treeId,data)
+
+    def UpdateSelection(self):
+        TId = self.GetFocusedItem()
+        self.SelectItem(self.root)
+        self.SelectItem(TId)
 
     # def onSelectionChanged(self,event):

trunk/GSASIIdataGUI.py

@@ -4233 +4233 @@
         if DelList:
             SelectDataTreeItem(self,selItem)
-#            wx.CallAfter(self.GPXtree.SelectItem,selItem)
+            self.GPXtree.UpdateSelection()
+            # self.GPXtree.SelectItem(self.root)
+            # self.GPXtree.SelectItem(selItem)
                 
     def OnPlotDelete(self,event):

trunk/GSASIIphsGUI.py

@@ -8755 +8755 @@
                 drawingData['unitCellBox'] = unitCellBox.GetValue()
                 G2plt.PlotStructure(G2frame,data)
-                wx.CallAfter(UpdateDrawOptions)
+                G2frame.GPXtree.UpdateSelection()
+#                wx.CallAfter(UpdateDrawOptions)
     
             def OnShowHyd(event):
@@ -9117 +9118 @@
                 textureData['Order'] = 0
             textureData['SH Coeff'][1] = SetSHCoef()
-            wx.CallLater(100,UpdateTexture)
+            G2frame.GPXtree.UpdateSelection()
+#            wx.CallLater(100,UpdateTexture)
             wx.CallAfter(G2plt.PlotTexture,G2frame,data)
                         
@@ -9124 +9126 @@
             textureData['Model'] = Obj.GetValue()
             textureData['SH Coeff'][1] = SetSHCoef()
-            wx.CallLater(100,UpdateTexture)
+            G2frame.GPXtree.UpdateSelection()
+#            wx.CallLater(100,UpdateTexture)
             wx.CallAfter(G2plt.PlotTexture,G2frame,data)
             
@@ -9134 +9137 @@
             Obj = event.GetEventObject()
             textureData['SHShow'] = Obj.GetValue()
-            wx.CallLater(100,UpdateTexture)
+            G2frame.GPXtree.UpdateSelection()
+#            wx.CallLater(100,UpdateTexture)
             
         def OnProjSel(event):
@@ -9161 +9165 @@
             Obj = event.GetEventObject()
             textureData['PlotType'] = Obj.GetValue()
-            wx.CallLater(100,UpdateTexture)
+            G2frame.GPXtree.UpdateSelection()
+#            wx.CallLater(100,UpdateTexture)
             wx.CallAfter(G2plt.PlotTexture,G2frame,data)
             
@@ -9306 +9311 @@
                 finally:
                     dlg.Destroy()
-                wx.CallLater(100,UpdateTexture)
+                G2frame.GPXtree.UpdateSelection()
+#                wx.CallLater(100,UpdateTexture)
                 
             A = G2lat.cell2A(generalData['Cell'][1:7])
@@ -9818 +9824 @@
                     del data['Histograms'][i]
             #wx.CallLater(100,G2ddG.UpdateDData,G2frame,DData,data) #  produces error
-            wx.CallAfter(UpdatePhaseData,G2frame,Item,data)
+            G2frame.GPXtree.UpdateSelection()
+            # TId = G2frame.GPXtree.GetFocusedItem()
+            # G2frame.GPXtree.SelectItem(G2frame.root)
+            # G2frame.GPXtree.SelectItem(TId)
+#            UpdatePhaseData(G2frame,Item,data)
             
     def OnDataApplyStrain(event):