X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGraphExecutor%2FDataFlowExecutor_DataFlow.lxx;h=67c89483739242d45d87aa72000eac20d8502882;hb=21f42338a5a328977269d6e4ee57b9a672cd3bf5;hp=77dfb0398447d51b31b90f364d71cf0589935810;hpb=d81e824af6a4df1aeefd6762c48eccc53daca49c;p=modules%2Fsuperv.git

diff --git a/src/GraphExecutor/DataFlowExecutor_DataFlow.lxx b/src/GraphExecutor/DataFlowExecutor_DataFlow.lxx
index 77dfb03..67c8948 100644
--- a/src/GraphExecutor/DataFlowExecutor_DataFlow.lxx
+++ b/src/GraphExecutor/DataFlowExecutor_DataFlow.lxx
@@ -1,44 +1,62 @@
+//  SUPERV GraphExecutor : contains classes that permit execution of graphs and particularly the execution automaton
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : DataFlowExecutor_DataFlow.lxx
+//  Module : SUPERV
+
 #ifndef _DATAFLOWEXECUTOR_DATAFLOW_LXX
 #define _DATAFLOWEXECUTOR_DATAFLOW_LXX
 
 #include "DataFlowExecutor_OutNode.hxx"
 
-inline bool GraphExecutor::DataFlow::LoadDataFlow(
-       const GraphBase::SGraph &aDataFlow ) {
+inline bool GraphExecutor::DataFlow::LoadDataFlow( const GraphBase::SGraph * aDataFlow ) {
   return GraphExecutor::OutNode::LoadDataFlow( aDataFlow ) ; 
 }
 
-inline bool GraphExecutor::DataFlow::LoadXml( const char* myFileName ) {
-  return GraphExecutor::OutNode::LoadXml( myFileName ) ; 
-}
+//inline bool GraphExecutor::DataFlow::LoadXml( const char* myFileName ) {
+//  return GraphExecutor::OutNode::LoadXml( myFileName ) ; 
+//}
 
-inline const SALOME_ModuleCatalog::Service * GraphExecutor::DataFlow::NodeService(
-                                             const char * aNodeName ) {
-  if ( GetGraphNode( aNodeName ) )
-    return GetGraphNode( aNodeName )->GetService() ;
+inline const SALOME_ModuleCatalog::Service * GraphExecutor::DataFlow::NodeService( const char * aNodeName ) {
+  if ( Graph()->GetGraphNode( aNodeName ) )
+    return Graph()->GetGraphNode( aNodeName )->GetService() ;
   return NULL ;
 }
 
-inline bool GraphExecutor::DataFlow::ChangeInputData( const char* ToNodeName ,
-                                                 const char* ToParameterName ,
-                                                 const CORBA::Any aValue ) {
+inline bool GraphExecutor::DataFlow::AddInputData( const char* ToNodeName ,
+                                                   const char* ToParameterName ,
+                                                   const CORBA::Any aValue ) {
   if ( !IsValid() )
     return false ;
-  return GraphBase::Graph::ChangeInputData( ToNodeName , ToParameterName ,
-                                            aValue ) ; 
+  return Graph()->AddInputData( ToNodeName , ToParameterName , aValue ) ; 
 } ;
 
-inline bool GraphExecutor::DataFlow::AddInputSharedData(const char* ToNodeName1 ,
-                                                      const char* ToParameterName1 ,
-                                                      const char* ToNodeName2 ,
-                                                      const char* ToParameterName2 ) {
+inline bool GraphExecutor::DataFlow::ChangeInputData( const char* ToNodeName ,
+                                                      const char* ToParameterName ,
+                                                      const CORBA::Any aValue ) {
   if ( !IsValid() )
     return false ;
-  return GraphExecutor::OutNode::AddInputData( ToNodeName1 ,
-                                               ToParameterName1 ,
-                                               ToNodeName2 ,
-                                               ToParameterName2 ) ;
-//                                         aKindOfPortValue ) ; 
+  return Graph()->ChangeInputData( ToNodeName , ToParameterName , aValue ) ; 
 } ;
 
 inline bool GraphExecutor::DataFlow::IsValid() {
@@ -52,11 +70,6 @@ inline bool GraphExecutor::DataFlow::IsExecutable() {
 inline bool GraphExecutor::DataFlow::Run( const bool AndSuspend ) {
   return GraphExecutor::OutNode::Run( AndSuspend ) ;
 }
-inline bool GraphExecutor::DataFlow::Run( const char * aNodeName ,
-                                          const char * AtNodeName ,
-                                          const bool AndSuspend ) {
-  return GraphExecutor::OutNode::Run( aNodeName ,  AtNodeName , AndSuspend ) ;
-}
 
 inline long GraphExecutor::DataFlow::LastLevelDone() {
   return GraphExecutor::OutNode::LastLevelDone() ;
@@ -77,6 +90,13 @@ inline bool GraphExecutor::DataFlow::EventW( char ** aNodeName ,
                                              SUPERV::GraphState & aState ) {
   return GraphExecutor::OutNode::EventW( aNodeName , anEvent , aState ) ;
 }
+inline long GraphExecutor::DataFlow::EventQSize() {
+  return GraphExecutor::OutNode::EventQSize() ;
+}
+
+inline void GraphExecutor::DataFlow::State(GraphExecutor::AutomatonState aState ) {
+  GraphExecutor::OutNode::State( aState ) ;
+}
 
 inline SUPERV::GraphState GraphExecutor::DataFlow::State() {
   return GraphExecutor::OutNode::State() ;
@@ -101,11 +121,11 @@ inline long GraphExecutor::DataFlow::Thread( const char * aNodeName ) {
   return GraphExecutor::OutNode::Thread( aNodeName ) ;
 }
 
-inline SUPERV::AutomatonState GraphExecutor::DataFlow::AutomatonState() {
+inline GraphExecutor::AutomatonState GraphExecutor::DataFlow::AutomatonState() {
   return GraphExecutor::OutNode::AutomatonState() ;
 }
 
-inline SUPERV::AutomatonState GraphExecutor::DataFlow::AutomatonState(
+inline GraphExecutor::AutomatonState GraphExecutor::DataFlow::AutomatonState(
                                const char * aNodeName ) {
   return GraphExecutor::OutNode::AutomatonState( aNodeName ) ;
 }
@@ -160,11 +180,10 @@ inline bool GraphExecutor::DataFlow::IsSuspended(const char * aNodeName ) {
   return GraphExecutor::OutNode::IsSuspended( aNodeName ) ;
 }
 
-inline bool GraphExecutor::DataFlow::IsDone(
-                                  const char * aNodeName ,
-                                  const char * anOutServiceParameterName ) {
-  return GraphExecutor::OutNode::IsDone( aNodeName ,
-                                         anOutServiceParameterName ) ;
+inline bool GraphExecutor::DataFlow::PortDone( const char * aNodeName ,
+                                               const char * anOutServiceParameterName ) {
+  return GraphExecutor::OutNode::PortDone( aNodeName ,
+                                           anOutServiceParameterName ) ;
 }
 
 inline bool GraphExecutor::DataFlow::ReadyWait() {
@@ -193,13 +212,15 @@ inline bool GraphExecutor::DataFlow::SuspendedWait(const char * aNodeName ) {
   return GraphExecutor::OutNode::SuspendedWait( aNodeName ) ;
 }
 
-inline const CORBA::Any *GraphExecutor::DataFlow::GetInData(
+//JR 30.03.2005inline const CORBA::Any *GraphExecutor::DataFlow::GetInData(
+inline const CORBA::Any GraphExecutor::DataFlow::GetInData(
                                    const char * ToNodeName ,
                                    const char * ToParameterName ) {
   return GraphExecutor::OutNode::GetInData( ToNodeName ,
                                             ToParameterName ) ;
 }
-inline const CORBA::Any *GraphExecutor::DataFlow::GetOutData(
+//JR 30.03.2005inline const CORBA::Any *GraphExecutor::DataFlow::GetOutData(
+inline const CORBA::Any GraphExecutor::DataFlow::GetOutData(
                                    const char * FromNodeName ,
                                    const char * FromParameterName ) {
   return GraphExecutor::OutNode::GetOutData( FromNodeName ,