Changeset 185

Timestamp:

Dec 1, 2010 12:02:56 PM (13 years ago)

Author:

vondreele

Message:

testpos & atom color fixes

File:

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

trunk/GSASIIphsGUI.py

@@ -772 +772 @@
         try:
             drawData = data['Drawing']
-            x,y,z = drawData['testPos']
+            x,y,z = drawData['testPos'][0]
             AtomAdd(x,y,z)
         except:
@@ -805 +805 @@
         if 'Drawing' in data:
             drawData = data['Drawing']
-            x,y,z = drawData['testPos']
+            x,y,z = drawData['testPos'][0]
             AtomAdd(x,y,z)
             FillAtomsGrid()
@@ -930 +930 @@
             'bondRadius':0.1,'ballScale':0.33,'vdwScale':0.67,'ellipseProb':50,'sizeH':0.50,
             'unitCellBox':False,'showABC':True,'selectedAtoms':[],
-            'Rotation':[0.0,0.0,0.0,[]],'bondList':{},'testPos':[-.1,-.1,-.1]}
+            'Rotation':[0.0,0.0,0.0,[]],'bondList':{},'testPos':[[-.1,-.1,-.1],[0.0,0.0,0.0],[0,0]]}
         try:
             drawingData = data['Drawing']
@@ -1248 +1248 @@
             
     def DrawAtomColor(event):
+
         indx = drawAtoms.GetSelectedRows()
         if indx:
+            if len(indx) > 1:
+                self.dataFrame.SetStatusText('Select Custom Color, change color, Add to Custom Colors, then OK')
+            else:
+                self.dataFrame.SetStatusText('Change color, Add to Custom Colors, then OK')
             generalData = data['General']
             atomData = data['Drawing']['Atoms']
@@ -1279 +1284 @@
             drawAtoms.ClearSelection()
             dlg.Destroy()
+            self.dataFrame.SetStatusText('')
             
     def ResetAtomColors(event):