Changeset 4412

Timestamp:

Apr 24, 2020 5:32:58 PM (3 years ago)

Author:

toby

Message:

update tree item display after delete data tree entry

File:

• trunk/GSASIIdataGUI.py (modified) (5 diffs)

trunk/GSASIIdataGUI.py

@@ -592 +592 @@
         item = parent.Append(wx.ID_ANY,'Add new phase','')
         self.Bind(wx.EVT_MENU, self.OnAddPhase, id=item.GetId())
-        item = parent.Append(wx.ID_ANY,'Delete phase','')
+        item = parent.Append(wx.ID_ANY,'Delete phase entries','')
         self.Bind(wx.EVT_MENU, self.OnDeletePhase, id=item.GetId())
-        item = parent.Append(wx.ID_ANY,'Rename tree item','Rename the selected data tree item (PWDR, HKLF or IMG)')
+        item = parent.Append(wx.ID_ANY,'Rename tree entry',
+                'Rename the selected data tree item (PWDR, HKLF or IMG)')
         self.Bind(wx.EVT_MENU, self.OnRenameData, id=item.GetId())
-        item = parent.Append(wx.ID_ANY,'Delete tree items','Delete selected data items from data tree')
+        item = parent.Append(wx.ID_ANY,'Delete data entries',
+                'Delete selected data items from data tree')
         self.Bind(wx.EVT_MENU, self.OnDataDelete, id=item.GetId())
         item = parent.Append(wx.ID_ANY,'Delete plots','Delete selected plots')
@@ -3902 +3904 @@
             for lbl in self.G2plotNB.plotList:
                 self.G2plotNB.Delete(lbl)
-        if subr:        #remove restraints for deleted phase
+        if subr and DelList:     #remove restraints for deleted phase
             DelList = [itm[1] for itm in DelList]
             item, cookie = self.GPXtree.GetFirstChild(subr)
@@ -3912 +3914 @@
                 item, cookie = self.GPXtree.GetNextChild(subr, cookie)
         # force redisplay of current tree item if it was not deleted
+        self.PickId = 0
+        self.PatternId = 0
         self.PickIdText = None
         SelectDataTreeItem(self,selItem)
@@ -3969 +3973 @@
         nItems = {'PWDR':0,'SASD':0,'REFD':0,'IMG':0,'HKLF':0,'PDF':0}
         PDFnames = []
+        selItem = self.GPXtree.GetSelection()
         Histograms,Phases = self.GetUsedHistogramsAndPhasesfromTree()
         if not self.GPXtree.GetCount():
@@ -4033 +4038 @@
                 for item in DelItemList:
                     self.GPXtree.Delete(item)
-                self.PickId = 0
-                self.PickIdText = None
-                self.PatternId = 0
-                if nItems['PWDR']:
-                    wx.CallAfter(G2plt.PlotPatterns,self,True)
-                else:
-                    self.G2plotNB.Delete('Powder Patterns')
-                if not nItems['IMG']:
-                    self.G2plotNB.Delete('2D Powder Image')
-                if not nItems['HKLF']:
-                    self.G2plotNB.Delete('Structure Factors')
-                    if '3D Structure Factors' in self.G2plotNB.plotList:
-                        self.G2plotNB.Delete('3D Structure Factors')
+                    if item == selItem: selItem = self.root
+                if DelList:
+                    self.PickId = 0
+                    self.PickIdText = None
+                    self.PatternId = 0
+                    if nItems['PWDR']:
+                        wx.CallAfter(G2plt.PlotPatterns,self,True)
+                    else:
+                        self.G2plotNB.Delete('Powder Patterns')
+                    if not nItems['IMG']:
+                        self.G2plotNB.Delete('2D Powder Image')
+                    if not nItems['HKLF']:
+                        self.G2plotNB.Delete('Structure Factors')
+                        if '3D Structure Factors' in self.G2plotNB.plotList:
+                            self.G2plotNB.Delete('3D Structure Factors')
         finally:
             dlg.Destroy()
+        if DelList:
+            SelectDataTreeItem(self,selItem)
+            wx.CallAfter(self.GPXtree.SelectItem,selItem)
                 
     def OnPlotDelete(self,event):