Changeset 4463 for trunk

Timestamp:

Jun 4, 2020 3:40:34 PM (3 years ago)

Author:

toby

Message:

Redisplay structure after a shift-click to select an atom; update plot help info

Location:

trunk

Files:

• GSASIIplot.py (modified) (1 diff)
• help/gsasII.html (modified) (7 diffs)

trunk/GSASIIplot.py

@@ -8227 +8227 @@
             elif event.RightIsDown():
                 GetTruePosition(xy,True)
+            Draw('Shift atom select')
         else:
             drawingData['oldxy'] = list(xy)

trunk/help/gsasII.html

@@ -5277 +5277 @@
 
 <p class=MsoNormal style='margin-left:.5in'><span style='mso-fareast-font-family:
-"Times New Roman"'>This window shows the reflections for the selected phase
-found in this powder data set. It is generated by a Rietveld or Pawley
-refinement.</p>
+"Times New Roman"'>This window shows the reflections for the selected
+phase (selected by the tab at top)
+found in this powder data set. It is generated by a Rietveld
+(including Pawley and LeBail) refinements. Reflection d-spaces are
+generated directly from lattice parameters but 2θ values will
+incorporate corrections, such as for sample displacement, zero, etc. 
+</p>
 
 <h5 style='margin-left:.5in'><span style='mso-fareast-font-family:"Times New Roman"'>What
@@ -6396 +6400 @@
 
 <p class=MsoListParagraphCxSpFirst style='margin-left:1.0in;mso-add-space:auto;
-text-indent:-.25in;mso-list:l5 level1 lfo28'><![if !supportLists]><span
-class=MsoHyperlink><span style='mso-fareast-font-family:"Times New Roman";
-color:windowtext;text-decoration:none;text-underline:none'><span
-style='mso-list:Ignore'>1.<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span></span><![endif]><b style='mso-bidi-font-weight:normal'>Atom</b><b
-style='mso-bidi-font-weight:normal'><span style='mso-fareast-font-family:"Times New Roman"'>
-selection from table</span></b><span style='mso-fareast-font-family:"Times New Roman"'>
-- These are controlled by the mouse and the Shift/Ctrl/Alt keys:<span
-class=MsoHyperlink><span style='color:windowtext;text-decoration:none;
-text-underline:none'><o:p></o:p></span></span></span></p>
+text-indent:-.25in;mso-list:l5 level1 lfo28'>1. Atom 
+selection from table - These are controlled by the mouse and the
+Shift/Ctrl/Alt keys. Note that for most purposes (one exception is
+atom reordering which requires an Alt-Left-click on the rows), selection of any
+cell for an atom will work equivalently with selection of the entire row:</p>
 
 <p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
@@ -6674 +6673 @@
 of this dialog box before proceeding.</p>
 
+<h5 style='margin-left:.5in'><span
+style='mso-fareast-font-family:"Times New Roman"'>
+What can I do with the plot?</span></h5>
+
+<P style='margin-left:1.0in'>
+A plot will be displayed only if the Draw Options or Draw Atoms tabs
+are visited before use of the Atoms tab. In that case the crystal
+structure is shown. Use of the mouse buttons changes the
+view of the structure and can be used to select atoms.</P>
+<BL>
+<LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Left drag</B>:   
+Holding down left button rotates axes around screen x & y 
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Right drag</B>:  
+Holding down right button translates the fractional
+coordinates assigned to the view point (which is kept at the center of
+the plot). The structure will appear to translate. 
+The view point can also be entered directly in the Draw Options.
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Middle drag</B>:  
+Holding down center button rotates axes around screen z (direction
+perpendicular to screen).
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Wheel</B>:  
+Rotating the scroll wheel: changes “camera position” (zoom in/out)
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Shift+Left click</B>:   
+Holding down the shift key while clicking on an atom with the left
+mouse button causes that atom to be selected (Shift + a Right click
+does the same). Any previously selected
+atoms will be reset. If two atoms are overlapped in the
+current view, then the top-most atom will usually be selected.
+</LI></BL>
+
 <h4 style='margin-left:0.25in'><u><a name="Draw_Options">
 Draw Options</a></u></h4>
@@ -6680 +6714 @@
 can I do here?<span class=MsoHyperlink><span style='color:#4F4FFF;text-decoration:
 none;text-underline:none'><o:p></o:p></span></span></span></h5>
+
+<p class=MsoNormal style='margin-left:.75in'>
+The Draw Options window provides access to a number of items that control how
+the structure is displayed. 
+</p>
+
 
 <h5 style='margin-left:.5in'><span
@@ -6693 +6733 @@
 style='mso-fareast-font-family:"Times New Roman"'>
 What can I do with the plot?</span></h5>
+
 <P style='margin-left:1.0in'>
-...
-</P>
+Use of the mouse buttons when viewing a crystal structure changes the
+view of the structure:</P>
+<BL>
+<LI style='margin-left:1.4in; text-indent:-.2in'>
+Holding down left button (left drag): rotates axes around screen x & y
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+Holding down right button (right drag): translates the fractional
+coordinates assigned to the view point (which is kept at the center of
+the plot). Note that the view point coordinates can also be entered
+directly. 
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+Holding down center button (center drag): rotates axes around screen z
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+Rotating the scroll wheel: changes “camera position” (zoom in/out)
+</LI></BL>
 
 
@@ -6914 +6968 @@
 style='mso-fareast-font-family:"Times New Roman"'>
 What can I do with the plot?</span></h5>
+
 <P style='margin-left:1.0in'>
-...
-</P>
+Use of the mouse buttons when viewing a crystal structure changes the
+view of the structure:</P>
+<BL>
+<LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Left drag</B>:   
+Holding down left button rotates axes around screen x & y 
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Right drag</B>:  
+Holding down right button translates the fractional
+coordinates assigned to the view point (which is kept at the center of
+the plot). The structure will appear to translate. 
+The view point can also be entered directly in the Draw Options.
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Middle drag</B>:  
+Holding down center button rotates axes around screen z (direction
+perpendicular to screen).
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Wheel</B>:  
+Rotating the scroll wheel: changes “camera position” (zoom in/out)
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Shift+Left click</B>:   
+Holding down the shift key while clicking on an atom with the left
+mouse button causes that atom to be selected. Any previously selected
+atoms will be reset. If two atoms are overlapped in the
+current view, then the top-most atom will usually be selected.
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Shift+Right click</B>:   
+Holding down the shift key while clicking on an atom with the right
+mouse button causes the atom to be selected if previously unselected
+and unselected if previously selected. Any previously selected
+atoms will be continue to be selected so shift-right click can be used
+to add atoms to the selection list. If two atoms are overlapped in the
+current view, then the top-most atom will usually be selected.
+</LI></BL>
 
 <h4 style='margin-left:0.25in'><a name="RB_Models">RB Models</a></h4>
 
-<p class=MsoNormal style='margin-left:.5in'>This gives the list of
-included <a href="#Rigid_bodies">Rigid bodies</a> in this phase</p>
+<p class=MsoNormal style='margin-left:.5in'>This is used to insert
+rigid bodies into a structure. The rigid bodies must first be defined
+for the project using the <a href="#Rigid_bodies">Rigid bodies tree
+item</a>. It also allows control of the location of the rigid body and
+in this phase</p>
+<h5 style='margin-left:.5in'><span
+style='mso-fareast-font-family:"Times New Roman"'>
+What can I do with the plot?</span></h5>
+
+<P style='margin-left:1.0in'>
+Use of the mouse buttons when viewing a crystal structure changes the
+view of the structure:</P>
+<BL>
+<LI style='margin-left:1.4in; text-indent:-.2in'>
+Holding down left button (left drag): rotates axes around screen x & y 
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+Holding down right button (right drag): translates the fractional
+coordinates assigned to the view point (which is kept at the center of
+the plot). The structure will appear to translate. 
+The view point can also be entered directly in the Draw Options.
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+Holding down center button (center drag): rotates axes around screen z 
+</LI><LI style='margin-left:1.4in; text-indent:-.2in'>
+Rotating the scroll wheel: changes “camera position” (zoom in/out)
+</LI></BL>
+
+<P style='margin-left:1.0in'>
+When a rigid body is being inserted into a structure, both the rigid
+body and the crystal structure are displayed. It is useful to plan for
+this by preselecting the atoms in the Draw Atoms list and to have
+atoms displayed as "Sticks" or "Ball-and-Sticks." The rigid body will
+be displayed as "Ball-and-Sticks" but bonds will be in green. Use of the Alt
+key causes the above mouse movements to reposition the rigid body
+rather than change the view of the crystal structure:</P>
+<BL>
+<LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Alt+Left drag</B>:    
+Holding Alt while dragging the mouse with the left button down
+rotates the rigid body around screen x & y axes
+<LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Alt+Middle drag</B>:    
+Holding Alt while dragging the mouse with the middle button down
+rotates the rigid body around screen z axis (out of screen)
+<LI style='margin-left:1.4in; text-indent:-.2in'>
+<B>Alt+Right drag</B>:    
+Holding Alt while dragging the mouse with the right button down
+translates the rigid body in the screen x & y directions (rotate the
+plot to see and move in the rigid body in the third direction.)
+Pressing the "Lock" checkbox next to the origin location prevents the
+origin from being changed in this way. 
+</LI></BL>
 
 <h4 style='margin-left:0.25in'><a name="Texture">Texture </a></h4>
@@ -7178 +7314 @@
 <hr size=2 width="100%" align=center>
 
-<!-- hhmts start -->Last modified: Mon May 13 12:33:41 CDT 2019 <!-- hhmts end -->
+<!-- hhmts start -->Last modified: Thu Jun  4 15:21:22 CDT 2020 <!-- hhmts end -->
 
 </div>