Changeset 1605

Timestamp:

Dec 12, 2014 10:44:02 AM (8 years ago)

Author:

toby

Message:

add code to prevent blank phase names

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASII.py

@@ -567 +567 @@
         newPhaseList = []
         for rd in rdlist:
+            PhaseName = ''
             dlg = wx.TextEntryDialog( # allow editing of phase name
-                self, 'Enter the name for the new phase',
-                'Edit phase name', rd.Phase['General']['Name'],
-                style=wx.OK)
-            dlg.CenterOnParent()
-            if dlg.ShowModal() == wx.ID_OK:
-                rd.Phase['General']['Name'] = dlg.GetValue()
+                                    self, 'Enter the name for the new phase',
+                                    'Edit phase name', rd.Phase['General']['Name'],
+                                    style=wx.OK)
+            while PhaseName == '':
+                dlg.CenterOnParent()
+                if dlg.ShowModal() == wx.ID_OK:
+                    PhaseName = dlg.GetValue().strip()
+                else:
+                    dlg.Destroy()
+                    return
             dlg.Destroy()
             # make new phase names unique
-            rd.Phase['General']['Name'] = G2obj.MakeUniqueLabel(rd.Phase['General']['Name'],phaseNameList)
-            PhaseName = rd.Phase['General']['Name']
+            rd.Phase['General']['Name'] = G2obj.MakeUniqueLabel(PhaseName,phaseNameList)
+            PhaseName = rd.Phase['General']['Name'][:]
             newPhaseList.append(PhaseName)
             print 'Read phase '+str(PhaseName)+' from file '+str(self.lastimport)

trunk/GSASIIphsGUI.py

@@ -241 +241 @@
             def OnPhaseName(event):
                 oldName = generalData['Name']
-                generalData['Name'] = NameTxt.GetValue()
-                G2frame.G2plotNB.Rename(oldName,generalData['Name'])
-                G2frame.dataFrame.SetLabel('Phase Data for '+generalData['Name'])
-                G2frame.PatternTree.SetItemText(Item,generalData['Name'])
-                #Hmm, need to change phase name key in Reflection Lists for each histogram
-                            
+                phaseRIdList,usedHistograms = G2frame.GetPhaseInfofromTree()
+                phaseNameList = usedHistograms.keys() # phase names in use
+                newName = NameTxt.GetValue().strip()
+                if newName and newName != oldName:
+                    newName = G2obj.MakeUniqueLabel(newName,phaseNameList)             
+                    generalData['Name'] = newName
+                    G2frame.G2plotNB.Rename(oldName,generalData['Name'])
+                    G2frame.dataFrame.SetLabel('Phase Data for '+generalData['Name'])
+                    G2frame.PatternTree.SetItemText(Item,generalData['Name'])
+                    #Hmm, need to change phase name key in Reflection Lists for each histogram
+                NameTxt.SetValue(generalData['Name'])
+                                                
             def OnPhaseType(event):
                 if not len(generalData['AtomTypes']):             #can change only if no atoms!