From 11eb27805da7ccbf02a7b01a35d97bf9cd85127e Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 16 Oct 2012 08:31:12 +0000 Subject: [PATCH] 0021478: EDF 2083 ALL: Write the version of Salome used to create the study in the hdf file --- src/VISU_I/Makefile.am | 3 ++- src/VISU_I/VISU_Gen_i.cc | 11 +++++++++++ src/VISU_I/VISU_Gen_i.hh | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/VISU_I/Makefile.am b/src/VISU_I/Makefile.am index eba2518d..17fbb12d 100644 --- a/src/VISU_I/Makefile.am +++ b/src/VISU_I/Makefile.am @@ -133,7 +133,8 @@ libVISUEngineImpl_la_CPPFLAGS= \ -I$(srcdir)/../CONVERTOR \ -I$(srcdir)/../PIPELINE \ -I$(srcdir)/../OBJECT \ - -I$(top_builddir)/idl + -I$(top_builddir)/idl \ + -I$(top_builddir) libVISUEngineImpl_la_LDFLAGS= \ $(KERNEL_LDFLAGS) \ diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc index 8c222302..c93ba092 100644 --- a/src/VISU_I/VISU_Gen_i.cc +++ b/src/VISU_I/VISU_Gen_i.cc @@ -25,6 +25,7 @@ // Author : Alexey PETROV // Module : VISU +#include "VISU_version.h" #include "VISU_Gen_i.hh" #include "VISU_Result_i.hh" #include "VISU_PrsObject_i.hh" @@ -1876,4 +1877,14 @@ namespace VISU return aMarkerId; } + + // Version information + char* VISU_Gen_i::getVersion() + { +#if VISU_DEVELOPMENT + return CORBA::string_dup( VISU_VERSION_STR"dev" ); +#else + return CORBA::string_dup( VISU_VERSION_STR ); +#endif + } } diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh index 7513387d..5d3f39d7 100644 --- a/src/VISU_I/VISU_Gen_i.hh +++ b/src/VISU_I/VISU_Gen_i.hh @@ -394,6 +394,9 @@ namespace VISU CORBA::Long theObjectID, SALOMEDS::SObject_ptr theObject); + + char* getVersion(); + virtual VISU::ColoredPrs3dCache_ptr GetColoredPrs3dCache(SALOMEDS::Study_ptr theStudy); -- 2.39.2