Debug for ObjectReferences with omniORB4

[modules/superv.git] / src / GraphEditor / DataFlowEditor_InNode.hxx

diff --git a/src/GraphEditor/DataFlowEditor_InNode.hxx b/src/GraphEditor/DataFlowEditor_InNode.hxx
index c94afc48bf00d144886214c2ab67e31ceddb334c..0bb2a91154b929c39c3ca92a52fad09a626e4357 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_InNode.hxx
+++ b/src/GraphEditor/DataFlowEditor_InNode.hxx
@@ -27,6 +27,7 @@
 #ifndef _DATAFLOWEDITOR_INNODE_HXX
 #define _DATAFLOWEDITOR_INNODE_HXX
 
+#include "DataFlowBase_Graph.hxx"
 #include "DataFlowBase_FactoryNode.hxx"
 #include "DataFlowBase_GOTONode.hxx"
 #include "DataFlowBase_LoopNode.hxx"
@@ -48,10 +49,12 @@ namespace GraphEditor {
       GraphBase::EndOfLoopNode       * _EndOfLoopNode ;
       GraphBase::SwitchNode          * _SwitchNode ;
       GraphBase::EndOfSwitchNode     * _EndOfSwitchNode ;
+      GraphBase::Graph               * _GraphMacroNode ;
     
     public:
 
       InNode() ;
+//      InNode(GraphBase::GOTONode * aGOTONode ) ;
       InNode( CORBA::ORB_ptr ORB, 
              SALOME_NamingService* ptrNamingService ,
               GraphBase::ListOfFuncName aFuncName ,
@@ -90,8 +93,12 @@ namespace GraphEditor {
                  return _ComputingNode->IsOneOfInLineNodes() ; } ;
       const bool IsOneOfGOTONodes() const {
                  return _ComputingNode->IsOneOfGOTONodes() ; } ;
+      const bool IsMacroNode() const {
+                 return _ComputingNode->IsMacroNode() ; } ;
       const bool IsDataFlowNode() const {
                  return _ComputingNode->IsDataFlowNode() ; } ;
+      const bool IsDataStreamNode() const {
+                 return _ComputingNode->IsDataStreamNode() ; } ;
       const bool IsGOTONode() const {
                  return _ComputingNode->IsGOTONode() ; } ;
       const bool IsLoopNode() const {
@@ -154,11 +161,17 @@ namespace GraphEditor {
                               return _SwitchNode ; } ;
       GraphBase::EndOfSwitchNode * EndOfSwitchNode() {
                                    return _EndOfSwitchNode ; } ;
+      GraphBase::Graph * GraphMacroNode() {
+                         return _GraphMacroNode ; } ;
 
       SUPERV::CNode_var ObjRef() const { return _ComputingNode->ObjRef() ; } ;
       void SetObjRef(SUPERV::CNode_var aNode) {
                      _ComputingNode->SetObjRef( aNode ) ; } ;
 
+      CNode_Impl * ObjImpl() const { return _ComputingNode->ObjImpl() ; } ;
+      void SetObjImpl( CNode_Impl * aGraph ) {
+                       _ComputingNode->SetObjImpl( aGraph ) ; } ;
+
       const SALOME_ModuleCatalog::Service * GetService() const {
             return _ComputingNode->GetService() ; } ;
 
@@ -167,11 +180,14 @@ namespace GraphEditor {
       SUPERV::SDate LastModification() const {
                     return _ComputingNode->LastModification() ; } ;
       char* Author() const {
-            return my_strdup( _ComputingNode->Author() ) ; }
+//JR 17.02.2005 Memory Leak            return my_strdup( _ComputingNode->Author() ) ; }
+            return _ComputingNode->Author() ; }
       char* EditorRelease() const {
-            return my_strdup( _ComputingNode->EditorRelease() ) ; } ;
+//JR 17.02.2005 Memory Leak            return my_strdup( _ComputingNode->EditorRelease() ) ; } ;
+            return _ComputingNode->EditorRelease() ; } ;
       char * Comment() const {
-             return my_strdup( _ComputingNode->Comment() ) ; } ;
+//JR 17.02.2005 Memory Leak             return my_strdup( _ComputingNode->Comment() ) ; } ;
+             return _ComputingNode->Comment() ; } ;
       bool Author( const char * anAuthor ) {
            return _ComputingNode->Author( anAuthor ) ; } ;
       bool EditorRelease( const char* anEditorRelease ) {
@@ -183,18 +199,28 @@ namespace GraphEditor {
                          return _ComputingNode->GetInfo() ; } ;
 
       GraphBase::InPort * AddInPort( const char * InputParameterName ,
-                                     const char * InputParameterType ) {
-                          return _InLineNode->AddInPort( InputParameterName ,
-                                                            InputParameterType ) ; } ;
+                                     const char * InputParameterType ,
+                                     const SUPERV::KindOfPort aKindOfPort ) {
+                          return _ComputingNode->AddInPort( InputParameterName ,
+                                                            InputParameterType ,
+                                                            aKindOfPort ) ; } ;
       GraphBase::OutPort * AddOutPort( const char * OutputParameterName ,
-                                       const char * OutputParameterType ) {
-                           return _InLineNode->AddOutPort( OutputParameterName ,
-                                                              OutputParameterType ) ; } ;
+                                       const char * OutputParameterType ,
+                                       const SUPERV::KindOfPort aKindOfPort ) {
+                           return _ComputingNode->AddOutPort( OutputParameterName ,
+                                                              OutputParameterType ,
+                                                              aKindOfPort ) ; } ;
+      int IncrDataStreamInPorts() {
+        return _ComputingNode->IncrDataStreamInPorts() ;
+      } ;
+      int IncrDataStreamOutPorts() {
+        return _ComputingNode->IncrDataStreamOutPorts() ;
+      } ;
 
       void DelInPort( const char * InputParameterName ) {
-           _InLineNode->DelInPort( InputParameterName ) ; } ;
+           _ComputingNode->DelInPort( InputParameterName ) ; } ;
       void DelOutPort( const char * OutputParameterName ) {
-           _InLineNode->DelOutPort( OutputParameterName ) ; } ;
+           _ComputingNode->DelOutPort( OutputParameterName ) ; } ;
 
       bool IsLinked(const char * ToServiceParameterName ) {
            return _ComputingNode->IsLinked( ToServiceParameterName ) ; } ;
@@ -258,6 +284,8 @@ namespace GraphEditor {
 
       int SubGraph() {
           return _ComputingNode->SubGraph() ; } ;
+      int SubStreamGraph() {
+          return _ComputingNode->SubStreamGraph() ; } ;
 
       char * ComponentName() const {
              return _FactoryNode->ComponentName() ; } ;