making progress in saving the project with the correct phase

Author: Kvieta1990

GSASII/GSASIIphsGUI.py

@@ -1702,7 +1702,7 @@ def OnPhaseName(event):
                 'called when the phase name is changed in "General"'
                 event.Skip()
                 newName = NameTxt.GetValue().strip()
-                renamePhaseName(Item,generalData,newName)
+                renamePhaseNameTop(G2frame,data,Item,generalData,newName)
                 NameTxt.SetValue(newName)
 
             def OnPhaseType(event):
@@ -5706,7 +5706,7 @@ def OnReplacePhase(event):
         newname = rd.Phase['General']['Name']
         data['General']['Name'] = phsnam
         # rename phase to new name from file
-        renamePhaseName(G2frame.PickId, data['General'],newname)
+        renamePhaseNameTop(G2frame,data,G2frame.PickId, data['General'],newname)
         # force a reload of current tree item
         G2frame.PickIdText = []
         wx.CallAfter(G2gd.SelectDataTreeItem,G2frame,G2frame.PickId)
@@ -17014,39 +17014,6 @@ def rbKeyPress(event):
         G2frame.Raise()
         return
 
-    def renamePhaseName(phaseItem,generalData,newName):
-        '''Called to rename the phase. Updates the tree and items that
-        reference the file name. 
-        '''
-        oldName = generalData['Name']
-        phaseRIdList,usedHistograms = G2frame.GetPhaseInfofromTree()
-        phaseNameList = usedHistograms.keys() # phase names in use
-        if newName and newName != oldName:
-            newName = G2obj.MakeUniqueLabel(newName,list(phaseNameList))
-            generalData['Name'] = newName
-            G2frame.G2plotNB.Rename(oldName,generalData['Name'])
-            G2frame.GPXtree.SetItemText(phaseItem,generalData['Name'])
-            # change phase name key in Reflection Lists for each histogram
-            for hist in data['Histograms']:
-                ht = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,hist)
-                rt = G2gd.GetGPXtreeItemId(G2frame,ht,'Reflection Lists')
-                if not rt: continue
-                RfList = G2frame.GPXtree.GetItemPyData(rt)
-                if oldName not in RfList:
-                    print('Warning: '+oldName+' not in Reflection List for '+
-                          hist)
-                    continue
-                RfList[newName] = RfList[oldName]
-                del RfList[oldName]
-            # rename Restraints
-            resId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Restraints')
-            Restraints = G2frame.GPXtree.GetItemPyData(resId)
-            i = G2gd.GetGPXtreeItemId(G2frame,resId,oldName)
-            if i: G2frame.GPXtree.SetItemText(i,newName)
-            if len(Restraints) and oldName in Restraints:
-                Restraints[newName] = Restraints[oldName]
-                del Restraints[oldName]
-
     #### UpdatePhaseData execution starts here
     # make sure that the phase menu bars get created before selecting
     # any (this will only be true on the first call to UpdatePhaseData)
@@ -17400,3 +17367,36 @@ def saveIsoNewPhase(G2frame,phData,newPhase,orgFilName):
             G2frame.GSASprojectfile = f'{s[0]}_{num}.gpx'
     G2IO.ProjFileSave(G2frame)
     return G2frame.GSASprojectfile
+
+def renamePhaseNameTop(G2frame,data,phaseItem,generalData,newName):
+        '''Called to rename the phase. Updates the tree and items that
+        reference the file name. 
+        '''
+        oldName = generalData['Name']
+        phaseRIdList,usedHistograms = G2frame.GetPhaseInfofromTree()
+        phaseNameList = usedHistograms.keys() # phase names in use
+        if newName and newName != oldName:
+            newName = G2obj.MakeUniqueLabel(newName,list(phaseNameList))
+            generalData['Name'] = newName
+            G2frame.G2plotNB.Rename(oldName,generalData['Name'])
+            G2frame.GPXtree.SetItemText(phaseItem,generalData['Name'])
+            # change phase name key in Reflection Lists for each histogram
+            for hist in data['Histograms']:
+                ht = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,hist)
+                rt = G2gd.GetGPXtreeItemId(G2frame,ht,'Reflection Lists')
+                if not rt: continue
+                RfList = G2frame.GPXtree.GetItemPyData(rt)
+                if oldName not in RfList:
+                    print('Warning: '+oldName+' not in Reflection List for '+
+                          hist)
+                    continue
+                RfList[newName] = RfList[oldName]
+                del RfList[oldName]
+            # rename Restraints
+            resId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Restraints')
+            Restraints = G2frame.GPXtree.GetItemPyData(resId)
+            i = G2gd.GetGPXtreeItemId(G2frame,resId,oldName)
+            if i: G2frame.GPXtree.SetItemText(i,newName)
+            if len(Restraints) and oldName in Restraints:
+                Restraints[newName] = Restraints[oldName]
+                del Restraints[oldName]

GSASII/GSASIIpwdGUI.py

@@ -5235,7 +5235,7 @@ def showWebtext(txt):
                 G2frame, phaseID, phase_nam
             )
         )
-        data = Phase
+        # data = Phase
         #oacomp,occomp = G2mth.phaseContents(data)
         #ophsnam = data['General']['Name']
         fileList = []
@@ -5246,8 +5246,8 @@ def showWebtext(txt):
         obj.loadTree()
         tmp = tempfile.NamedTemporaryFile(suffix='.cif', delete=False)
         obj.dirname,obj.filename = os.path.split(tmp.name)
-        obj.phasenam = data['General']['Name']
-        obj.Writer('', data['General']['Name'])
+        obj.phasenam = Phase['General']['Name']
+        obj.Writer('', Phase['General']['Name'])
         parentcif = tmp.name
         ISOparentcif = ISO.UploadCIF(parentcif)
         up2 = {'filename': ISOparentcif, 'input': 'uploadparentcif'}
@@ -5490,39 +5490,6 @@ def _get_opt_val(opt_name, out):
             del Restraints[phsnam]
         orgData = copy.deepcopy(data)
 
-        def renamePhaseName(phaseItem,generalData,newName):
-            '''Called to rename the phase. Updates the tree and items that
-            reference the file name. 
-            '''
-            oldName = generalData['Name']
-            phaseRIdList,usedHistograms = G2frame.GetPhaseInfofromTree()
-            phaseNameList = usedHistograms.keys() # phase names in use
-            if newName and newName != oldName:
-                newName = G2obj.MakeUniqueLabel(newName,list(phaseNameList))
-                generalData['Name'] = newName
-                G2frame.G2plotNB.Rename(oldName,generalData['Name'])
-                G2frame.GPXtree.SetItemText(phaseItem,generalData['Name'])
-                # change phase name key in Reflection Lists for each histogram
-                for hist in data['Histograms']:
-                    ht = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,hist)
-                    rt = G2gd.GetGPXtreeItemId(G2frame,ht,'Reflection Lists')
-                    if not rt: continue
-                    RfList = G2frame.GPXtree.GetItemPyData(rt)
-                    if oldName not in RfList:
-                        print('Warning: '+oldName+' not in Reflection List for '+
-                            hist)
-                        continue
-                    RfList[newName] = RfList[oldName]
-                    del RfList[oldName]
-                # rename Restraints
-                resId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Restraints')
-                Restraints = G2frame.GPXtree.GetItemPyData(resId)
-                i = G2gd.GetGPXtreeItemId(G2frame,resId,oldName)
-                if i: G2frame.GPXtree.SetItemText(i,newName)
-                if len(Restraints) and oldName in Restraints:
-                    Restraints[newName] = Restraints[oldName]
-                    del Restraints[oldName]
-
         for ir_opt, _ in ir_options:
             print("Processing irrep:", ir_opt)
             data["input"] = "irrep"
@@ -5572,10 +5539,12 @@ def renamePhaseName(phaseItem,generalData,newName):
                     'Histograms', 'Pawley ref', 'RBModels'
                 ]
                 for key in key_list:
-                    data[key] = rd.Phase[key]
+                    Phase[key] = rd.Phase[key]
 
                 newname = rd.Phase['General']['Name']
-                data['General']['Name'] = newname
+                Phase['General']['Name'] = newname
+
+                G2phsG.renamePhaseNameTop(G2frame,Phase,G2frame.PickId,Phase['General'],newname)
 
                 G2frame.GSASprojectfile = os.path.splitext(
                     orgFilName