More on graph editor

[cpPlugins.git] / appli / cpPipelineEditor / QNEConnection.cxx

diff --git a/appli/cpPipelineEditor/QNEConnection.cxx b/appli/cpPipelineEditor/QNEConnection.cxx
index e038c5f0395fb5c78d88d1edb53cadc1de315494..c79bb7ed27e02d6b7c5d1af662d3a7671665ab71 100644 (file)
--- a/appli/cpPipelineEditor/QNEConnection.cxx
+++ b/appli/cpPipelineEditor/QNEConnection.cxx
@@ -25,7 +25,6 @@
 */\r
 \r
 #include "QNEConnection.h"\r
-\r
 #include "QNEPort.h"\r
 \r
 #include <QBrush>\r
@@ -40,22 +39,20 @@ QNEConnection( QGraphicsItem* parent, QGraphicsScene* scene )
   this->setPen( QPen( Qt::black, 2 ) );\r
   this->setBrush( Qt::NoBrush );\r
   this->setZValue( -1 );\r
-  this->m_Port1 = 0;\r
-  this->m_Port2 = 0;\r
+  this->m_Port1 = NULL;\r
+  this->m_Port2 = NULL;\r
 }\r
 \r
 // -------------------------------------------------------------------------\r
 PipelineEditor::QNEConnection::\r
 ~QNEConnection( )\r
 {\r
-  if ( this->m_Port1 )\r
-    this->m_Port1->connections( ).remove(\r
-      this->m_Port1->connections( ).indexOf( this )\r
-      );\r
-  if ( this->m_Port2 )\r
-    this->m_Port2->connections( ).remove(\r
-      this->m_Port2->connections( ).indexOf( this )\r
-      );\r
+  if( this->m_Port1 != NULL )\r
+    this->m_Port1->connections( ).\r
+      remove( this->m_Port1->connections( ).indexOf( this ) );\r
+\r
+  if( this->m_Port2 != NULL )\r
+    this->m_Port2->setConnection( NULL );\r
 }\r
 \r
 // -------------------------------------------------------------------------\r
@@ -74,26 +71,44 @@ setPos2( const QPointF& p )
 \r
 // -------------------------------------------------------------------------\r
 void PipelineEditor::QNEConnection::\r
-setPort1( QNEPort* p )\r
+setPort1( QNEOutputPort* p )\r
 {\r
-  this->m_Port1 = p;\r
-  this->m_Port1->connections( ).append( this );\r
+  if( p != NULL )\r
+  {\r
+    p->connections( ).append( this );\r
+    this->m_Port1 = p;\r
+\r
+  } // fi\r
 }\r
 \r
 // -------------------------------------------------------------------------\r
 void PipelineEditor::QNEConnection::\r
-setPort2( QNEPort* p )\r
+setPort2( QNEInputPort* p )\r
 {\r
-  this->m_Port2 = p;\r
-  this->m_Port2->connections( ).append( this );\r
+  if( p != NULL )\r
+  {\r
+    if( p->connection( ) == NULL )\r
+    {\r
+      p->setConnection( this );\r
+      this->m_Port2 = p;\r
+\r
+    } // fi\r
+\r
+  } // fi\r
 }\r
 \r
 // -------------------------------------------------------------------------\r
 void PipelineEditor::QNEConnection::\r
 updatePosFromPorts( )\r
 {\r
-  this->m_Pos1 = this->m_Port1->scenePos( );\r
-  this->m_Pos2 = this->m_Port2->scenePos( );\r
+  if( this->m_Port1 != NULL )\r
+    this->m_Pos1 =\r
+      this->m_Port1->scenePos( ) +\r
+      QPointF( this->m_Port1->radius( ), this->m_Port1->radius( ) );\r
+  if( this->m_Port2 != NULL )\r
+    this->m_Pos2 =\r
+      this->m_Port2->scenePos( ) +\r
+      QPointF( this->m_Port2->radius( ), this->m_Port2->radius( ) );\r
 }\r
 \r
 // -------------------------------------------------------------------------\r
@@ -101,55 +116,29 @@ void PipelineEditor::QNEConnection::
 updatePath( )\r
 {\r
   QPainterPath p;\r
-\r
   p.moveTo( this->m_Pos1 );\r
 \r
   qreal dx = this->m_Pos2.x( ) - this->m_Pos1.x( );\r
   qreal dy = this->m_Pos2.y( ) - this->m_Pos1.y( );\r
-\r
-  QPointF ctr1( this->m_Pos1.x( ) + dx * 0.25, this->m_Pos1.y( ) + dy * 0.1 );\r
-  QPointF ctr2( this->m_Pos1.x( ) + dx * 0.75, this->m_Pos1.y( ) + dy * 0.9 );\r
-\r
-  p.cubicTo( ctr1, ctr2, this->m_Pos2 );\r
+  QPointF c1( this->m_Pos1.x( ) + dx * 0.25, this->m_Pos1.y( ) + dy * 0.1 );\r
+  QPointF c2( this->m_Pos1.x( ) + dx * 0.75, this->m_Pos1.y( ) + dy * 0.9 );\r
+  p.cubicTo( c1, c2, this->m_Pos2 );\r
 \r
   this->setPath( p );\r
 }\r
 \r
 // -------------------------------------------------------------------------\r
-PipelineEditor::QNEPort* PipelineEditor::QNEConnection::\r
+PipelineEditor::QNEOutputPort* PipelineEditor::QNEConnection::\r
 port1( ) const\r
 {\r
   return( this->m_Port1 );\r
 }\r
 \r
 // -------------------------------------------------------------------------\r
-PipelineEditor::QNEPort* PipelineEditor::QNEConnection::\r
+PipelineEditor::QNEInputPort* PipelineEditor::QNEConnection::\r
 port2( ) const\r
 {\r
   return( this->m_Port2 );\r
 }\r
 \r
-// -------------------------------------------------------------------------\r
-void PipelineEditor::QNEConnection::\r
-save( QDataStream& ds )\r
-{\r
-  ds << ( quint64 ) this->m_Port1;\r
-  ds << ( quint64 ) this->m_Port2;\r
-}\r
-\r
-// -------------------------------------------------------------------------\r
-void PipelineEditor::QNEConnection::\r
-load( QDataStream& ds, const QMap< quint64, QNEPort* >& portMap )\r
-{\r
-  quint64 ptr1;\r
-  quint64 ptr2;\r
-  ds >> ptr1;\r
-  ds >> ptr2;\r
-\r
-  this->setPort1( portMap[ ptr1 ] );\r
-  this->setPort2( portMap[ ptr2 ] );\r
-  this->updatePosFromPorts( );\r
-  this->updatePath( );\r
-}\r
-\r
 // eof - $RCSfile$\r