Changeset 791

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:

• GSASIIgrid.py (modified) (2 diffs)
• help/gsasII.html (modified) (8 diffs)
• help/gsasII_files/props011.xml (modified) (1 diff)

trunk/GSASIIgrid.py

@@ -35 +35 @@
 htmlFrame = None
 helpMode = 'browser'
-if sys.platform.lower().startswith('win'): helpMode = 'internal' # need a global control to set this
+#if sys.platform.lower().startswith('win'): helpMode = 'internal' # need a global control to set this
     
 htmlFirstUse = True
@@ -131 +131 @@
             htmlPanel.LoadFile(helplink)
     else:
+        pfx = "file://"
+        if sys.platform.lower().startswith('win'):
+            pfx = ''
         if htmlFirstUse:
-            webbrowser.open_new("file://"+helplink)
+            webbrowser.open_new(pfx+helplink)
             htmlFirstUse = False
         else:
-            webbrowser.open("file://"+helplink, new=0, autoraise=True)
+            webbrowser.open(pfx+helplink, new=0, autoraise=True)
 
 class MyHelp(wx.Menu):

trunk/help/gsasII.html

@@ -25 +25 @@
   <o:Author>Von Dreele</o:Author>
   <o:LastAuthor>Von Dreele</o:LastAuthor>
-  <o:Revision>98</o:Revision>
-  <o:TotalTime>3043</o:TotalTime>
+  <o:Revision>103</o:Revision>
+  <o:TotalTime>3119</o:TotalTime>
   <o:Created>2011-11-28T16:49:00Z</o:Created>
-  <o:LastSaved>2012-10-19T16:55:00Z</o:LastSaved>
+  <o:LastSaved>2012-10-19T18:11:00Z</o:LastSaved>
   <o:Pages>9</o:Pages>
-  <o:Words>8489</o:Words>
-  <o:Characters>48392</o:Characters>
+  <o:Words>8495</o:Words>
+  <o:Characters>48423</o:Characters>
   <o:Company>Argonne National Laboratory</o:Company>
   <o:Lines>403</o:Lines>
   <o:Paragraphs>113</o:Paragraphs>
-  <o:CharactersWithSpaces>56768</o:CharactersWithSpaces>
+  <o:CharactersWithSpaces>56805</o:CharactersWithSpaces>
   <o:Version>14.00</o:Version>
  </o:DocumentProperties>
@@ -604 +604 @@
         mso-font-kerning:14.0pt;}
 a:link, span.MsoHyperlink
-        {mso-style-noshow:yes;
-        mso-style-priority:99;
+        {mso-style-priority:99;
         color:blue;
         text-decoration:underline;
@@ -3519 +3518 @@
 window... <o:p></o:p></span></p>
 
-<h4><a name="_Image_Masks"></a><a href="#_Image_Masks"><span style='color:#4F81BD;
-mso-themecolor:accent1;text-decoration:none;text-underline:none'>Image Ma<span
-style='mso-bookmark:Image_Masks'></span>sks</span></a><![if !supportNestedAnchors]><a
+<h4><a href="#_Image_Masks"><span style='color:#4F81BD;mso-themecolor:accent1;
+text-decoration:none;text-underline:none'>Image Ma<span style='mso-bookmark:
+Image_Masks'></span>sks</span></a><![if !supportNestedAnchors]><a
 name="Image_Masks"></a><![endif]></h4>
 
@@ -3535 +3534 @@
 the following:<o:p></o:p></span></p>
 
-<h4><a name=General></a><a name="_Ref317241833"><span style='mso-bookmark:General'><u>General</u>
-Phase Parameters</span></a><span style='mso-bookmark:General'></span></h4>
+<h4><a name=General><u>General</u> Phase Parameters</a></h4>
 
 <span style='mso-bookmark:General'></span>
@@ -3570 +3568 @@
 search the computed Fourier map. Peaks that are above &#8216;Peak cutoff&#8217;
 % of the maximum will be found in this procedure; they will be printed on the
-console and will be shown in the &#8216;<a href="gsasII.html">Map peaks</a>&#8217;
+console and will be shown in the &#8216;<a name="Map_peaks"></a><a
+href="gsasII.html"><span style='mso-bookmark:Map_peaks'>Map peaks</span><span
+style='mso-bookmark:Map_peaks'></span></a><span style='mso-bookmark:Map_peaks'></span>&#8217;
 page. This page will immediately be shown and the peaks will be shown on the
 structure drawing for this phase as white 3-D crosses.<o:p></o:p></span></p>
@@ -3584 +3584 @@
 structure solution using the method of <span class=SpellE>Oszlanyi</span> &amp;
 <span class=SpellE>Suto</span> (<span class=SpellE>Acta</span> <span
-class=SpellE>Cryst</span>. A60, 134-141, 2004<span class=GramE>) .</span> You
-will need to select a source for the reflection set and perhaps select an
-element for normalization by its form factor, a resolution limit (usually 0.5A)
-and a charge flip threshold (usually 0.1); these are found at the bottom of the
-<b style='mso-bidi-font-weight:normal'>General</b> window. A progress bar showing
+class=SpellE>Cryst</span>. A60, 134-141, 2004). You will need to select a
+source for the reflection set and perhaps select an element for normalization
+by its form factor, a resolution limit (usually 0.5A) and a charge flip
+threshold (usually 0.1); these are found at the bottom of the <b
+style='mso-bidi-font-weight:normal'>General</b> window. A progress bar showing
 the charge flip residual is shown while the charge flip is in operation. When the
 residual is no longer decreasing (be patient &#8211; it doesn&#8217;t
@@ -3884 +3884 @@
 <h5><span style='mso-fareast-font-family:"Times New Roman"'><o:p>&nbsp;</o:p></span></h5>
 
-<h4><a name=Atoms></a><u>Atoms<o:p></o:p></u></h4>
+<h4><a name=Atoms></a><u><a href="#Atoms" target="_self">Atoms</a><o:p></o:p></u></h4>
 
 <p class=MsoNormal>This is the table of parameters for the atoms in this
@@ -4343 +4343 @@
 "Times New Roman"'>What can I do here?<o:p></o:p></span></span></h5>
 
-<h4><span style='mso-bookmark:Pawley'><a name="Map_peaks">Map peaks<o:p></o:p></a></span></h4>
-
-<span style='mso-bookmark:Map_peaks'></span>
+<h4><span style='mso-bookmark:Pawley'>Map peaks<o:p></o:p></span></h4>
 
 <p class=MsoNormal><span style='mso-bookmark:Pawley'>This gives the list

trunk/help/gsasII_files/props011.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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>
+<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>