diff --git a/CHANGELOG b/CHANGELOG
index 25221c3fc1161c7e4a0a04929959c6448e608832..138cef1bc2100a1e89a17ea77564ea2713fe232c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,44 @@
+BornAgain-0.9.9, released 2014.10.29
+ > Summary:
+ 1) Further GUI development: QuickSimulationView, exception catching, property limits
+ 2) Few bugfixes, support for multiple layout objects per layer, python script generation, minor refactoring in UserAPI.
+ 3) User Manual: new appendix with python examples
+ > Details:
+ * Bug #776: GUI: InterferenceFunction2DParaCrystal rotation angle activation
+ * Bug #780: Windows: pixmap of item being dragged is not displayed on DesignerScene
+ * Bug #791: LLDataTest.DataAssignment Unittest failure
+ * Bug #821: Remove interference function approximations from GUI
+ * Bug #826: cmake fails under Debian/testing; problem with Python
+ * Bug #829: CMake is not able to find right Python version when there is a Python2 and Python3 on the system
+ * Bug #833: Duplicate transformation in Real Time Activity view
+ * Bug #835: In Real Time Activity view, setting wavelength to zero causes a crash
+ * Bug #843: Fix nightly build (python script generation functional tests failing)
+ * Feature #393: Create Mac installer
+ * Feature #677: Provide validation of GUI sample for corectness and corresponding info widget
+ * Feature #680: Provide ParameterizedItem's property with tooltips.
+ * Feature #768: Integrate QuickSimulationView into JobView
+ * Feature #769: Remove SimulationDataModel
+ * Feature #778: Windows installer: implement add/remove BornAgain desktop icon
+ * Feature #784: Revise workspace behaviour in DesignerScene
+ * Feature #803: Implement correct handling of simulation failure in JobItem
+ * Feature #805: Implement simple crash handler widget to report bugs
+ * Feature #814: Implement exceptions catching in the Core to report exception from a thread to main thread
+ * Feature #819: Move DA, LMA, SSCA to ParticleLayout and propagate to GUI
+ * Feature #820: Implement reset of JobItem's sample and instrument models to the original.
+ * Feature #822: Revise submit job logic
+ * Feature #823: Allow multiple ILayout objects per layer
+ * Feature #825: Update default behaviour of OutputDataWidget
+ * Feature #828: Trivial form factor for demonstration purposes
+ * Feature #837: Provide all item's properties with correct limits
+ * Feature #838: Merge python script generation branch of Abhishek
+ * Feature #845: API: remove Lattice2DIFParameters from InterferenceFunction2DLattice constructor and implement static creators for square and hexagonal lattice IF's
+ * Feature #856: Modify Python Example005 Disorder2 to match description in User Manual
+ * Feature #857: Include GUI into Linux 'make install' command
+ * Documentation #429: Write Appendix which lists all implemented examples from Examples section
+ * Documentation #846: Adapt manual to new constructor for InterferenceFunction2DLattice
+ * Refactoring #786: Remove unnecessary calls to getOutCoefficients
+ * Refactoring #818: Review SimulationParameters
+
BornAgain-0.9.8, released 2014.08.28
> Summary:
1) Further GUI development toward first beta scheduled for October, 2014.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec55d8cd7d54eb066916bbaad8afc4bf531d7d06..80bf158f677c17c21c8bd967709b72d9b310a5d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(BornAgain)
# --- The version number ---
set(BornAgain_VERSION_MAJOR 0)
set(BornAgain_VERSION_MINOR 9)
-set(BornAgain_VERSION_PATCH 8)
+set(BornAgain_VERSION_PATCH 9)
# --- General project settings ---
option(BORNAGAIN_PYTHON "Build with python support" ON)
diff --git a/Core/Samples/inc/BAVersion.h b/Core/Samples/inc/BAVersion.h
index 2f30f1b290e4529e33193199376f5a725dcd075a..810fc818398baad2b9335f5612f2d0c6cae1ccbd 100644
--- a/Core/Samples/inc/BAVersion.h
+++ b/Core/Samples/inc/BAVersion.h
@@ -23,7 +23,7 @@
namespace BornAgain {
const int major_version_number = 0;
const int minor_version_number = 9;
- const int patch_version_number = 8;
+ const int patch_version_number = 9;
inline int GetMajorVersionNumber() { return major_version_number; }
inline int GetMinorVersionNumber() { return minor_version_number; }
diff --git a/Doc/Doxygen/Doxyfile b/Doc/Doxygen/Doxyfile
index a820d6643097089d1ce6075c9eb6552d0767d0b5..fd7c385df6ec2f56844421ce3eab7bbd72e6246c 100644
--- a/Doc/Doxygen/Doxyfile
+++ b/Doc/Doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = "BornAgain"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 0.9.8
+PROJECT_NUMBER = 0.9.9
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/Doc/UserManual/CMakeLists.txt b/Doc/UserManual/CMakeLists.txt
index 3d76def31bd4102c72314ce678cdcde3efbc0ff3..b3fd4519e0302a0dcda6c2be68c5141932d3b117 100644
--- a/Doc/UserManual/CMakeLists.txt
+++ b/Doc/UserManual/CMakeLists.txt
@@ -5,7 +5,7 @@ project(UserManual NONE)
# user manual version number will be automatically propagated into tes
set(UM_VERSION_MAJOR 0)
set(UM_VERSION_MINOR 2)
-set(UM_VERSION_PATCH 5)
+set(UM_VERSION_PATCH 6)
if(POLICY CMP0046)
cmake_policy(SET CMP0046 NEW)
@@ -50,15 +50,15 @@ set(UM_IMAGES
Figures/Box2dxy.eps
Figures/Box2dxz.eps
Figures/Box3d.png
- Figures/Cone2dxy.eps
- Figures/Cone2dxz.eps
+ Figures/Cone2dxy.eps
+ Figures/Cone2dxz.eps
Figures/Cone3d.png
Figures/Sphere2dxy.eps
Figures/Sphere2dxz.eps
Figures/Sphere3d.png
Figures/Spheroid2dxy.eps
Figures/Spheroid2dxz.eps
- Figures/Spheroid3d.png
+ Figures/Spheroid3d.png
Figures/Cone62dxy.eps
Figures/Cone62dxz.eps
Figures/Cone63d.png
@@ -67,30 +67,30 @@ set(UM_IMAGES
Figures/Cuboctahedron3d.png
Figures/Cylinder2dxy.eps
Figures/Cylinder2dxz.eps
- Figures/Cylinder3d.png
- Figures/EllipsoidalCylinder2dxy.eps
- Figures/EllipsoidalCylinder2dxz.eps
+ Figures/Cylinder3d.png
+ Figures/EllipsoidalCylinder2dxy.eps
+ Figures/EllipsoidalCylinder2dxz.eps
Figures/EllipsoidalCylinder3d.png
- Figures/FullSphere2dxy.eps
+ Figures/FullSphere2dxy.eps
Figures/FullSphere2dxz.eps
- Figures/FullSphere3d.png
+ Figures/FullSphere3d.png
Figures/FullSpheroid2dxy.eps
- Figures/FullSpheroid2dxz.eps
- Figures/FullSpheroid3d.png
- Figures/HemiEllipsoid2dxy.eps
- Figures/HemiEllipsoid2dxz.eps
- Figures/HemiEllipsoid3d.png
- Figures/Prism32dxy.eps
- Figures/Prism32dxz.eps
- Figures/Prism33d.png
- Figures/Prism62dxy.eps
+ Figures/FullSpheroid2dxz.eps
+ Figures/FullSpheroid3d.png
+ Figures/HemiEllipsoid2dxy.eps
+ Figures/HemiEllipsoid2dxz.eps
+ Figures/HemiEllipsoid3d.png
+ Figures/Prism32dxy.eps
+ Figures/Prism32dxz.eps
+ Figures/Prism33d.png
+ Figures/Prism62dxy.eps
Figures/Prism62dxz.eps
Figures/Prism63d.png
Figures/Pyramid2dxy.eps
Figures/Pyramid2dxz.eps
- Figures/Pyramid3d.png
+ Figures/Pyramid3d.png
Figures/Ripple12dxy.eps
- Figures/Ripple12dyz.eps
+ Figures/Ripple12dyz.eps
Figures/Ripple13d.png
Figures/Ripple22dxy.eps
Figures/Ripple22dyz.eps
@@ -156,11 +156,11 @@ set(UM_IMAGES
Figures/figure_ex009CosRippleNoInterf.eps
Figures/figure_ex009TriRipple2DLat.eps
Figures/figure_ex009TriRippleNoInterf.eps
- Figures/figure_ex010Beamdiv.eps
+ Figures/figure_ex010BeamDiv.eps
Figures/BAgeometry_wide.jpg
- Figures/fig_ex001.jpg
- Figures/fig_ex002.jpg
- Figures/fig_ex003BA.jpg
+ Figures/fig_ex001.jpg
+ Figures/fig_ex002.jpg
+ Figures/fig_ex003BA.jpg
Figures/fig_ex003BASize.jpg
Figures/fig_ex003DWBA.jpg
Figures/fig_ex005Dis1.jpg
@@ -188,7 +188,7 @@ message("XXX ${tex_inputs}")
ADD_LATEX_DOCUMENT(UserManual.tex
INPUTS ${tex_inputs}
- BIBFILES jw7.bib
+ BIBFILES jw7.bib
IMAGES ${UM_IMAGES}
DEFAULT_SAFEPDF
)
diff --git a/GUI/coregui/images/BornAgain.ico b/GUI/coregui/images/BornAgain.ico
index a1f98545603aea6898ed9a4b04b97a0f0339cd3c..a28a133a63de5edd88e75f8714190da7ae57d929 100644
Binary files a/GUI/coregui/images/BornAgain.ico and b/GUI/coregui/images/BornAgain.ico differ
diff --git a/GUI/main/BornAgain.ico b/GUI/main/BornAgain.ico
index a1f98545603aea6898ed9a4b04b97a0f0339cd3c..a28a133a63de5edd88e75f8714190da7ae57d929 100644
Binary files a/GUI/main/BornAgain.ico and b/GUI/main/BornAgain.ico differ
diff --git a/dev-tools/log/perf_history.txt b/dev-tools/log/perf_history.txt
index 15372e82219c1a63aaa6339bbd4e4915cf82febe..9bed07ffbbc5681e209a6cd6d816ebf1f2f91302 100644
--- a/dev-tools/log/perf_history.txt
+++ b/dev-tools/log/perf_history.txt
@@ -410,3 +410,7 @@
| 2014-09-18 12:16:34 | jcnsopc126 | linuxx8664gcc | 0 | 21.466 | 0.993 | 1.883 | 1.255 | 0.659 | 5.132 | 1.609 | 0.494 | 7.765 | 1.674 |
| 2014-09-18 12:16:59 | jcnsopc126 | linuxx8664gcc | 0 | 21.574 | 1.022 | 1.895 | 1.232 | 0.673 | 5.180 | 1.611 | 0.490 | 7.792 | 1.679 |
+# Release 0.9.9
+
+| date | hostname | sysinfo | tr | total | isgisaxs02 | isgisaxs06a | isgisaxs09b | isgisaxs11 | isgisaxs15 | mesocrystal0 | specmatrix | specmagnetic | polmagcylind |
+| 2014-10-29 11:23:54 | jcnsopc63 | linuxx8664gcc | 0 | 18.662 | 0.277 | 2.183 | 1.502 | 0.589 | 2.106 | 1.687 | 0.495 | 8.053 | 1.770 |