diff --git a/Core/PythonAPI/src/PythonInterface_free_functions.pypp.cpp b/Core/PythonAPI/src/PythonInterface_free_functions.pypp.cpp index 3bad3113fb18596a94eced00a426f9db4a214f17..c4dc38feb3b97ce6f47c2756403cd01dfb6138b6 100644 --- a/Core/PythonAPI/src/PythonInterface_free_functions.pypp.cpp +++ b/Core/PythonAPI/src/PythonInterface_free_functions.pypp.cpp @@ -27,6 +27,26 @@ void register_free_functions(){ } + { //::AppVersion::GetMajorVersionNumber + + typedef int ( *GetMajorVersionNumber_function_type )( ); + + bp::def( + "GetMajorVersionNumber" + , GetMajorVersionNumber_function_type( &::AppVersion::GetMajorVersionNumber ) ); + + } + + { //::AppVersion::GetMinorVersionNumber + + typedef int ( *GetMinorVersionNumber_function_type )( ); + + bp::def( + "GetMinorVersionNumber" + , GetMinorVersionNumber_function_type( &::AppVersion::GetMinorVersionNumber ) ); + + } + { //::GetOutputData typedef ::PyObject * ( *GetOutputData_function_type )( ::Simulation const & ); @@ -60,6 +80,26 @@ void register_free_functions(){ } + { //::AppVersion::GetPatchVersionNumber + + typedef int ( *GetPatchVersionNumber_function_type )( ); + + bp::def( + "GetPatchVersionNumber" + , GetPatchVersionNumber_function_type( &::AppVersion::GetPatchVersionNumber ) ); + + } + + { //::AppVersion::GetVersionNumber + + typedef ::std::string ( *GetVersionNumber_function_type )( ); + + bp::def( + "GetVersionNumber" + , GetVersionNumber_function_type( &::AppVersion::GetVersionNumber ) ); + + } + { //::Units::deg2rad typedef double ( *deg2rad_function_type )( double ); diff --git a/Core/Samples/inc/Version.h b/Core/Samples/inc/Version.h index 4554463d4795669811345c00bf91359d2c4997a3..15f775cdab2e1c333ec32b13659a7b6c6a8dbd9d 100644 --- a/Core/Samples/inc/Version.h +++ b/Core/Samples/inc/Version.h @@ -20,12 +20,16 @@ #include <sstream> namespace AppVersion { - const std::string g_app_name = "Born Again"; + const std::string g_app_name = "BornAgain"; const int major_version_number = 0; const int minor_version_number = 8; const int patch_version_number = 2; - std::string GetVersionNumber() + inline int GetMajorVersionNumber() { return major_version_number; } + inline int GetMinorVersionNumber() { return minor_version_number; } + inline int GetPatchVersionNumber() { return patch_version_number; } + + inline std::string GetVersionNumber() { std::ostringstream ostr; ostr << major_version_number diff --git a/Doc/CHANGELOG b/Doc/CHANGELOG index 466213216ae994ade6380ee7f316a0ed9432e280..cf1e868692f54f404eff7f7619c15a53f28ed2ba 100644 --- a/Doc/CHANGELOG +++ b/Doc/CHANGELOG @@ -1 +1,18 @@ -BornAgain-<version>, first source archive release, <date> + + +BornAgain-0.8.2 2013.07.30 + * Particle interface changed to accept HomogeneousMaterial + +BornAgain-0.8.1 2013.07.26 + * CMake based build system + * PythonAPI automatic code generation redesign + * User Manual v0.1 + * libBornAgainFit + * FunctionalTest collection + + +BornAgain-0.7.0 2013.04.10 + * First public release + + + diff --git a/INSTALL b/INSTALL index fc4482446292a5a556039c2b449f38ebbdc8fa37..458906f213d9b6600f6024e60b1df1dc829546e9 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ Brief Installation instruction for BornAgain framework -Detailed installation instructions can be found in User Guide available at +Detailed installation instructions can be found at http://apps.jcns.fz-juelich.de/BornAgain diff --git a/README b/README index 295da33bff196bbb6620f112b980534720f6c6fe..e132126f8462e0b139d6fad84c89687f8cc0dee0 100644 --- a/README +++ b/README @@ -1,8 +1,10 @@ A software to simulate and fit neutron and x-ray scattering at grazing incidence (GISANS and GISAXS), using distorted-wave Born approximation (DWBA). -license : GNU General Public License v3 or higher (see Doc/COPYING) -homepage: http://apps.jcns.fz-juelich.de/BornAgain +license : GNU General Public License v3 or higher (see Doc/COPYING) +homepage : http://apps.jcns.fz-juelich.de/BornAgain +Installation : see INSTALL +changelog : see Doc/CHANGELOG diff --git a/dev-tools/python-bindings/MakePyCore.py b/dev-tools/python-bindings/MakePyCore.py index 5b23a8034946f48c48e4f56668af2236c3ea9a31..c5d0df958d4738e839be757932f9d8bd2a420820 100644 --- a/dev-tools/python-bindings/MakePyCore.py +++ b/dev-tools/python-bindings/MakePyCore.py @@ -224,7 +224,12 @@ def ManualClassTunings(mb): cl.member_functions( ).exclude() # mb.namespace( "MathFunctions" ).free_function("GenerateNormalRandom").include() - + # + mb.namespace( "AppVersion" ).free_function("GetMajorVersionNumber").include() + mb.namespace( "AppVersion" ).free_function("GetMinorVersionNumber").include() + mb.namespace( "AppVersion" ).free_function("GetPatchVersionNumber").include() + mb.namespace( "AppVersion" ).free_function("GetVersionNumber").include() + # excluding specific member functions def ManualExcludeMemberFunctions(mb):