From 9e75f401bb8fa59c32c9a3a9aa797722bd79e64f Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 16 Oct 2012 08:43:17 +0000 Subject: [PATCH] 0021478: EDF 2083 ALL: Write the version of Salome used to create the study in the hdf file --- src/HOMARD_I/HOMARD_Gen_i.cxx | 11 +++++++++++ src/HOMARD_I/HOMARD_Gen_i.hxx | 11 ++++++----- src/HOMARD_I/Makefile.am | 3 ++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx index 9415aa68..5bb00f44 100755 --- a/src/HOMARD_I/HOMARD_Gen_i.cxx +++ b/src/HOMARD_I/HOMARD_Gen_i.cxx @@ -17,6 +17,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // +#include "HOMARD_version.h" #include "HOMARD_Gen_i.hxx" #include "HOMARD_Cas_i.hxx" #include "HOMARD_Hypothesis_i.hxx" @@ -2701,6 +2702,16 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Object_ptr theStudy, return aStreamFile._retn(); } +//========================================================================== +char* HOMARD_Gen_i::getVersion() +{ +#if HOMARD_DEVELOPMENT + return CORBA::string_dup(HOMARD_VERSION_STR"dev"); +#else + return CORBA::string_dup(HOMARD_VERSION_STR); +#endif +} + //============================================================================= extern "C" { diff --git a/src/HOMARD_I/HOMARD_Gen_i.hxx b/src/HOMARD_I/HOMARD_Gen_i.hxx index 4f646768..62ec32bf 100644 --- a/src/HOMARD_I/HOMARD_Gen_i.hxx +++ b/src/HOMARD_I/HOMARD_Gen_i.hxx @@ -220,11 +220,12 @@ private: HOMARD::HOMARD_Boundary_ptr newBoundary(); - virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy, - CORBA::Boolean isPublished, - CORBA::Boolean isMultiFile, - CORBA::Boolean& isValidScript); - + virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy, + CORBA::Boolean isPublished, + CORBA::Boolean isMultiFile, + CORBA::Boolean& isValidScript); + + virtual char* getVersion(); private: struct StudyContext diff --git a/src/HOMARD_I/Makefile.am b/src/HOMARD_I/Makefile.am index c71252bb..86c0c4b5 100644 --- a/src/HOMARD_I/Makefile.am +++ b/src/HOMARD_I/Makefile.am @@ -59,9 +59,10 @@ libHOMARDEngine_la_CPPFLAGS = \ $(GEOM_CXXFLAGS) \ -I$(srcdir)/../HOMARD \ -I$(srcdir)/../HOMARDGUI \ + -I$(top_builddir) \ -I$(top_builddir)/idl \ -I$(GEOM_ROOT_DIR)/include/salome \ - -I$(SMESH_ROOT_DIR)/include/salome \ + -I$(SMESH_ROOT_DIR)/include/salome \ -I$(MED_ROOT_DIR)/include/salome \ -I$(top_builddir)/adm_local/unix -- 2.39.2