Fix for bug PAL8060 : Supervisor: Edit ports - existing links are deleted

( IsLinked() function : situation if node contains ports with same names
but different types (Input or Output) ).

diff --git a/src/GraphBase/DataFlowBase_ComputingNode.cxx b/src/GraphBase/DataFlowBase_ComputingNode.cxx
index f5203ff30304ec4108b2b318d5520771b533bbf8..12b7e59d718cc92a0980b98b6417a28a94657e3d 100644 (file)
--- a/src/GraphBase/DataFlowBase_ComputingNode.cxx
+++ b/src/GraphBase/DataFlowBase_ComputingNode.cxx
@@ -333,11 +333,15 @@ void GraphBase::ComputingNode::NodePort( const char * NodeName ,
   }
 }
 
-bool GraphBase::ComputingNode::IsLinked(const char * ToServiceParameterName ) {
+bool GraphBase::ComputingNode::IsLinked(const char * ToServiceParameterName, bool isInput ) {
   bool RetVal = false ;
-  const GraphBase::InPort * thePort = GetInPort( ToServiceParameterName ) ;
-  if ( thePort ) {
-    RetVal = thePort->IsPortConnected() ;
+  if ( isInput ) { // mkr : PAL8060
+    // we have to know the type of the port, because of input and output ports 
+    // belong to one node may have the same names
+    const GraphBase::InPort * thePort = GetInPort( ToServiceParameterName ) ;
+    if ( thePort ) {
+      RetVal = thePort->IsPortConnected() ;
+    }
   }
   else {
     const GraphBase::OutPort * thePort = GetOutPort( ToServiceParameterName ) ;

diff --git a/src/GraphBase/DataFlowBase_ComputingNode.hxx b/src/GraphBase/DataFlowBase_ComputingNode.hxx
index 76b84f4aced55eda06128baf51ee642d67858a08..9770303f78f3c833bf45c2e8dcf761dd5305a174 100644 (file)
--- a/src/GraphBase/DataFlowBase_ComputingNode.hxx
+++ b/src/GraphBase/DataFlowBase_ComputingNode.hxx
@@ -183,7 +183,7 @@ namespace GraphBase {
                      const char * ServiceParameterName ,
                      char ** aNode , char ** aPort ) ;
 
-      bool IsLinked(const char * ToServiceParameterName ) ;
+      bool IsLinked(const char * ToServiceParameterName, bool isInput ) ; // mkr : PAL8060
       bool HasInput(const char * ToServiceParameterName ) ;
 
       GraphBase::SNode * GetInfo() ;

diff --git a/src/GraphEditor/DataFlowEditor_InNode.hxx b/src/GraphEditor/DataFlowEditor_InNode.hxx
index 0bb2a91154b929c39c3ca92a52fad09a626e4357..9a6bac596034ed4f16535e313e31f06a4bee2ac0 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_InNode.hxx
+++ b/src/GraphEditor/DataFlowEditor_InNode.hxx
@@ -222,8 +222,8 @@ namespace GraphEditor {
       void DelOutPort( const char * OutputParameterName ) {
            _ComputingNode->DelOutPort( OutputParameterName ) ; } ;
 
-      bool IsLinked(const char * ToServiceParameterName ) {
-           return _ComputingNode->IsLinked( ToServiceParameterName ) ; } ;
+      bool IsLinked(const char * ToServiceParameterName, bool isInput ) {
+           return _ComputingNode->IsLinked( ToServiceParameterName, isInput ) ; } ; // mkr : PAL8060
       bool HasInput(const char * ToServiceParameterName ) {
            return _ComputingNode->HasInput( ToServiceParameterName ) ; } ;