SMH: 3.0.0 preparation = merged version (POLYWORK + RTVDEBUG01) + adopation for new GUI

[modules/superv.git] / src / GraphBase / DataFlowBase_Service.hxx

diff --git a/src/GraphBase/DataFlowBase_Service.hxx b/src/GraphBase/DataFlowBase_Service.hxx
index e6b7b057b55911b59014658b55d6186855522581..84a9240dcc56a6a30715d6fe5ea7ccb8085b42be 100644 (file)
--- a/src/GraphBase/DataFlowBase_Service.hxx
+++ b/src/GraphBase/DataFlowBase_Service.hxx
@@ -37,48 +37,52 @@ namespace GraphBase {
 
   class Service : public Base {
 
-    SALOME_ModuleCatalog::Service _Service ;
-    int                           _Instance ;
+    private:
+
+      SALOME_ModuleCatalog::Service _Service ;
+//      int                           _Instance ;
 
     public:   
 
-    Service( const SALOME_ModuleCatalog::Service aService ) {
+      Service( const SALOME_ModuleCatalog::Service aService ) {
              SetService( aService ) ;
 //             MESSAGE( "GraphBase::Service::Service : " << _Service ) ;
 //             cout << "GraphBase::Service::Service : " << _Service << endl ;
              cdebug << "GraphBase::Service::Service : " << _Service << endl ;
              } ;
-    Service( const char * aServiceName ) {
-             _Service.ServiceName = CORBA::string_dup( aServiceName ) ;
-             cdebug << "GraphBase::Service::Service : " << _Service << endl ;
-             _Instance = 0 ; } ;
-    virtual ~Service() {
-             cdebug << "GraphBase::Service::~Service" << endl ;
-             } ;
-
-    void SetService( const SALOME_ModuleCatalog::Service aService ) ;
+      Service( const char * aServiceName ) {
+               _Service.ServiceName = CORBA::string_dup( aServiceName ) ;
+               cdebug << "GraphBase::Service::Service : " << _Service << endl ; } ;
+//               _Instance = 0 ; } ;
+      virtual ~Service() {
+              cdebug << "GraphBase::Service::~Service" << endl ; } ;
 
-    const SALOME_ModuleCatalog::Service * GetService() const {
-          cdebug << "GraphBase::Service::GetService : " << _Service << endl ;
-          return &_Service ; } ;
-    const char * ServiceName() const {
-//          cdebug << "ServiceName " << hex << (void *) _Service.ServiceName
-//                 << dec << " = " << _Service.ServiceName << endl ;
-          return _Service.ServiceName ; } ;
-    const SALOME_ModuleCatalog::ListOfServicesParameter ServiceInParameter() const {
-          return _Service.ServiceinParameter ; } ;
-    const SALOME_ModuleCatalog::ListOfServicesParameter ServiceOutParameter() const {
-          return _Service.ServiceoutParameter ; } ;
+      void SetService( const SALOME_ModuleCatalog::Service aService ) ;
 
-    const int Instances() const { return _Instance ; } ;
-    int NewInstance() { _Instance += 1 ;
-                        return _Instance ; } ;
-    void Instance( int AddInst = 1 ) { if ( AddInst == 1 )
-                                         _Instance += 1 ;
-                                       else
-                                         _Instance = AddInst ; } ;
+      const SALOME_ModuleCatalog::Service * GetService() const {
+            cdebug << "GraphBase::Service::GetService : " << _Service << endl ;
+            return &_Service ; } ;
+      const char * ServiceName() const {
+//            cdebug << "ServiceName " << hex << (void *) _Service.ServiceName
+//                   << dec << " = " << _Service.ServiceName << endl ;
+            return _Service.ServiceName ; } ;
+      const SALOME_ModuleCatalog::ListOfServicesParameter ServiceInParameter() const {
+            return _Service.ServiceinParameter ; } ;
+      const SALOME_ModuleCatalog::ListOfServicesParameter ServiceOutParameter() const {
+            return _Service.ServiceoutParameter ; } ;
+      const SALOME_ModuleCatalog::ListOfServicesDataStreamParameter ServiceInStreamParameter() const {
+            return _Service.ServiceinDataStreamParameter ; } ;
+      const SALOME_ModuleCatalog::ListOfServicesDataStreamParameter ServiceOutStreamParameter() const {
+            return _Service.ServiceoutDataStreamParameter ; } ;
 
-  } ;
+//      const int Instances() const { return _Instance ; } ;
+//      int NewInstance() { _Instance += 1 ;
+//                          return _Instance ; } ;
+//      void Instance( int Inst = 1 ) { if ( Inst == 1 )
+//                                        _Instance += 1 ;
+//                                      else
+//                                        _Instance = Inst ; } ; } ;
+    } ;
 
 } ;