final modifications for 1.2.1

doc/conf.py

@@ -4,7 +4,7 @@
 # sphinx-quickstart on Thu Mar 01 09:52:50 2012.
 
 import sys
-#import os
+import os
 
 # import Cloud
 #import cloud_sptheme as csp
@@ -15,6 +15,7 @@
 #sys.path.insert(0, os.path.abspath('.'))
 sys.path.append(r'c:\Ray-tracing')
 sys.path.append(r'c:\Ray-tracing\xrtQook')
+sys.path.append(os.path.abspath('exts'))
 
 # -- General configuration ----------------------------------------------------
 
@@ -24,7 +25,7 @@
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 #extensions = ['sphinx.ext.autodoc', 'sphinx.ext.pngmath']
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax', 'animation']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -47,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.0'
+version = '1.2.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -86,7 +87,7 @@
 #modindex_common_prefix = []
 
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output --------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
@@ -127,7 +128,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
+html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

doc/history.rst

@@ -3,7 +3,7 @@
 Version history
 ---------------
 
-1.2.1 (18 Sep 2016):
+1.2.1 (19 Sep 2016):
     - Added SRW to some comparisons of synchrotron sources. See :ref:`here
       <undulator_highE>`.
 
@@ -13,12 +13,7 @@ Version history
       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).
+    - xrtQook works now with Qt versions up to 5.7.
 
     - Minor bug fixes and updates.
 

xrt/backends/raycing/sources_synchr.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 __author__ = "Konstantin Klementiev", "Roman Chernikov"
-__date__ = "03 Jul 2016"
+__date__ = "20 Sep 2016"
 import os
 import sys
 #import pickle
@@ -1225,10 +1225,10 @@ def intensities_on_mesh(self, energy='auto', theta='auto', psi='auto',
             self.Ip += Ip.reshape(sh) * wspread
             self.Isp += Isp.reshape(sh) * wspread
 
-        s0 = (self.Is + self.Ip) * wspread
-        s1 = (self.Is - self.Ip) * wspread
-        s2 = (2. * np.real(self.Isp)) * wspread
-        s3 = (-2. * np.imag(self.Isp)) * wspread
+        s0 = self.Is + self.Ip
+        s1 = self.Is - self.Ip
+        s2 = 2. * np.real(self.Isp)
+        s3 = -2. * np.imag(self.Isp)
 
 # convolution with the angular size:
         if self.dx > 0 or self.dz > 0:

xrt/xrtQook/__init__.py

@@ -76,7 +76,7 @@
 
 """
 __author__ = "Roman Chernikov, Konstantin Klementiev"
-__date__ = "18 Sep 2016"
+__date__ = "20 Sep 2016"
 __version__ = "1.1"
 
 import os
@@ -426,7 +426,7 @@ def __init__(self):
         self.descrEdit.setFont(self.defaultFont)
         self.descrEdit.textChanged.connect(self.updateDescription)
 
-        self.setGeometry(100, 100, 1100, 600)
+        self.setGeometry(100, 100, 1200, 600)
 
         if isSpyderConsole:
             self.codeConsole = pythonshell.ExternalPythonShell(
@@ -455,7 +455,7 @@ def __init__(self):
         canvasSplitter.setChildrenCollapsible(False)
 
         mainWidget = QWidget()
-        mainWidget.setMinimumWidth(465)
+        mainWidget.setMinimumWidth(480)
         docWidget = QWidget()
         docWidget.setMinimumWidth(300)
         mainBox = QVBoxLayout()