Changeset 1004

Timestamp:

Jul 21, 2013 8:38:32 PM (10 years ago)

Author:

toby

Message:

recapture focus on plot window so keyboard commands work

Location:

trunk

Files:

• GSASIIobj.py (modified) (3 diffs)
• GSASIIplot.py (modified) (4 diffs)

trunk/GSASIIobj.py

@@ -346 +346 @@
 Reflection Lists              \           A dict with an entry for each phase in the
                                           histogram. The contents of each dict item
-                                          is a list or reflections as described in the
+                                          is a list of reflections as described in the
                                           :ref:`Powder Reflections <PowderRefl_table>`
                                           description.
@@ -462 +462 @@
  6           sig, Gaussian width
  7           gam, Lorenzian width
- 8           Fobs**2
- 9           Fcalc**2
+ 8           :math:`F_{obs}^2`
+ 9           :math:`F_{calc}^2`
  10          reflection phase, in degrees
  11          the equivalent reflections as a (m x 3) 
@@ -472 +472 @@
              reflections as a length (m) array
  13          intensity correction for reflection, this times
-             Fobs**2 or Fcalc**2 gives Iobs or Icalc 
+             :math:`F_{obs}^2` or :math:`F_{calc}^2` gives Iobs or Icalc 
+ 14          dict with the form factor (f or b) by atom type
+             symbol at the reflection position.
+==========  ====================================================
+
+Single Crystal Tree Items
+-------------------------
+
+.. _Xtal_table:
+
+.. index::
+   single: Single Crytsal data object description
+   single: Data object descriptions; Single crystal data
+
+Every single crystal diffraction histogram is stored in the GSAS-II data tree
+with a top-level entry named beginning with the string "HKLF ". The
+diffraction data for that information are directly associated with
+that tree item and there are a series of children to that item. The
+routine :func:`~GSASII.GSASII.GetUsedHistogramsAndPhasesfromTree` will
+load this information into a dictionary where the child tree name is
+used as a key, and the information in the main entry is assigned
+a key of ``Data``, as outlined below.
+
+.. tabularcolumns:: |l|l|p{4in}|
+
+======================  ===============  ====================================================
+  key                      sub-key        explanation
+======================  ===============  ====================================================
+Data
+                                          A list of lists, where each inner item
+                                          is an individual reflection
+                                          as described in the
+                                          :ref:`Single Crystal Reflections
+                                          <XtalRefl_table>`
+                                          description.
+
+Instrument Parameters         \           A list containing two dicts where the possible
+                                          keys in each dict are listed below. The value
+                                          for most items is a list containing two values:
+                                          the initial value, the current value.
+                                          The first and second
+                                          values are floats unless otherwise noted.
+\                         Lam             Specifies a wavelength in Angstroms (two floats)
+\                         Type            Histogram type (two str values): 
+                                           * 'SXC' for constant wavelength x-ray
+                                           * 'SNC' for constant wavelength neutron
+                                           * 'SNT' for time of flight neutron
+\                         InstrName       A name for the instrument, used in preparing
+                                          a CIF (str).
+
+wtFactor                      \           A weighting factor to increase or decrease
+                                          the leverage of data in the histogram (float).
+                                          A value of 1.0 weights the data with their
+                                          standard uncertainties and a larger value
+                                          increases the weighting of the data (equivalent
+                                          to decreasing the uncertainties).
+
+hId                           \           The number assigned to the histogram when
+                                          the project is loaded or edited (can change)
+======================  ===============  ====================================================
+
+Single Crystal Reflection Data Structure
+----------------------------------------
+
+.. _XtalRefl_table:
+
+.. index::
+   single: Single Crystal reflection object description
+   single: Data object descriptions; Single Crystal Reflections
+   
+For every phase in a histogram, the ``Reflection Lists`` value is a list of
+reflections. The items in that list are documented below.
+
+==========  ====================================================
+  index         explanation
+==========  ====================================================
+ 0,1,2       h,k,l (float)
+ 3           multiplicity
+ 4           d-space, Angstrom
+ 5           :math:`F_{obs}^2`
+ 6           :math:`\sigma(F_{obs}^2)`
+ 7           :math:`F_{calc}^2`
+ 8           :math:`F_{obs}^2T`
+ 9           :math:`F_{calc}^2T`
+ 10          reflection phase, in degrees
+ 11          the equivalent reflections as a (m x 3) 
+             np.array.
+ 12          phase shift for each of the equivalent
+             reflections as a length (m) array
+ 13          intensity correction for reflection, this times
+             :math:`F_{obs}^2` or :math:`F_{calc}^2`
+             gives Iobs or Icalc
+             (not used in single crystals?)
  14          dict with the form factor (f or b) by atom type
              symbol at the reflection position.

trunk/GSASIIplot.py

@@ -122 +122 @@
         self.status.SetStatusWidths([150,-1])
         self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, self.OnPageChanged)
+        self.nb.Bind(wx.EVT_KEY_UP,self.OnNotebookKey)
         
         self.plotList = []
             
+    def OnNotebookKey(self,event):
+        '''Called when a keystroke event gets picked up by the notebook window
+        rather the child. This is not expected, but somehow it does sometimes
+        on the Mac and perhaps Linux.
+
+        Assume that the page associated with the currently displayed tab
+        has a child, .canvas; give that child the focus and pass it the event.
+        '''
+        Page = self.nb.GetPage(self.nb.GetSelection())
+        try:
+            Page.canvas.SetFocus()
+            wx.PostEvent(Page.canvas,event)
+        except AttributeError:
+            pass
+
     def addMpl(self,name=""):
         'Add a tabbed page with a matplotlib plot'
@@ -1010 +1026 @@
             cb.SetValue(' key press')
             wx.CallAfter(OnPlotKeyPress,event)
+        try:
+            Page.canvas.SetFocus() # redirect the Focus from the button back to the plot
+        except:
+            pass
+
                         
     def OnMotion(event):
@@ -2127 +2148 @@
             if event.key in 'l':
                 wx.CallAfter(OnImPlotKeyPress,event)
+        try:
+            Page.canvas.SetFocus() # redirect the Focus from the button back to the plot
+        except:
+            pass
                         
     def OnImPick(event):
@@ -2725 +2750 @@
             cb.SetValue(' save as/key:')
             wx.CallAfter(OnKey,event)
+        try:
+            Page.canvas.SetFocus() # redirect the Focus from the button back to the plot
+        except:
+            pass
 
     def OnKey(event):           #on key UP!!