Changeset 863 for trunk/GSASIIphsGUI.py

Timestamp:

Mar 13, 2013 10:43:09 AM (12 years ago)

Author:

vondreele

Message:

fix to notebook & comment (not allowed) editing
avoid a dead window problem with comments/notebook
fix atom editing problems with no rigid bodies
work on help text

File:

• trunk/GSASIIphsGUI.py (modified) (4 diffs)

trunk/GSASIIphsGUI.py ¶

@@ -916 +916 @@
                             if Atoms.GetColLabelValue(c) == 'refine':
                                 rbExcl = rbAtmDict.get(atomData[r][-1],'')
-                                for excl in rbExcl:
-                                    atomData[r][c] = parms.replace(excl,'')
+                                if rbExcl:
+                                    for excl in rbExcl:
+                                        atomData[r][c] = parms.replace(excl,'')
+                                else:
+                                    atomData[r][c] = parms
                             else: 
                                 atomData[r][c] = parms
@@ -1099 +1102 @@
                 atId = atomData[row][-1]
                 rbExcl = rbAtmDict.get(atId,'')
-                if 'X' in rbExcl:
-                    for c in range(0,colX+3):
-                        if c != colR:
-                            Atoms.SetCellStyle(row,c,VERY_LIGHT_GREY,True)                        
-                Atoms.SetReadOnly(row,colType,True)
                 Atoms.SetReadOnly(row,colSS,True)                         #site sym
                 Atoms.SetReadOnly(row,colSS+1,True)                       #Mult
@@ -1125 +1123 @@
                         Atoms.SetCellStyle(row,ci,VERY_LIGHT_GREY,True)
                         Atoms.SetCellTextColour(row,ci,VERY_LIGHT_GREY)
+                if 'X' in rbExcl:
+                    for c in range(0,colX+3):
+                        if c != colR:
+                            Atoms.SetCellStyle(row,c,VERY_LIGHT_GREY,True)
             Atoms.AutoSizeColumns(False)
 
@@ -4075 +4077 @@
     def OnShowBonds(event):
         generalData = data['General']
-        if generalData['Map']['Show bonds']:
+        if generalData['Map'].get('Show bonds',False):
             generalData['Map']['Show bonds'] = False
             G2frame.dataFrame.MapPeaksEdit.SetLabel(G2gd.wxID_SHOWBONDS,'Show bonds')