Merge branch 'terminal_strip'

sources/qetgraphicsitem/element.cpp

@@ -35,6 +35,7 @@
 #include "iostream"
 #include "../qetxml.h"
 #include "../qetversion.h"
+#include "qgraphicsitemutility.h"
 
 #include <QDomElement>
 #include <utility>
@@ -236,7 +237,7 @@ void Element::paint(
 
 		//Draw the selection rectangle
 	if ( isSelected() || m_mouse_over ) {
-		drawSelection(painter, options);
+		QGIUtility::drawBoundingRectSelection(this, painter);
 	}
 }
 
@@ -334,34 +335,6 @@ void Element::drawAxes(
 
 /*** Methodes privees ***/
 
-/**
-	Dessine le cadre de selection de l'element de maniere systematiquement non antialiasee.
-	@param painter Le QPainter a utiliser pour dessiner les bornes.
-	@param options Les options de style a prendre en compte
-*/
-void Element::drawSelection(
-		QPainter *painter,
-		const QStyleOptionGraphicsItem *options)
-{
-	Q_UNUSED(options)
-	painter -> save();
-	// Annulation des renderhints
-	painter -> setRenderHint(QPainter::Antialiasing,          false);
-	painter -> setRenderHint(QPainter::TextAntialiasing,      false);
-	painter -> setRenderHint(QPainter::SmoothPixmapTransform, false);
-	// Dessin du cadre de selection en gris
-	QPen t;
-	t.setColor(Qt::gray);
-	t.setStyle(Qt::DashDotLine);
-	t.setCosmetic(true);
-	painter -> setPen(t);
-	// Le dessin se fait a partir du rectangle delimitant
-	painter -> drawRoundedRect(boundingRect().adjusted(1, 1, -1, -1),
-				   10,
-				   10);
-	painter -> restore();
-}
-
 /**
 	Dessine le cadre de selection de l'element de maniere systematiquement non antialiasee.
 	@param painter Le QPainter a utiliser pour dessiner les bornes.

sources/qetgraphicsitem/element.h

@@ -198,9 +198,6 @@ class Element : public QetGraphicsItem
 		void setSize(int, int);
 
 	private:
-		void drawSelection(
-				QPainter *,
-				const QStyleOptionGraphicsItem *);
 		void drawHighlight(
 				QPainter *,
 				const QStyleOptionGraphicsItem *);

sources/qetgraphicsitem/qetgraphicsitem.cpp

@@ -24,12 +24,31 @@
 	Default constructor
 	@param parent : Parent Item
 */
+void QetGraphicsItem::showItem(QetGraphicsItem *item)
+{
+	if (item && item->diagram())
+	{
+		item->diagram()->showMe();
+		item->setSelected(true);
+
+			//Zoom to the item
+		for(QGraphicsView *view : item->scene()->views())
+		{
+			QRectF fit = item->sceneBoundingRect();
+			fit.adjust(-200, -200, 200, 200);
+			view->fitInView(fit, Qt::KeepAspectRatioByExpanding);
+		}
+	}
+}
+
 QetGraphicsItem::QetGraphicsItem(QGraphicsItem *parent):
 	QGraphicsObject(parent),
 	is_movable_(true),
 	m_first_move(true),
 	snap_to_grid_(true)
-{}
+{
+	setAcceptHoverEvents(true);
+}
 
 QetGraphicsItem::~QetGraphicsItem()
 {}
@@ -68,6 +87,11 @@ bool QetGraphicsItem::isHovered() const {
 	return m_hovered;
 }
 
+QPointF QetGraphicsItem::hoverMousePos() const
+{
+	return m_mouse_hover_pos;
+}
+
 /**
 	@brief QetGraphicsItem::state
 	@return the current state of this item 
@@ -166,6 +190,12 @@ void QetGraphicsItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 	QGraphicsObject::hoverEnterEvent(event);
 }
 
+void QetGraphicsItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
+{
+	QGraphicsObject::hoverMoveEvent(event);
+	m_mouse_hover_pos = event->pos();
+}
+
 void QetGraphicsItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
 	m_hovered = false;

sources/qetgraphicsitem/qetgraphicsitem.h

@@ -28,6 +28,9 @@ class QetGraphicsItem : public QGraphicsObject
 {
 	Q_OBJECT
 
+	public :
+		static void showItem (QetGraphicsItem *item);
+
 	public:
 		//constructor destructor
 		QetGraphicsItem(QGraphicsItem *parent = nullptr);
@@ -43,6 +46,7 @@ class QetGraphicsItem : public QGraphicsObject
 		virtual void setMovable (bool movable) { is_movable_ = movable;}
 
 		bool isHovered() const;
+		QPointF hoverMousePos() const;
 
 		virtual void editProperty () {}
 		virtual QString name ()const
@@ -57,6 +61,7 @@ class QetGraphicsItem : public QGraphicsObject
 		void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
 		void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
 		void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
+		void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override;
 		void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
 
 	protected:
@@ -68,6 +73,7 @@ class QetGraphicsItem : public QGraphicsObject
 
 	private:
 		bool m_hovered{false};
+		QPointF m_mouse_hover_pos;
 
 };