Changeset 791


Ignore:
Timestamp:
Oct 19, 2012 1:12:19 PM (10 years ago)
Author:
vondreele
Message:

fix help reference for Windows browser
more work on gsasII help files

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r786 r791  
    3535htmlFrame = None
    3636helpMode = 'browser'
    37 if sys.platform.lower().startswith('win'): helpMode = 'internal' # need a global control to set this
     37#if sys.platform.lower().startswith('win'): helpMode = 'internal' # need a global control to set this
    3838   
    3939htmlFirstUse = True
     
    131131            htmlPanel.LoadFile(helplink)
    132132    else:
     133        pfx = "file://"
     134        if sys.platform.lower().startswith('win'):
     135            pfx = ''
    133136        if htmlFirstUse:
    134             webbrowser.open_new("file://"+helplink)
     137            webbrowser.open_new(pfx+helplink)
    135138            htmlFirstUse = False
    136139        else:
    137             webbrowser.open("file://"+helplink, new=0, autoraise=True)
     140            webbrowser.open(pfx+helplink, new=0, autoraise=True)
    138141
    139142class MyHelp(wx.Menu):
  • trunk/help/gsasII.html

    r790 r791  
    2525  <o:Author>Von Dreele</o:Author>
    2626  <o:LastAuthor>Von Dreele</o:LastAuthor>
    27   <o:Revision>98</o:Revision>
    28   <o:TotalTime>3043</o:TotalTime>
     27  <o:Revision>103</o:Revision>
     28  <o:TotalTime>3119</o:TotalTime>
    2929  <o:Created>2011-11-28T16:49:00Z</o:Created>
    30   <o:LastSaved>2012-10-19T16:55:00Z</o:LastSaved>
     30  <o:LastSaved>2012-10-19T18:11:00Z</o:LastSaved>
    3131  <o:Pages>9</o:Pages>
    32   <o:Words>8489</o:Words>
    33   <o:Characters>48392</o:Characters>
     32  <o:Words>8495</o:Words>
     33  <o:Characters>48423</o:Characters>
    3434  <o:Company>Argonne National Laboratory</o:Company>
    3535  <o:Lines>403</o:Lines>
    3636  <o:Paragraphs>113</o:Paragraphs>
    37   <o:CharactersWithSpaces>56768</o:CharactersWithSpaces>
     37  <o:CharactersWithSpaces>56805</o:CharactersWithSpaces>
    3838  <o:Version>14.00</o:Version>
    3939 </o:DocumentProperties>
     
    604604        mso-font-kerning:14.0pt;}
    605605a:link, span.MsoHyperlink
    606         {mso-style-noshow:yes;
    607         mso-style-priority:99;
     606        {mso-style-priority:99;
    608607        color:blue;
    609608        text-decoration:underline;
     
    35193518window... <o:p></o:p></span></p>
    35203519
    3521 <h4><a name="_Image_Masks"></a><a href="#_Image_Masks"><span style='color:#4F81BD;
    3522 mso-themecolor:accent1;text-decoration:none;text-underline:none'>Image Ma<span
    3523 style='mso-bookmark:Image_Masks'></span>sks</span></a><![if !supportNestedAnchors]><a
     3520<h4><a href="#_Image_Masks"><span style='color:#4F81BD;mso-themecolor:accent1;
     3521text-decoration:none;text-underline:none'>Image Ma<span style='mso-bookmark:
     3522Image_Masks'></span>sks</span></a><![if !supportNestedAnchors]><a
    35243523name="Image_Masks"></a><![endif]></h4>
    35253524
     
    35353534the following:<o:p></o:p></span></p>
    35363535
    3537 <h4><a name=General></a><a name="_Ref317241833"><span style='mso-bookmark:General'><u>General</u>
    3538 Phase Parameters</span></a><span style='mso-bookmark:General'></span></h4>
     3536<h4><a name=General><u>General</u> Phase Parameters</a></h4>
    35393537
    35403538<span style='mso-bookmark:General'></span>
     
    35703568search the computed Fourier map. Peaks that are above &#8216;Peak cutoff&#8217;
    35713569% of the maximum will be found in this procedure; they will be printed on the
    3572 console and will be shown in the &#8216;<a href="gsasII.html">Map peaks</a>&#8217;
     3570console and will be shown in the &#8216;<a name="Map_peaks"></a><a
     3571href="gsasII.html"><span style='mso-bookmark:Map_peaks'>Map peaks</span><span
     3572style='mso-bookmark:Map_peaks'></span></a><span style='mso-bookmark:Map_peaks'></span>&#8217;
    35733573page. This page will immediately be shown and the peaks will be shown on the
    35743574structure drawing for this phase as white 3-D crosses.<o:p></o:p></span></p>
     
    35843584structure solution using the method of <span class=SpellE>Oszlanyi</span> &amp;
    35853585<span class=SpellE>Suto</span> (<span class=SpellE>Acta</span> <span
    3586 class=SpellE>Cryst</span>. A60, 134-141, 2004<span class=GramE>) .</span> You
    3587 will need to select a source for the reflection set and perhaps select an
    3588 element for normalization by its form factor, a resolution limit (usually 0.5A)
    3589 and a charge flip threshold (usually 0.1); these are found at the bottom of the
    3590 <b style='mso-bidi-font-weight:normal'>General</b> window. A progress bar showing
     3586class=SpellE>Cryst</span>. A60, 134-141, 2004). You will need to select a
     3587source for the reflection set and perhaps select an element for normalization
     3588by its form factor, a resolution limit (usually 0.5A) and a charge flip
     3589threshold (usually 0.1); these are found at the bottom of the <b
     3590style='mso-bidi-font-weight:normal'>General</b> window. A progress bar showing
    35913591the charge flip residual is shown while the charge flip is in operation. When the
    35923592residual is no longer decreasing (be patient &#8211; it doesn&#8217;t
     
    38843884<h5><span style='mso-fareast-font-family:"Times New Roman"'><o:p>&nbsp;</o:p></span></h5>
    38853885
    3886 <h4><a name=Atoms></a><u>Atoms<o:p></o:p></u></h4>
     3886<h4><a name=Atoms></a><u><a href="#Atoms" target="_self">Atoms</a><o:p></o:p></u></h4>
    38873887
    38883888<p class=MsoNormal>This is the table of parameters for the atoms in this
     
    43434343"Times New Roman"'>What can I do here?<o:p></o:p></span></span></h5>
    43444344
    4345 <h4><span style='mso-bookmark:Pawley'><a name="Map_peaks">Map peaks<o:p></o:p></a></span></h4>
    4346 
    4347 <span style='mso-bookmark:Map_peaks'></span>
     4345<h4><span style='mso-bookmark:Pawley'>Map peaks<o:p></o:p></span></h4>
    43484346
    43494347<p class=MsoNormal><span style='mso-bookmark:Pawley'>This gives the list
  • trunk/help/gsasII_files/props011.xml

    r790 r791  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 <ds:datastoreItem ds:itemID="{C2EB0BEA-FEAB-4984-A685-9487540DE92E}" xmlns:ds="http://schemas.openxmlformats.org/officeDocument/2006/customXml"><ds:schemaRefs><ds:schemaRef ds:uri="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"/></ds:schemaRefs></ds:datastoreItem>
     2<ds:datastoreItem ds:itemID="{6FD6FFB2-011B-4363-9B51-5473365208E6}" xmlns:ds="http://schemas.openxmlformats.org/officeDocument/2006/customXml"><ds:schemaRefs><ds:schemaRef ds:uri="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"/></ds:schemaRefs></ds:datastoreItem>
Note: See TracChangeset for help on using the changeset viewer.