add nodes and start drwing graph for eventbus

Author: Daniele Giunchi

examples/chartSample/mainwindow.cpp

@@ -47,6 +47,7 @@ MainWindow::MainWindow()
 	//view = new MyFasterGraphicView(scene);
 	view->setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
 
+    // add the canvas
     layout->addWidget(view);
 
     QWidget *widget = new QWidget;
@@ -894,4 +895,4 @@ QIcon MainWindow::createColorIcon(QColor color)
 
     return QIcon(pixmap);
 }
-//! [32]
+//! [32]

examples/chartSample/mainwindow.h

@@ -167,7 +167,7 @@ class ExampleBaseNode : public mafNodeGraphicWidget {
 		//innerGridLayout->addLayout(rightLayout, 1, 1, 1, 1/*, Qt::AlignRight*/);
 		QFrame *rightFrame = new QFrame;
 		rightFrame->setLayout(rightLayout);
-		innerGridLayout->addWidget(rightFrame, 1, 1, 1, 1/*, Qt::AlignRight*/);
+                innerGridLayout->addWidget(rightFrame, 1, 1, 1, 1/*, Qt::AlignRight*/);
 		bottomLayout = new QHBoxLayout();
 		//innerGridLayout->addLayout(bottomLayout, 2, 0, 1, 2/*, Qt::AlignCenter*/);
 		QFrame *bottomFrame = new QFrame;
@@ -619,4 +619,4 @@ Q_OBJECT
 };
 
 
-#endif
+#endif

src/CMakeLists.txt

@@ -50,6 +50,7 @@ if(${MAF_PLUGIN_ZIP})
   ADD_SUBDIRECTORY(mafPluginZip)
 endif(${MAF_PLUGIN_ZIP})
 
+ADD_SUBDIRECTORY(mafPluginEventBusMonitor)
 #ADD_SUBDIRECTORY(mafPluginGimias)
 
 

src/mafEventBus/mafEventBusManager.cpp

@@ -16,7 +16,6 @@
 
 using namespace mafEventBus;
 
-
 mafEventBusManager::mafEventBusManager() : m_EnableEventLogging(false), m_LogEventTopic("*"), m_SkipDetach(false) {
     // Create local event dispatcher.
     m_LocalDispatcher = new mafEventDispatcherLocal();
@@ -39,6 +38,9 @@ mafEventBusManager::~mafEventBusManager() {
         delete i.value();
         ++i;
     }
+    // clean connection info vector.
+    m_ConnectionInfoHash.clear();
+    // clean hash for network connectors.
     m_NetworkConnectorHash.clear();
 
     // disconnect detachFromEventBus
@@ -81,6 +83,34 @@ bool mafEventBusManager::addEventProperty(const mafEvent &props) const {
     QString topic = props[TOPIC].toString();
     QObject *obj = props[OBJECT].value<QObject*>();
 
+    /// add to connection infos array this connection
+    /// chek also if already exists and one of observer or signal is empty
+    if(!m_ConnectionInfoHash.contains(topic)) {
+        mafEventBusConnectionInfo info;
+        info.type = (mafEventType) props[TYPE].toInt();
+        if(props[SIGTYPE].toInt() == mafSignatureTypeCallback) {
+            info.slotName.push_back(props[SIGNATURE].toString());
+            info.observers.push_back(obj);
+        } else { //is a signal
+            info.emitter = obj;
+            info.signalName.append(props[SIGNATURE].toString());
+        }
+        //info.callers;
+        //info.counter;
+        m_ConnectionInfoHash.insert(topic,info);
+    } else {
+        //check the type, and complete the information
+        mafEventBusConnectionInfo info = m_ConnectionInfoHash.value(topic);
+        if(info.type == mafSignatureTypeCallback) {
+            info.slotName.push_back(props[SIGNATURE].toString());
+            info.observers.push_back(obj);
+            m_ConnectionInfoHash.insert(topic,info);
+        } else { //no sense if is a signal
+        }
+    }
+
+
+
     if(props[TYPE].toInt() == mafEventTypeLocal) {
         // Local event dispatching.
         if(props[SIGTYPE].toInt() == mafSignatureTypeCallback) {
@@ -122,6 +152,19 @@ void mafEventBusManager::detachObjectFromBus() {
 }
 
 void mafEventBusManager::removeObserver(const QObject *obj, const QString topic, bool qt_disconnect) {
+    /// remove to connection infos array this connection
+    mafEventBusConnectionInfo info = m_ConnectionInfoHash.value(topic);
+    int counter = 0;
+    foreach (QObject *o, info.observers) {
+        if(o == obj) {
+            info.observers.remove(counter);
+            info.slotName.remove(counter);
+            break;
+        }
+        counter++;
+    }
+
+
     if(obj == NULL) {
         return;
     }
@@ -130,6 +173,12 @@ void mafEventBusManager::removeObserver(const QObject *obj, const QString topic,
 }
 
 void mafEventBusManager::removeSignal(const QObject *obj, QString topic, bool qt_disconnect) {
+    /// remove to connection infos array this connection
+    mafEventBusConnectionInfo info = m_ConnectionInfoHash.value(topic);
+    info.emitter = NULL;
+    info.signalName = "";
+
+
     if(obj == NULL) {
         return;
     }
@@ -146,7 +195,27 @@ void mafEventBusManager::removeSignal(const QObject *obj, QString topic, bool qt
 bool mafEventBusManager::removeEventProperty(const mafEvent &props) const {
     bool result(false);
     QString topic = props[TOPIC].toString();
-    
+    QObject *obj = props[OBJECT].value<QObject*>();
+
+    /// remove from connection info
+    if(props[SIGTYPE].toInt() == mafSignatureTypeCallback) {
+        mafEventBusConnectionInfo info = m_ConnectionInfoHash.value(topic);
+        int counter = 0;
+        foreach (QObject *o, info.observers) {
+            if(o == obj) {
+                info.observers.remove(counter);
+                info.slotName.remove(counter);
+                break;
+            }
+            counter++;
+        }
+    } else {
+        mafEventBusConnectionInfo info = m_ConnectionInfoHash.value(topic);
+        info.emitter = NULL;
+        info.signalName = "";
+    }
+
+
     if(props.eventType() == mafEventTypeLocal) {
         // Local event dispatching.
         if(props[SIGTYPE].toInt() == mafSignatureTypeCallback) {
@@ -180,6 +249,11 @@ void mafEventBusManager::notifyEvent(const QString topic, mafEventType ev_type,
         }
     }
 
+    /// increment in correct connection info item inside the array, the counter and insert the caller if possible
+    mafEventBusConnectionInfo info = m_ConnectionInfoHash.value(topic);
+    info.counter++;
+
+
     //event dispatched in local channel
     mafEvent *event_dic = new mafEvent(topic, ev_type, synch);
     notifyEvent(*event_dic, argList, returnArg);
@@ -253,3 +327,7 @@ bool mafEventBusManager::createClient(const QString &communication_protocol, con
     }
     return res;
 }
+
+const mafEventBusConnectionInfoHash &mafEventBusManager::connectionInfosDump() {
+    return m_ConnectionInfoHash;
+}

src/mafEventBus/mafEventBusManager.h

@@ -91,6 +91,9 @@ class MAFEVENTBUSSHARED_EXPORT mafEventBusManager : public QObject {
     /// Create the client for remote communication according to the given protocol, server host and port.
     bool createClient(const QString &communication_protocol, const QString &server_host, unsigned int port);
 
+    /// retireve all information for event bus manager connections
+    const mafEventBusConnectionInfoHash &connectionInfosDump();
+
 public Q_SLOTS:
     /// Intercepts objects deletion and detach them from the event bus.
     void detachObjectFromBus();
@@ -111,6 +114,7 @@ public Q_SLOTS:
 
     bool m_SkipDetach; ///< lifesafe variable to avoid the detach from eventbus.
 
+    mutable mafEventBusConnectionInfoHash m_ConnectionInfoHash;
 };
 
 } // namespace mafEventBus

src/mafEventBus/mafEventDefinitions.h

@@ -104,7 +104,8 @@ typedef QHash<QString, mafNetworkConnector *> mafNetworkConnectorHash;
 ///< Enum that identify the mafEventType's type: Local or Remote.
 typedef enum {
     mafEventTypeLocal,
-    mafEventTypeRemote
+    mafEventTypeRemote,
+    mafEventTypeAll,
 } mafEventType;
 
 ///< Enum that identify the mafSignatureType's type: Signal or Callback.
@@ -130,6 +131,20 @@ typedef QList<mafEvent *> mafEventItemListType;
 /// map which represent list of function to be registered in the server, with parameters
 typedef QMap<QString, QList<QVariant::Type> >  mafRegisterMethodsMap;
 
+
+/// this struct will be usefull for tracing all the connection inside the event bus manager.
+typedef struct {
+    mafEventType type;
+    QObject *emitter;
+    QVector<QObject*> observers;
+    QString signalName;
+    QVector<QString> slotName;
+    QVector<QObject*> callers;
+    unsigned int counter;
+} mafEventBusConnectionInfo;
+
+typedef QHash<QString, mafEventBusConnectionInfo> mafEventBusConnectionInfoHash;
+
 } // namespace mafEventBus
 
 

src/mafGUI/mafDiagramScene.cpp

@@ -20,6 +20,22 @@ mafDiagramScene::mafDiagramScene(QMenu *itemMenu, QObject *parent)
 }
 //! [0]
 
+void mafDiagramScene::drawNode(mafNodeGraphicWidget *node) {
+    emit mafNodeGraphicWidgetInserted(node);
+}
+
+void mafDiagramScene::drawArrow() {
+
+}
+
+void mafDiagramScene::deleteNode() {
+
+}
+
+void mafDiagramScene::deleteArrow() {
+
+}
+
 //! [1]
 void mafDiagramScene::setLineColor(const QColor &color)
 {

src/mafGUI/mafDiagramScene.h

@@ -27,15 +27,21 @@ class mafDiagramScene : public QGraphicsScene
     Q_OBJECT
 
 public:
-    enum Mode { InsertItem, InsertLine, InsertText, MoveItem, /*//dw*/ InsertNode, InsertNode2 };
+    enum Mode { InsertItem, InsertLine, InsertText, MoveItem, InsertNode, InsertNode2 };
 
     mafDiagramScene(QMenu *itemMenu, QObject *parent = 0);
     QColor lineColor() const
         { return mLineColor; }
     void setLineColor(const QColor &color);
 
-	//dw new3: moved and ugly
-	QMenu *mItemMenu;
+    QMenu *mItemMenu;
+
+    //extended API for draw by functions.
+    void drawNode(mafNodeGraphicWidget *node);
+    void drawArrow();
+    void deleteNode();
+    void deleteArrow();
+
 
 public slots:
     void setMode(Mode mode);
@@ -78,4 +84,4 @@ public slots:
 };
 //! [0]
 
-#endif
+#endif

src/mafGUI/mafNodeGraphicWidget.cpp

@@ -7,52 +7,46 @@
 //#include "mafNodeConnectorGraphicWidget.h"
 
 void mafNodeGraphicWidget::hide() {
-	this->widget()->close();
+    this->widget()->close();
 }
 
 //dw slot
 void mafNodeGraphicWidget::deleted() {
-	this->widget()->close();
-	//delete this;
+    this->widget()->close();
+    //delete this;
 }
 
 void mafNodeGraphicWidget::deleted(int result) {
-	this->widget()->close();
+    this->widget()->close();
 }
 
 mafNodeGraphicWidget::~mafNodeGraphicWidget() {
-	removeWigetFromConnectors();
-	//deleteConnections();
-	//dw new 
-	if (scene() != NULL) {
-		this->scene()->removeItem(this);
-	}
+    removeWigetFromConnectors();
+    //deleteConnections();
+    if (scene() != NULL) {
+        this->scene()->removeItem(this);
+    }
 }
 
 //! [0]
 mafNodeGraphicWidget::mafNodeGraphicWidget(QMenu *contextMenu,
                                          QGraphicsItem *parent, /*//dw can we really assume our scene type*/ QGraphicsScene /*mafDiagramScene*/ *scene, Qt::WindowFlags wFlags)
 			 : /*QGraphicsPolygonItem(parent, scene) //dw*/ /*QFrame(parent->parentWidget(), 0)*/
-QGraphicsProxyWidget(parent, /*//dw668: did this cause decorations now in 4.7 but no in 4.5.2?: Qt::Window*/ wFlags), mMaxRadius(1)
+QGraphicsProxyWidget(parent, wFlags), mMaxRadius(1)
 {
-	//dw new4: is this a problem? check it
     setCacheMode(DeviceCoordinateCache);
 
     mContextMenu = contextMenu;
-	isMoving = false;
-
-	//dw new:
-	setZValue(1);
-	//param
-	mNoResize = true;
-	if (mNoResize) {
-		mControlResizeHandles = true;
-	}
-	else {
-		//param
-		mControlResizeHandles = false;
-	}
-
+    isMoving = false;
+
+    setZValue(1);
+    //param
+    mNoResize = true;
+    if (mNoResize) {
+        mControlResizeHandles = true;
+    } else {
+        mControlResizeHandles = false;
+    }
 
 /*
     QPainterPath path;

src/mafGUI/mafNodeGraphicWidget.h

@@ -43,26 +43,25 @@ class mafNodeGraphicWidget : public /*QGraphicsPolygonItem //dw*/ /*QFrame*/ QGr
         virtual ~mafNodeGraphicWidget();
     void deleteConnections();
 
-        void addConnector(mafNodeConnectorGraphicWidget* nc);
+    void addConnector(mafNodeConnectorGraphicWidget* nc);
 
 
 	//dw
-	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-	void setWidget(QWidget *widget);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    void setWidget(QWidget *widget);
 
-	QRectF boundingRect() const;
-	QPainterPath shape() const;
+    QRectF boundingRect() const;
+    QPainterPath shape() const;
 
-	//void update(const QRectF & rect = QRectF());
+    //void update(const QRectF & rect = QRectF());
+    QList<mafNodeConnectorGraphicWidget *> connectors;
 
-        QList<mafNodeConnectorGraphicWidget *> connectors;
+public slots:
+        void deleted();
+        void deleted(int result);
 
-	public slots:
-		void deleted();
-		void deleted(int result);
-
-		//dw try overriding QWidget slot
-		void hide();
+        //dw try overriding QWidget slot
+        void hide();
 
 /*
 void 	accepted ()
@@ -118,4 +117,4 @@ void 	rejected ()
 //! [0]
 
 
-#endif
+#endif