ready for 1.2.1 release

wangm23456 · Sep 17, 2016 · ad4bdda · ad4bdda
1 parent af84286
commit ad4bdda
Show file tree

Hide file tree

Showing 30 changed files with 8,854 additions and 233 deletions.
diff --git a/doc/_images/Laguerre-Gauss-ani/b_anim.js b/doc/_images/Laguerre-Gauss-ani/b_anim.js
diff --git a/doc/_images/Laguerre-Gauss-ani/b_packed.png b/doc/_images/Laguerre-Gauss-ani/b_packed.png
diff --git a/doc/_images/Laguerre-Gauss-ani/s_anim.js b/doc/_images/Laguerre-Gauss-ani/s_anim.js
diff --git a/doc/_images/Laguerre-Gauss-ani/s_packed.png b/doc/_images/Laguerre-Gauss-ani/s_packed.png
diff --git a/doc/_images/flux_BioNanoMAX.png b/doc/_images/flux_BioNanoMAX.png
diff --git a/doc/_images/mayavi_0em_2srw.png b/doc/_images/mayavi_0em_2srw.png
diff --git a/doc/_images/mayavi_0em_3xrt.png b/doc/_images/mayavi_0em_3xrt.png
diff --git a/doc/_images/mayavi_non0em_2srw.png b/doc/_images/mayavi_non0em_2srw.png
diff --git a/doc/_images/mayavi_non0em_3xrt.png b/doc/_images/mayavi_non0em_3xrt.png
diff --git a/doc/_images/mayavi_non0em_non0spread_2srw.png b/doc/_images/mayavi_non0em_non0spread_2srw.png
diff --git a/doc/_images/mayavi_non0em_non0spread_3xrt.png b/doc/_images/mayavi_non0em_non0spread_3xrt.png
diff --git a/doc/_static/thumbnail.css b/doc/_static/thumbnail.css
@@ -1,7 +1,7 @@
 .thumbnail{
 position: relative;
 z-index: 0;
-cursor: pointer;
+cursor: zoom-in;
 transition: 0.3s;
 }
 .thumbnail:hover{
@@ -29,7 +29,7 @@ visibility: visible;
 .thumbnailhover{
 position: relative;
 z-index: 0;
-cursor: pointer;
+cursor: zoom-in;
 transition: 0.3s;
 }
 .thumbnailhover:hover{

diff --git a/doc/anim_encoder/anim_encoder.py b/doc/anim_encoder/anim_encoder.py
@@ -474,15 +474,15 @@ def generate_animation(dirname, fname, time_factor=5,
 #    fname = 'cxi-1D-2-hybr-1e6hor-0emit-0enSpread-monoE-08p-ExpFocusPhase*.png'
 #    fname = 'cxi-1D-2-hybr-1e6hor-0emit-0enSpread-monoE-08pf-ExpFocusPhaseFront*.png'
 
-    dirName = r'c:\Ray-tracing\examples\withRaycing\44_SoftiCXI'
-#    fname = '1D-1-rays-hor-0emit-0enSpread-monoE-08e-ExpFocus*.png'
-    fname = '1D-2-hybr-hor-0emit-0enSpread-monoE-08e-ExpFocus*.png'
-#    fname = '1D-3-wave-hor-0emit-0enSpread-monoE-08e-ExpFocus*.png'
-#    fname = 'XXIDOC-1D-2-hybr-hor-0emit-0enSpread-monoE--*.png'
-#    fname = 'XXIDOC-1D-2-hybr-hor-non0e-0enSpread-monoE--*.png'
-
-    generate_animation(dirName, "s_"+fname, time_factor=20, endFrameDelay=2000)
-    generate_animation(dirName, fname, time_factor=20, endFrameDelay=2000)
+#    dirName = r'c:\Ray-tracing\examples\withRaycing\44_SoftiCXI'
+##    fname = '1D-1-rays-hor-0emit-0enSpread-monoE-08e-ExpFocus*.png'
+#    fname = '1D-2-hybr-hor-0emit-0enSpread-monoE-08e-ExpFocus*.png'
+##    fname = '1D-3-wave-hor-0emit-0enSpread-monoE-08e-ExpFocus*.png'
+##    fname = 'XXIDOC-1D-2-hybr-hor-0emit-0enSpread-monoE--*.png'
+##    fname = 'XXIDOC-1D-2-hybr-hor-non0e-0enSpread-monoE--*.png'
+#
+#    generate_animation(dirName, "s_"+fname, time_factor=20, endFrameDelay=2000)
+#    generate_animation(dirName, fname, time_factor=20, endFrameDelay=2000)
 
 #    dirName = r'c:\Ray-tracing\examples\withRaycing\33_Warping'
 #    fname = 'rays-perfect-*.png'
@@ -503,3 +503,9 @@ def generate_animation(dirname, fname, time_factor=5,
 #
 #    generate_animation(dirName, "s_"+fname, time_factor=10, endFrameDelay=1000)
 #    generate_animation(dirName, fname, time_factor=10, endFrameDelay=1000)
+
+    dirName = r'c:\Ray-tracing\tests\raycing'
+    fname = '_Laguerre-Gauss-*.png'
+
+    generate_animation(dirName, "s_"+fname, endFrameDelay=1000)
+    generate_animation(dirName, fname, endFrameDelay=1000)
diff --git a/doc/history.rst b/doc/history.rst
@@ -3,15 +3,22 @@
 Version history
 ---------------
 
-1.2.1 (18 Aug 2016):
+1.2.1 (18 Sep 2016):
     - Added SRW to some comparisons of synchrotron sources. See :ref:`here
       <undulator_highE>`.
 
-    - As the main browsers stop supporting flash animations, we have rebuilt
-      all our animations on the documentation pages. The images are animated in
-      JavaScript and feature on spot zooming by mouse click. The total size of
-      the images has become smaller at better image quality and bidirectional
-      animations (doubled number of frames).
+    - As the major browsers stop supporting flash animations, we have rebuilt
+      all our animations on the documentation pages. The images are now
+      animated in JavaScript and feature on spot zooming by mouse click (not in
+      IE though). The total size of the images has become smaller at better
+      image quality and bidirectional animations (doubled number of frames).
+
+    - The development of Qt is such that its every new version requires changes
+      in imports and invoked methods. To make a program work with several Qt
+      versions requires proliferating conditional structures. We try to follow
+      the Qt development. xrtQook works fine with the Qt versions up to 5.6.
+      With the Qt versions 5.6+, the functionality of xrtQook help is somewhat
+      restricted (so far).
 
     - Minor bug fixes and updates.