Changeset 198

Timestamp:

Jan 3, 2011 4:20:50 PM (13 years ago)

Author:

vondreele

Message:

change peak selection

File:

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

trunk/GSASIIpwdGUI.py

@@ -146 +146 @@
                    else:
                        self.dataDisplay.SetCellBackgroundColour(r,c,wx.WHITE)
+                       
+    def RefineSelect(event):
+        data = self.PatternTree.GetItemPyData(self.PickId)
+        r,c =  event.GetRow(),event.GetCol()
+        if r < 0 and self.dataDisplay.GetColLabelValue(c) == 'refine':
+            self.dataDisplay.SelectCol(c,False)
+        
+                       
+    def RowSelect(event):
+        r,c =  event.GetRow(),event.GetCol()
+        if r < 0 and c < 0:
+            if self.dataDisplay.IsSelection():
+                self.dataDisplay.ClearSelection()
+        elif c < 0:                   #only row clicks
+            if event.ControlDown():                    
+                if r in self.dataDisplay.GetSelectedRows():
+                    self.dataDisplay.DeselectRow(r)
+                else:
+                    self.dataDisplay.SelectRow(r,True)
+            elif event.ShiftDown():
+                for row in range(r+1):
+                    self.dataDisplay.SelectRow(row,True)
+            else:
+                self.dataDisplay.ClearSelection()
+                self.dataDisplay.SelectRow(r,True)                
+        
                            
     def KeyEditPeakGrid(event):
@@ -233 +259 @@
     setBackgroundColors()                         
     self.dataDisplay.Bind(wg.EVT_GRID_CELL_CHANGE, RefreshPeakGrid)
-    self.dataDisplay.Bind(wx.EVT_KEY_DOWN, KeyEditPeakGrid)                 
+    self.dataDisplay.Bind(wx.EVT_KEY_DOWN, KeyEditPeakGrid)
+    self.dataDisplay.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK, RowSelect)                 
+    self.dataDisplay.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK, RefineSelect)
     self.dataDisplay.SetMargins(0,0)
     self.dataDisplay.AutoSizeColumns(False)
@@ -240 +268 @@
 def UpdateBackgroundGrid(self,data):
     if self.dataDisplay:
+        print 'clearing background'
         self.dataFrame.Clear()
     BackId = G2gd.GetPatternTreeItemId(self,self.PatternId, 'Background')
@@ -296 +325 @@
 def UpdateLimitsGrid(self, data):
     if self.dataDisplay:
+        print 'clearing limits'
         self.dataFrame.Clear()