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

[modules/superv.git] / src / GraphBase / DataFlowBase_GOTONode.cxx

diff --git a/src/GraphBase/DataFlowBase_GOTONode.cxx b/src/GraphBase/DataFlowBase_GOTONode.cxx
index c7e779e7ccdcdf563d4429b06926fcc73cd5e1c5..b01509e8052f855b7a62b82d5a08ff7e4a6e9f85 100644 (file)
--- a/src/GraphBase/DataFlowBase_GOTONode.cxx
+++ b/src/GraphBase/DataFlowBase_GOTONode.cxx
@@ -93,40 +93,53 @@ GraphBase::GOTONode::~GOTONode() {
 //    delete [] _Comment;
 }
 
+#define CoupledNodeTrace 0
 void GraphBase::GOTONode::CoupledNode( GraphBase::InLineNode * aCoupledNode ) {
+#if CoupledNodeTrace
   cdebug << this << " " << Name() << " GraphBase::GOTONode::CoupledNode( " ;
+#endif
   if ( aCoupledNode ) {
     CoupledNodeName( aCoupledNode->Name() ) ;
+#if CoupledNodeTrace
     cdebug << aCoupledNode->Name() ;
+#endif
   }
   else {
+#if CoupledNodeTrace
     cdebug << "NULL" ;
+#endif
   }
+#if CoupledNodeTrace
   cdebug << " )" << endl ;
+#endif
   _CoupledNode = aCoupledNode ;
 }
 
 const GraphBase::InLineNode * GraphBase::GOTONode::CoupledNode() const {
-//  cdebug << this << " " << Name() << " GraphBase::GOTONode::CoupledNode() --> " ;
-//  if ( _CoupledNode ) {
-//    cdebug << _CoupledNode->Name() ;
-//  }
-//  else {
-//    cdebug << "NULL" ;
-//  }
-//  cdebug << endl ;
+#if CoupledNodeTrace
+  cdebug << this << " " << Name() << " GraphBase::GOTONode::CoupledNode() --> " ;
+  if ( _CoupledNode ) {
+    cdebug << _CoupledNode->Name() ;
+  }
+  else {
+    cdebug << "NULL" ;
+  }
+  cdebug << endl ;
+#endif
   return _CoupledNode ;
 }
 
 GraphBase::InLineNode * GraphBase::GOTONode::CoupledNode() {
-//  cdebug << this << " " << Name() << " GraphBase::GOTONode::CoupledNode() --> " ;
-//  if ( _CoupledNode ) {
-//    cdebug << _CoupledNode->Name() ;
-//  }
-//  else {
-//    cdebug << "NULL" ;
-//  }
-//  cdebug << endl ;
+#if CoupledNodeTrace
+  cdebug << this << " " << Name() << " GraphBase::GOTONode::CoupledNode() --> " ;
+  if ( _CoupledNode ) {
+    cdebug << _CoupledNode->Name() ;
+  }
+  else {
+    cdebug << "NULL" ;
+  }
+  cdebug << endl ;
+#endif
   return _CoupledNode ;
 }
 
@@ -136,24 +149,23 @@ void GraphBase::GOTONode::CoupledNodeName( const char * aCoupledNodeName ) {
   }
   _CoupledNodeName = new char [ strlen( aCoupledNodeName ) + 1 ] ;
   strcpy( _CoupledNodeName , aCoupledNodeName ) ;
-  cdebug << this << " " << Name() << " GraphBase::GOTONode::CoupledNodeName() --> " ;
-  if ( _CoupledNodeName ) {
-    cdebug << _CoupledNodeName ;
-  }
-  else {
-    cdebug << "NULL" ;
-  }
-  cdebug << endl ;
+#if CoupledNodeTrace
+  cdebug << this << " " << Name() << " GraphBase::GOTONode::CoupledNodeName() --> "
+         << (void * ) _CoupledNodeName << " = " << _CoupledNodeName << endl ;
+#endif
 }
 char * GraphBase::GOTONode::CoupledNodeName() const {
+#if CoupledNodeTrace
   cdebug << this << " " << Name() << " GraphBase::GOTONode::CoupledNodeName() --> " ;
   if ( _CoupledNodeName ) {
-    cdebug << _CoupledNodeName ;
+    cdebug << (void * ) _CoupledNodeName << " = " << _CoupledNodeName << endl ;
   }
   else {
-    cdebug << "NULL" ;
+    cdebug << "NULL" << endl ;
   }
-  return my_strdup( _CoupledNodeName ) ;
+#endif
+//JR 17.02.2005 Memory Leak  return my_strdup( _CoupledNodeName ) ;
+  return _CoupledNodeName ;
 }
 
 //bool GraphBase::GOTONode::SaveXML( ostream &f , char *Tabs ,
@@ -163,7 +175,8 @@ bool GraphBase::GOTONode::SaveXML( QDomDocument & Graph , QDomElement & info ,
   GraphBase::ListOfPythonFunctions aPythonFunction ;
   if ( PyFuncName() ) {
     aFuncNames.resize( 1 ) ;
-    aFuncNames[0] = CORBA::string_dup( PyFuncName() ) ;
+//JR 24.02.2005 Memory Leak    aFuncNames[0] = CORBA::string_dup( PyFuncName() ) ;
+    aFuncNames[0] = string( PyFuncName() ) ;
     aPythonFunction.resize( 1 ) ;
     aPythonFunction[0] = PythonFunction() ;
   }
@@ -184,7 +197,8 @@ bool GraphBase::GOTONode::SavePY( ostream &f , const char * aGraphName ,
   GraphBase::ListOfPythonFunctions aPythonFunction ;
   if ( PyFuncName() ) {
     aFuncNames.resize( 1 ) ;
-    aFuncNames[0] = CORBA::string_dup( PyFuncName() ) ;
+//JR 24.02.2005 Memory Leak    aFuncNames[0] = CORBA::string_dup( PyFuncName() ) ;
+    aFuncNames[0] = string( PyFuncName() ) ;
     aPythonFunction.resize( 1 ) ;
     aPythonFunction[0] = PythonFunction() ;
   }