Changeset 163 for trunk/GSASIIgrid.py

Timestamp:

Oct 13, 2010 10:17:22 AM (15 years ago)

Author:

vondreele

Message:

new versions

File:

• trunk/GSASIIgrid.py (modified) (9 diffs)

trunk/GSASIIgrid.py ¶

@@ -14 +14 @@
 ] = [wx.NewId() for _init_coll_Atom_Items in range(8)]
 
-[ wxID_DRAWATOMSTYLE, wxID_DRAWATOMLABEL, wxID_DRAWVIEWPOINT, wxID_DRAWTRANSFORM,
-    wxID_DRAWDELETE, wxID_DRAWFILLCELL, wxID_DRAWADDEQUIV, wxID_DRAWFILLCOORD,
-] = [wx.NewId() for _init_coll_DrawAtom_Items in range(8)]
+[ wxID_PWDRADD, wxID_HKLFADD, wxID_DATADELETE,
+] = [wx.NewId() for _init_coll_Data_Items in range(3)]
+
+[ wxID_DRAWATOMSTYLE, wxID_DRAWATOMLABEL, wxID_DRAWATOMCOLOR, wxID_DRAWATOMRESETCOLOR, 
+    wxID_DRAWVIEWPOINT, wxID_DRAWTRANSFORM, wxID_DRAWDELETE, wxID_DRAWFILLCELL, 
+    wxID_DRAWADDEQUIV, wxID_DRAWFILLCOORD,
+] = [wx.NewId() for _init_coll_DrawAtom_Items in range(10)]
 
 [ wxID_IMCALIBRATE, wxID_IMINTEGRATE, wxID_IMCLEARCALIB, wxID_SAVEINTG, 
@@ -45 +49 @@
     def _init_coll_AtomsMenu(self,parent):
         parent.Append(menu=self.AtomEdit, title='Edit')
+        
+    def _init_coll_DataMenu(self,parent):
+        parent.Append(menu=self.DataEdit, title='Edit')
         
     def _init_coll_DrawAtomsMenu(self,parent):
@@ -85 +92 @@
             help='Select atoms to transform first')
             
+    def _init_coll_Data_Items(self,parent):
+        parent.Append(id=wxID_PWDRADD, kind=wx.ITEM_NORMAL,text='Add powder histograms',
+            help='Select new powder histograms to be used for this phase')
+        parent.Append(id=wxID_HKLFADD, kind=wx.ITEM_NORMAL,text='Add single crystal histograms',
+            help='Select new single crystal histograms to be used for this phase')
+        parent.Append(id=wxID_DATADELETE, kind=wx.ITEM_NORMAL,text='Delete histograms',
+            help='Delete histograms from use for this phase')
+            
     def _init_coll_DrawAtom_Items(self,parent):
         parent.Append(id=wxID_DRAWATOMSTYLE, kind=wx.ITEM_NORMAL,text='Atom style',
@@ -90 +105 @@
         parent.Append(id=wxID_DRAWATOMLABEL, kind=wx.ITEM_NORMAL,text='Atom label',
             help='Select atoms first')
+        parent.Append(id=wxID_DRAWATOMCOLOR, kind=wx.ITEM_NORMAL,text='Atom color',
+            help='Select atoms first')
+        parent.Append(id=wxID_DRAWATOMRESETCOLOR, kind=wx.ITEM_NORMAL,text='Reset atom colors',
+            help='Resets all atom colors to defaults')
         parent.Append(id=wxID_DRAWVIEWPOINT, kind=wx.ITEM_NORMAL,text='View point',
             help='View point is 1st atom selected')
@@ -151 +170 @@
         
         self.AtomsMenu = wx.MenuBar()
+        self.DataMenu = wx.MenuBar()
         self.DrawAtomsMenu = wx.MenuBar()
         self.ImageMenu = wx.MenuBar()
@@ -159 +179 @@
         self.IndexMenu = wx.MenuBar()
         self.AtomEdit = wx.Menu(title='')
+        self.DataEdit = wx.Menu(title='')
         self.DrawAtomEdit = wx.Menu(title='')
         self.ImageEdit = wx.Menu(title='')
@@ -168 +189 @@
         self._init_coll_AtomsMenu(self.AtomsMenu)
         self._init_coll_Atom_Items(self.AtomEdit)
+        self._init_coll_DataMenu(self.DataMenu)
+        self._init_coll_Data_Items(self.DataEdit)
         self._init_coll_DrawAtomsMenu(self.DrawAtomsMenu)
         self._init_coll_DrawAtom_Items(self.DrawAtomEdit)
@@ -218 +241 @@
         self.DestroyChildren()
                    
-class GSGrid(wg.Grid):
-    def __init__(self, parent, name=''):
-        wg.Grid.__init__(self,parent,-1,name=name)                    
-        self.SetSize(parent.GetClientSize())
-            
-    def Clear(self):
-        wg.Grid.ClearGrid(self)
-        
-    def SetCellStyle(self,r,c,color="white",readonly=True):
-        self.SetCellBackgroundColour(r,c,color)
-        self.SetReadOnly(r,c,isReadOnly=readonly)
-                        
 class GSNoteBook(wx.Notebook):
     def __init__(self, parent, name='',size = None):
@@ -238 +249 @@
         GSNoteBook.DeleteAllPages(self)
         
+    def FindPage(self,name):
+        numPage = self.GetPageCount()
+        for page in range(numPage):
+            if self.GetPageText(page) == name:
+                return page
+        
+class GSGrid(wg.Grid):
+    def __init__(self, parent, name=''):
+        wg.Grid.__init__(self,parent,-1,name=name)                    
+        self.SetSize(parent.GetClientSize())
+            
+    def Clear(self):
+        wg.Grid.ClearGrid(self)
+        
+    def SetCellStyle(self,r,c,color="white",readonly=True):
+        self.SetCellBackgroundColour(r,c,color)
+        self.SetReadOnly(r,c,isReadOnly=readonly)
+                        
 class Table(wg.PyGridTableBase):
     def __init__(self, data=[], rowLabels=None, colLabels=None, types = None):