ui: GraphView can set active tokenId on node clicked

By now the graph displays the active node, without neighbours or anything, and clicking a node sets the active token id to the clicked nodes id.

fortune cookie message = Be prepared to accept an exciting opportunity in the future.

src/app/qt/view/QtGraphView.cpp

@@ -15,6 +15,8 @@
 
 QtGraphView::QtGraphView(ViewLayout* viewLayout)
 	: GraphView(viewLayout)
+	, m_rebuildGraph(std::bind(&QtGraphView::doRebuildGraph, this, std::placeholders::_1, std::placeholders::_2))
+	, m_clear(std::bind(&QtGraphView::doClear, this))
 {
 }
 
@@ -45,56 +47,14 @@ void QtGraphView::initGui()
 	widget->layout()->addWidget(view);
 }
 
-std::weak_ptr<GraphNode> QtGraphView::addNode(const Vec2i& position, const std::string& name)
+void QtGraphView::rebuildGraph(const std::vector<DummyNode>& nodes, const std::vector<DummyEdge>& edges)
 {
-	QGraphicsView* view = getView();
-
-	if (view != NULL)
-	{
-		std::shared_ptr<QtGraphNode> node = std::make_shared<QtGraphNode>(position, name);
-		view->scene()->addItem(node.get());
-		node->setFlag(QGraphicsItem::ItemIsMovable);
-
-		m_nodes.push_back(node);
-
-		return node;
-	}
-	else
-	{
-		LOG_WARNING("Unable to retrieve view from widget");
-
-		return std::weak_ptr<QtGraphNode>();
-	}
+	m_rebuildGraph(nodes, edges);
 }
 
-void QtGraphView::addEdge(const std::weak_ptr<GraphNode>& owner, const std::weak_ptr<GraphNode>& target)
+void QtGraphView::clear()
 {
-	QGraphicsView* view = getView();
-
-	if (view != NULL)
-	{
-		std::shared_ptr<GraphNode> o = owner.lock();
-		std::shared_ptr<GraphNode> t = target.lock();
-
-		if (o != NULL && t != NULL)
-		{
-			std::shared_ptr<QtGraphEdge> edge = std::make_shared<QtGraphEdge>(owner, target);
-			view->scene()->addItem(edge.get());
-
-			m_edges.push_back(edge);
-
-			o->addOutEdge(edge);
-			t->addInEdge(edge);
-		}
-		else
-		{
-			LOG_WARNING("Either the owner or target node could not be locked, make sure they still exist!");
-		}
-	}
-	else
-	{
-		LOG_WARNING("Unable to retrieve view from widget");
-	}
+	m_clear();
 }
 
 QGraphicsView* QtGraphView::getView()
@@ -107,3 +67,73 @@ QGraphicsView* QtGraphView::getView()
 
 	return widget->findChild<QGraphicsView*>("");
 }
+
+void QtGraphView::doRebuildGraph(const std::vector<DummyNode>& nodes, const std::vector<DummyEdge>& edges)
+{
+	doClear();
+
+	QGraphicsView* view = getView();
+
+	if (view != NULL)
+	{
+		for(unsigned int i = 0; i < nodes.size(); i++)
+		{
+			std::shared_ptr<GraphNode> newNode = findOrCreateNode(view, nodes[i]);
+		}
+	}
+	else
+	{
+		LOG_WARNING("Failed to get QGraphicsView");
+	}
+}
+
+void QtGraphView::doClear()
+{
+	m_nodes.clear();
+	m_edges.clear();
+}
+
+std::shared_ptr<GraphNode> QtGraphView::findOrCreateNode(QGraphicsView* view, const DummyNode& node)
+{
+	std::shared_ptr<GraphNode> result;
+
+	result = findNode(node);
+
+	if(result == NULL)
+	{
+		result = createNode(view, node);
+	}
+
+	return result;
+}
+
+std::shared_ptr<GraphNode> QtGraphView::findNode(const DummyNode& node)
+{
+	std::list<std::shared_ptr<GraphNode>>::iterator it = m_nodes.begin();
+
+	for(it; it != m_nodes.end(); it++)
+	{
+		if((*it)->getTokenId() == node.tokenId)
+		{
+			return *it;
+		}
+	}
+
+	return NULL;
+}
+
+std::shared_ptr<GraphNode> QtGraphView::createNode(QGraphicsView* view, const DummyNode& node)
+{
+	if(view != NULL)
+	{
+		std::shared_ptr<QtGraphNode> newNode = std::make_shared<QtGraphNode>(node.position, node.name, node.tokenId);
+		view->scene()->addItem(newNode.get());
+		m_nodes.push_back(newNode);
+
+		return newNode;
+	}
+	else
+	{
+		LOG_WARNING("Received pointer to QGraphicsView was NULL. No node created.");
+	}
+}

src/app/qt/view/QtGraphView.h

@@ -1,8 +1,12 @@
 #ifndef QT_GRAPH_VIEW_H
 #define QT_GRAPH_VIEW_H
 
+#include "qt/utility/QtThreadedFunctor.h"
+
 #include "component/view/GraphView.h"
 
+struct DummyEdge;
+struct DummyNode;
 class QGraphicsView;
 
 class QtGraphView : public GraphView
@@ -15,11 +19,22 @@ public:
 	virtual void createWidgetWrapper();
 	virtual void initGui();
 
-	virtual std::weak_ptr<GraphNode> addNode(const Vec2i& position, const std::string& name);
-	virtual void addEdge(const std::weak_ptr<GraphNode>& owner, const std::weak_ptr<GraphNode>& target);
+	virtual void rebuildGraph(const std::vector<DummyNode>& nodes, const std::vector<DummyEdge>& edges);
+
+	virtual void clear();
 
 private:
 	QGraphicsView* getView();
+
+	void doRebuildGraph(const std::vector<DummyNode>& nodes, const std::vector<DummyEdge>& edges);
+	void doClear();
+
+	std::shared_ptr<GraphNode> findOrCreateNode(QGraphicsView* view, const DummyNode& node);
+	std::shared_ptr<GraphNode> findNode(const DummyNode& node);
+	std::shared_ptr<GraphNode> createNode(QGraphicsView* view, const DummyNode& node);
+
+	QtThreadedFunctor<const std::vector<DummyNode>&, const std::vector<DummyEdge>&> m_rebuildGraph;
+	QtThreadedFunctor<void> m_clear;
 };
 
 #endif // QT_GRAPH_VIEW_H

src/app/qt/view/graphElements/QtGraphNode.cpp

@@ -5,7 +5,8 @@
 
 #include "qt/view/graphElements/QtGraphEdge.h"
 
-QtGraphNode::QtGraphNode(const Vec2i& position, const std::string& name)
+QtGraphNode::QtGraphNode(const Vec2i& position, const std::string& name, const Id tokenId)
+	: GraphNode(tokenId)
 {
 	this->setRect(0, 0, 100, 100);
 	this->setPos(position.x, position.y);
@@ -21,6 +22,11 @@ QtGraphNode::~QtGraphNode()
 {
 }
 
+std::string QtGraphNode::getName()
+{
+	return m_text->toPlainText().toStdString();
+}
+
 Vec2i QtGraphNode::getPosition()
 {
 	return Vec2i(this->scenePos().x(), this->scenePos().y());
@@ -53,6 +59,9 @@ void QtGraphNode::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
 	m_mouseOffset.x = event->pos().x();
 	m_mouseOffset.y = event->pos().y();
+
+	MessageActivateToken message(m_tokenId);
+	message.dispatch();
 }
 
 void QtGraphNode::mouseMoveEvent(QGraphicsSceneMouseEvent *event)

src/app/qt/view/graphElements/QtGraphNode.h

@@ -3,6 +3,7 @@
 
 #include "qgraphicsitem.h"
 
+#include "utility/messaging/type/MessageActivateToken.h"
 #include "utility/math/Vector2.h"
 
 #include "component/view/graphElements/GraphNode.h"
@@ -14,9 +15,10 @@ class QtGraphNode:
 	public QGraphicsRectItem
 {
 public:
-	QtGraphNode(const Vec2i& position, const std::string& name);
+	QtGraphNode(const Vec2i& position, const std::string& name, const Id tokenId);
 	virtual ~QtGraphNode();
 
+	virtual std::string getName();
 	virtual Vec2i getPosition();
 
 	virtual void addOutEdge(const std::shared_ptr<GraphEdge>& edge);