From 48577e669e926969410f28ffb8a7501ad0cd48f0 Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Fri, 30 Oct 2015 12:49:03 +0100
Subject: [PATCH] This is release 1.4.0

---
 CHANGELOG                                     | 40 +++++++++++++++++++
 Core/Samples/inc/BAVersion.h                  |  2 +-
 Doc/Doxygen/Doxyfile                          |  2 +-
 .../modules/FindBornAgain.cmake               |  4 +-
 VERSION.cmake                                 |  2 +-
 5 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f8d232f1c36..f02c0ad4df4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,43 @@
+BornAgain-1.4.0, released 2015.10.30
+  > No API changes
+  > Summary:
+    1) Improved usability of IntensityData objects (slicing, histogram filling, ...)
+    2) GUI: export of simulation results into tiff or ascii file
+    3) Core: rectangular detector added (not yet in GUI)
+    4) Documentation: extra fitting examples on website
+    5) Various bugfixes
+  > Details of Sprint #29 (see http://apps.jcns.fz-juelich.de/redmine/projects/bornagain/issues)
+  * Bug #1083: Trivial MultiLayer samples (no roughness, no particles) cause simulation crash.
+  * Bug #1130: Validate form factor of truncated sphere for absorption case
+  * Bug #1136: Numerical instability at phi_f=0 on MacOS for Pyramid based form factors
+  * Bug #1152: In Real Time Activity view, negative positions cannot be achieved
+  * Bug #1157: Qt dependency is not mentioned in INSTALL
+  * Bug #1158: many checks fail (1.3.0)
+  * Bug #1167: GUI crash when showing projection
+  * Bug #1170: GUI: InstrumentView alignment problem in detector parameters
+  * Bug #1171: GUI: make thickness disabled for air and substrate layers
+  * Bug #1173: Revise ParticleDistribution base class
+  * Bug #1174: GUI: color of layer does not change if color of material has been changed
+  * Bug #1198: GUI: fix simulation for particle distributions and negative z coordinate
+  * Bug #1212: Windows: modify installer to prepend BornAgain location to system PATH instead of appending to it
+  * Bug #1215: Repair wrong usage of double_epsilon in Core
+  * Bug #1216: GUI: normalization of intensity
+  * Bug #1223: FormFactorTruncatedCube instability under MacOS
+  * Feature #922: Add slicing to IntensityDataFunctions
+  * Feature #948: Implement new IntensityData object with improved usability
+  * Feature #1055: Implement Genetic minimizer to get rid from ROOT dependency
+  * Feature #1081: GUI: provide export of simulation results into tiff file
+  * Feature #1095: Implement rectangular (real space) detector
+  * Feature #1099: Repair fitting with masks
+  * Feature #1179: GUI: provide export of simulation results into text file (*.int)
+  * Feature #1186: Implement tiff import/export in kernel
+  * Documentation #1131: Drupal: describe interference functions
+  * Documentation #1176: Drupal: update installation instructions, tutorials for coming release 1.4
+  * Documentation #1181: Drupal: provide fitting example along slices
+  * Documentation #1182: Drupal: provide fitting example with simultaneous fit of two datasets
+  * Refactoring #619: Masked simulation doesn't use all threads all the time
+  * Refactoring #1064: Get rid of "pylab" in Python scripts
+
 BornAgain-1.3.0, released 2015.07.30
   > API Changes:
     1) Removed 'depth' from ParticleLayout::addParticle: new interface provides for abundance, position and possible rotation
diff --git a/Core/Samples/inc/BAVersion.h b/Core/Samples/inc/BAVersion.h
index 95740aa1ca9..de40bd97620 100644
--- a/Core/Samples/inc/BAVersion.h
+++ b/Core/Samples/inc/BAVersion.h
@@ -22,7 +22,7 @@
 
 namespace BornAgain {
     const int major_version_number = 1;
-    const int minor_version_number = 3;
+    const int minor_version_number = 4;
     const int patch_version_number = 0;
 
     inline int GetMajorVersionNumber() { return major_version_number; }
diff --git a/Doc/Doxygen/Doxyfile b/Doc/Doxygen/Doxyfile
index cda121287b3..361e2f225ce 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         = 1.3.0
+PROJECT_NUMBER         = 1.4.0
 
 # 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/Examples/cpp/CylindersAndPrisms/modules/FindBornAgain.cmake b/Examples/cpp/CylindersAndPrisms/modules/FindBornAgain.cmake
index 0b03f6482dd..6af50792b0c 100644
--- a/Examples/cpp/CylindersAndPrisms/modules/FindBornAgain.cmake
+++ b/Examples/cpp/CylindersAndPrisms/modules/FindBornAgain.cmake
@@ -6,8 +6,8 @@
 set(BORNAGAINSYS $ENV{BORNAGAINSYS})
 
 if(BORNAGAINSYS)
-    set(BORNAGAIN_LIBRARY_DIR ${BORNAGAINSYS}/lib/BornAgain-1.3)
-    set(BORNAGAIN_INCLUDE_DIR ${BORNAGAINSYS}/include/BornAgain-1.3)
+    set(BORNAGAIN_LIBRARY_DIR ${BORNAGAINSYS}/lib/BornAgain-1.4)
+    set(BORNAGAIN_INCLUDE_DIR ${BORNAGAINSYS}/include/BornAgain-1.4)
 endif()
 
 find_library (BORNAGAIN_CORE BornAgainCore
diff --git a/VERSION.cmake b/VERSION.cmake
index 6af1536943d..a07b1258e40 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,3 +1,3 @@
 set(BornAgain_VERSION_MAJOR 1)
-set(BornAgain_VERSION_MINOR 3)
+set(BornAgain_VERSION_MINOR 4)
 set(BornAgain_VERSION_PATCH 0)
-- 
GitLab