Changeset 2879 for trunk/GSASIIgrid.py

Timestamp:

Jun 26, 2017 5:04:06 PM (6 years ago)

Author:

toby

Message:

Seq. Ref.: fix tickmarks on plot; single click on hist in table plots it

File:

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

trunk/GSASIIgrid.py

@@ -2968 +2968 @@
         plotName = plotSpCharFix(plotName)
         return plotName,G2frame.colList[col],G2frame.colSigs[col]
-            
-    def PlotSelect(event):
-        'Plots a row (covariance) or column on double-click'
+
+    def PlotSelectedColRow(calltyp=''):
+        '''Called to plot a selected column or row. This is called after the event is processed
+        so that the column or row gets selected.
+        Single click on row: plots histogram
+        Double click on row: plots V-C matrix
+        Single or double click on column: plots values in column
+        '''
         cols = G2frame.dataDisplay.GetSelectedCols()
         rows = G2frame.dataDisplay.GetSelectedRows()
         if cols:
             G2plt.PlotSelectedSequence(G2frame,cols,GetColumnInfo,SelectXaxis)
+        elif rows and calltyp == 'single':
+            name = histNames[rows[0]]       #only does 1st one selected
+            if not name.startswith('PWDR'): return 
+            pickId = G2frame.PickId
+            G2frame.PickId = G2frame.PatternId = GetPatternTreeItemId(G2frame, G2frame.root, name)
+            G2plt.PlotPatterns(G2frame,newPlot=True,plotType='PWDR')
+            G2frame.PickId = pickId
         elif rows:
             name = histNames[rows[0]]       #only does 1st one selected
@@ -2983 +2995 @@
                 'Nothing selected in table. Click on column or row label(s) to plot. N.B. Grid selection can be a bit funky.'
                 )
+        
+    def PlotSSelect(event):
+        'Called by a single click on a row or column label. '
+        event.Skip()
+        wx.CallAfter(PlotSelectedColRow,'single')
+        
+    def PlotSelect(event):
+        'Called by a double-click on a row or column label'
+        event.Skip()
+        wx.CallAfter(PlotSelectedColRow,'double')
             
     def OnPlotSelSeq(event):
@@ -4109 +4131 @@
         for r in range(nRows):
             G2frame.dataDisplay.SetCellReadOnly(r,c)
+    G2frame.dataDisplay.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK, PlotSSelect)
     G2frame.dataDisplay.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK, PlotSelect)
     G2frame.dataDisplay.Bind(wg.EVT_GRID_LABEL_RIGHT_CLICK, SetLabelString)