From 0db1c1cd341de2bff7470ad654d1dd1b073c8df4 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 21 Jan 2009 15:49:32 +0000 Subject: [PATCH] merge from BR_V5_IMP_P8 --- idl/SALOME_Component.idl | 20 ++++++++++++++++++++ src/Container/SALOME_Component_i.hxx | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/idl/SALOME_Component.idl b/idl/SALOME_Component.idl index 1d528a5e9..d12f1e190 100644 --- a/idl/SALOME_Component.idl +++ b/idl/SALOME_Component.idl @@ -26,6 +26,7 @@ #ifndef _SALOME_COMPONENT_IDL_ #define _SALOME_COMPONENT_IDL_ +#include "SALOMEDS.idl" #include "SALOME_Exception.idl" /*! \brief @@ -388,6 +389,25 @@ module Engines */ Engines::Salome_file setOutputFileToService(in string service_name, in string Salome_file_name) raises(SALOME::SALOME_Exception); + /*! + Returns true if the component provides custom information about its objects, false otherwise. + Should be redefined in the certain component to return true in case of this + component provides such information. + */ + boolean hasObjectInfo(); + + /*! + This method is used to get the custom information about the given object. + Should be redefined in the certain component in case of this + component provides such information. + It is worth using this method only if hasObjectInfo() method returns true. + + \param entry object's entry. + \param studyId study id + + \return an information about the given object. + */ + string getObjectInfo(in long studyId, in string entry); } ; interface Parallel_Component : Engines::Component { diff --git a/src/Container/SALOME_Component_i.hxx b/src/Container/SALOME_Component_i.hxx index 5c9080a30..ccf8ddff2 100644 --- a/src/Container/SALOME_Component_i.hxx +++ b/src/Container/SALOME_Component_i.hxx @@ -24,7 +24,7 @@ // Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA // Module : SALOME // $Header$ -// + #ifndef _SALOME_COMPONENT_I_HXX_ #define _SALOME_COMPONENT_I_HXX_ @@ -117,6 +117,11 @@ public: virtual void checkOutputFilesToService(const char* service_name); virtual Engines::Salome_file_ptr setOutputFileToService(const char* service_name, const char* Salome_file_name); + + // Object information + virtual bool hasObjectInfo() { return false; } + virtual char* getObjectInfo(CORBA::Long studyId, const char* entry) { return ""; } + // --- local C++ methods PortableServer::ObjectId * getId(); -- 2.39.2