finished conn mode of library

[blast.git] / InterfaceItem.cpp

diff --git a/InterfaceItem.cpp b/InterfaceItem.cpp
index 443cee06e4f022bd4ce944e716acfe8284ffe1a3..1ef3aae76b5c3de65eeb940cb3dc78c958da847e 100644 (file)
--- a/InterfaceItem.cpp
+++ b/InterfaceItem.cpp
@@ -11,7 +11,7 @@ InterfaceItem::InterfaceItem(double _position,
                              int _orientation,
                              ConnectedInterface *_refInter,
                              AbstractBoxItem* _owner,
                              int _orientation,
                              ConnectedInterface *_refInter,
                              AbstractBoxItem* _owner,

-                             Parameters* _params) {
+                             Parameters* _params, bool forceVisible) {

   positionRatio = _position;
   orientation = _orientation;
   refInter = _refInter;
   positionRatio = _position;
   orientation = _orientation;
   refInter = _refInter;


@@ -24,7 +24,7 @@ InterfaceItem::InterfaceItem(double _position,
   nameWidth = fmName.width(refInter->getName());
   nameHeight = fmName.height();
   // by default, only data interface are visible
   nameWidth = fmName.width(refInter->getName());
   nameHeight = fmName.height();
   // by default, only data interface are visible

-  if (refInter->getPurpose() == AbstractInterface::Data) {
+  if ((forceVisible) || (refInter->getPurpose() == AbstractInterface::Data)) {

     visible = true;
   }
   else {
     visible = true;
   }
   else {


@@ -118,19 +118,22 @@ void InterfaceItem::paint(QPainter *painter) {
     }
 
     // draw arrows
     }
 
     // draw arrows

-    if(refInter->getDirection() == AbstractInterface::Input) {
-      painter->drawPath(params->inArrow);
+    if ( (refInter->getPurpose() == AbstractInterface::Clock) || (refInter->getPurpose() == AbstractInterface::Reset)) {
+      painter->drawPath(params->clkrstArrow);
+    }
+    else if(refInter->getDirection() == AbstractInterface::Input) {
+      painter->drawPath(params->dataArrowIn);

     }
     else if(refInter->getDirection() == AbstractInterface::Output) {
     }
     else if(refInter->getDirection() == AbstractInterface::Output) {

-      painter->drawPath(params->outArrow);
+      painter->drawPath(params->dataArrowOut);

     } else if(refInter->getDirection() == AbstractInterface::InOut) {
     } else if(refInter->getDirection() == AbstractInterface::InOut) {

-      painter->drawPath(params->inArrow);
-      painter->drawPath(params->outArrow);
+      painter->drawPath(params->dataArrowIn);
+      painter->drawPath(params->dataArrowOut);

     }
 
     // paint modifier box if needed
     }
 
     // paint modifier box if needed

-
-    if (refInter->getInputModifier() != NULL) {
+    ConnectedInterface* connIface = AI_TO_CON(refInter->getAssociatedIface());
+    if ((connIface != NULL) && (connIface->getInputModifier() != NULL)) {

       painter->save();
       painter->translate(params->arrowWidth+params->arrowLineLength,0);
       painter->drawRect(0,-5,10,10);
       painter->save();
       painter->translate(params->arrowWidth+params->arrowLineLength,0);
       painter->drawRect(0,-5,10,10);