Merge pull request #356 from plc-user/master

element-editor: fix rotation and more
qelectrotech · Feb 15, 2025 · 5aee30e · 5aee30e
2 parents 9afc971 + b9a8dc0
commit 5aee30e
Show file tree

Hide file tree

Showing 75 changed files with 4,934 additions and 4,560 deletions.
diff --git a/ico/16x16/flip.png b/ico/16x16/flip.png
diff --git a/ico/16x16/mirror.png b/ico/16x16/mirror.png
diff --git a/lang/qet_ar.qm b/lang/qet_ar.qm
diff --git a/lang/qet_ar.ts b/lang/qet_ar.ts
diff --git a/lang/qet_ca.qm b/lang/qet_ca.qm
diff --git a/lang/qet_ca.ts b/lang/qet_ca.ts
diff --git a/lang/qet_cs.qm b/lang/qet_cs.qm
diff --git a/lang/qet_cs.ts b/lang/qet_cs.ts
diff --git a/lang/qet_da.qm b/lang/qet_da.qm
diff --git a/lang/qet_da.ts b/lang/qet_da.ts
diff --git a/lang/qet_de.qm b/lang/qet_de.qm
diff --git a/lang/qet_de.ts b/lang/qet_de.ts
diff --git a/lang/qet_el.qm b/lang/qet_el.qm
diff --git a/lang/qet_el.ts b/lang/qet_el.ts
diff --git a/lang/qet_en.qm b/lang/qet_en.qm
diff --git a/lang/qet_en.ts b/lang/qet_en.ts
diff --git a/lang/qet_es.qm b/lang/qet_es.qm
diff --git a/lang/qet_es.ts b/lang/qet_es.ts
diff --git a/lang/qet_fr.qm b/lang/qet_fr.qm
diff --git a/lang/qet_fr.ts b/lang/qet_fr.ts
diff --git a/lang/qet_hr.qm b/lang/qet_hr.qm
diff --git a/lang/qet_hr.ts b/lang/qet_hr.ts
diff --git a/lang/qet_hu.qm b/lang/qet_hu.qm
diff --git a/lang/qet_hu.ts b/lang/qet_hu.ts
diff --git a/lang/qet_it.qm b/lang/qet_it.qm
diff --git a/lang/qet_it.ts b/lang/qet_it.ts
diff --git a/lang/qet_ja.qm b/lang/qet_ja.qm
diff --git a/lang/qet_ja.ts b/lang/qet_ja.ts
diff --git a/lang/qet_mn.qm b/lang/qet_mn.qm
diff --git a/lang/qet_mn.ts b/lang/qet_mn.ts
diff --git a/lang/qet_nb.qm b/lang/qet_nb.qm
diff --git a/lang/qet_nb.ts b/lang/qet_nb.ts
diff --git a/lang/qet_nl.qm b/lang/qet_nl.qm
diff --git a/lang/qet_nl.ts b/lang/qet_nl.ts
diff --git a/lang/qet_nl_BE.qm b/lang/qet_nl_BE.qm
diff --git a/lang/qet_nl_BE.ts b/lang/qet_nl_BE.ts
diff --git a/lang/qet_pl.qm b/lang/qet_pl.qm
diff --git a/lang/qet_pl.ts b/lang/qet_pl.ts
diff --git a/lang/qet_pt.qm b/lang/qet_pt.qm
diff --git a/lang/qet_pt.ts b/lang/qet_pt.ts
diff --git a/lang/qet_pt_BR.qm b/lang/qet_pt_BR.qm
diff --git a/lang/qet_pt_BR.ts b/lang/qet_pt_BR.ts
diff --git a/lang/qet_ro.qm b/lang/qet_ro.qm
diff --git a/lang/qet_ro.ts b/lang/qet_ro.ts
diff --git a/lang/qet_ru.qm b/lang/qet_ru.qm
diff --git a/lang/qet_ru.ts b/lang/qet_ru.ts
diff --git a/lang/qet_sk.ts b/lang/qet_sk.ts
diff --git a/lang/qet_sl.ts b/lang/qet_sl.ts
diff --git a/lang/qet_sr.ts b/lang/qet_sr.ts
diff --git a/lang/qet_tr.qm b/lang/qet_tr.qm
diff --git a/lang/qet_tr.ts b/lang/qet_tr.ts
diff --git a/lang/qet_uk.qm b/lang/qet_uk.qm
diff --git a/lang/qet_uk.ts b/lang/qet_uk.ts
diff --git a/lang/qet_zh.qm b/lang/qet_zh.qm
diff --git a/lang/qet_zh.ts b/lang/qet_zh.ts
diff --git a/qelectrotech.qrc b/qelectrotech.qrc
@@ -49,6 +49,7 @@
         <file>ico/16x16/endline-none.png</file>
         <file>ico/16x16/endline-simple.png</file>
         <file>ico/16x16/endline-triangle.png</file>
+        <file>ico/16x16/flip.png</file>
         <file>ico/16x16/folder-new.png</file>
         <file>ico/16x16/folder.png</file>
         <file>ico/16x16/go-company.png</file>
@@ -60,6 +61,7 @@
         <file>ico/16x16/list-add.png</file>
         <file>ico/16x16/list-remove.png</file>
         <file>ico/16x16/masquer.png</file>
+        <file>ico/16x16/mirror.png</file>
         <file>ico/16x16/neutral.png</file>
         <file>ico/16x16/north.png</file>
         <file>ico/16x16/orientations.png</file>

diff --git a/sources/editor/editorcommands.cpp b/sources/editor/editorcommands.cpp
@@ -531,19 +531,28 @@ void RotateElementsCommand::undo()
 			PartRectangle* rect = qgraphicsitem_cast<PartRectangle*>(item);
 			rect->setRotation(rect->rotation()-90);
 		}
+		else if (item->type() == PartArc::Type) {
+			PartArc* arc = qgraphicsitem_cast<PartArc*>(item);
+			arc->setRotation(arc->rotation()-90);
+		}
+		else if (item->type() == PartEllipse::Type) {
+			PartEllipse* ellipse = qgraphicsitem_cast<PartEllipse*>(item);
+			ellipse->setRotation(ellipse->rotation()-90);
+		}
 		else if (item->type() == PartLine::Type) {
 			PartLine* line = qgraphicsitem_cast<PartLine*>(item);
-			line->setRotation(line->rotation()-15);
+			line->setRotation(line->rotation()-90);
 		}
 		else if (item->type() == PartPolygon::Type) {
 			PartPolygon* poly = qgraphicsitem_cast<PartPolygon*>(item);
-			poly->setRotation(poly->rotation()-15);
+			poly->setRotation(poly->rotation()-90);
 		}
 		else {
-			item->setRotation(item->rotation()-15);
+			item->setRotation(item->rotation()-90);
 		}
 	}
 }
+
 /**
 	@brief RotateElementsCommand::redo
 */
@@ -559,17 +568,115 @@ void RotateElementsCommand::redo()
 			PartRectangle* rect = qgraphicsitem_cast<PartRectangle*>(item);
 			rect->setRotation(rect->rotation()+90);
 		}
+		else if (item->type() == PartArc::Type) {
+			PartArc* arc = qgraphicsitem_cast<PartArc*>(item);
+			arc->setRotation(arc->rotation()+90);
+		}
+		else if (item->type() == PartEllipse::Type) {
+			PartEllipse* ellipse = qgraphicsitem_cast<PartEllipse*>(item);
+			ellipse->setRotation(ellipse->rotation()+90);
+		}
 		else if (item->type() == PartLine::Type) {
 			PartLine* line = qgraphicsitem_cast<PartLine*>(item);
-			line->setRotation(line->rotation()+15);
+			line->setRotation(line->rotation()+90);
 		}
 		else if (item->type() == PartPolygon::Type) {
 			PartPolygon* poly = qgraphicsitem_cast<PartPolygon*>(item);
-			poly->setRotation(poly->rotation()+15);
+			poly->setRotation(poly->rotation()+90);
 		}
 		else {
-			item->setRotation(item->rotation()+15);
+			item->setRotation(item->rotation()+90);
 		}
 	}
+}
+
+
+MirrorElementsCommand::MirrorElementsCommand(ElementScene *scene, QUndoCommand *parent) :
+ElementEditionCommand(QObject::tr("Miroir de sélection", "undo caption"), scene, nullptr, parent)
+{
+	m_items = scene->selectedItems();
+}
 
+/**
+	@brief MirrorElementsCommand::redo
+*/
+void MirrorElementsCommand::redo()
+{
+	foreach (auto *item, m_items) {
+		if ((item->type() == PartText::Type)  ||
+			(item->type() == PartDynamicTextField::Type))  {
+				continue;
+		} else if (item->type() == PartArc::Type) {
+			PartArc* arc = qgraphicsitem_cast<PartArc*>(item);
+			arc->mirror();
+		} else if (item->type() == PartEllipse::Type) {
+			PartEllipse* ellipse = qgraphicsitem_cast<PartEllipse*>(item);
+			ellipse->mirror();
+		} else if (item->type() == PartLine::Type) {
+			PartLine* line = qgraphicsitem_cast<PartLine*>(item);
+			line->mirror();
+		} else if (item->type() == PartPolygon::Type) {
+			PartPolygon* poly = qgraphicsitem_cast<PartPolygon*>(item);
+			poly->mirror();
+		} else if (item->type() == PartRectangle::Type) {
+			PartRectangle* rect = qgraphicsitem_cast<PartRectangle*>(item);
+			rect->mirror();
+		} else if (item->type() == PartTerminal::Type) {
+			PartTerminal* term = qgraphicsitem_cast<PartTerminal*>(item);
+			term->mirror();
+		}
+	}
+}
+/**
+	@brief MirrorElementsCommand::undo
+*/
+void MirrorElementsCommand::undo()
+{
+	redo();
+}
+
+
+FlipElementsCommand::FlipElementsCommand(ElementScene *scene, QUndoCommand *parent) :
+ElementEditionCommand(QObject::tr("Retourner la sélection", "undo caption"), scene, nullptr, parent)
+{
+	m_items = scene->selectedItems();
+}
+
+/**
+	@brief FlipElementsCommand::redo
+*/
+void FlipElementsCommand::redo()
+{
+	foreach (auto *item, m_items) {
+		if ((item->type() == PartText::Type)  ||
+			(item->type() == PartDynamicTextField::Type))  {
+				continue;
+		} else if (item->type() == PartArc::Type) {
+			PartArc* arc = qgraphicsitem_cast<PartArc*>(item);
+			arc->flip();
+		} else if (item->type() == PartEllipse::Type) {
+			PartEllipse* ellipse = qgraphicsitem_cast<PartEllipse*>(item);
+			ellipse->flip();
+		} else if (item->type() == PartLine::Type) {
+			PartLine* line = qgraphicsitem_cast<PartLine*>(item);
+			line->flip();
+		} else if (item->type() == PartPolygon::Type) {
+			PartPolygon* poly = qgraphicsitem_cast<PartPolygon*>(item);
+			poly->flip();
+		} else if (item->type() == PartRectangle::Type) {
+			PartRectangle* rect = qgraphicsitem_cast<PartRectangle*>(item);
+			rect->flip();
+		} else if (item->type() == PartTerminal::Type) {
+			PartTerminal* term = qgraphicsitem_cast<PartTerminal*>(item);
+			term->flip();
+		}
+	}
+}
+
+/**
+	@brief FlipElementsCommand::undo
+*/
+void FlipElementsCommand::undo()
+{
+	redo();
 }
diff --git a/sources/editor/editorcommands.h b/sources/editor/editorcommands.h
@@ -265,4 +265,26 @@ class RotateElementsCommand : public ElementEditionCommand
 
 };
 
+class MirrorElementsCommand : public ElementEditionCommand
+{
+public:
+	MirrorElementsCommand(ElementScene *scene, QUndoCommand *parent=nullptr);
+	void undo() override;
+	void redo() override;
+private:
+	ElementScene *m_scene =nullptr;
+	QList<QGraphicsItem*> m_items;
+};
+
+class FlipElementsCommand : public ElementEditionCommand
+{
+public:
+	FlipElementsCommand(ElementScene *scene, QUndoCommand *parent=nullptr);
+	void undo() override;
+	void redo() override;
+private:
+	ElementScene *m_scene =nullptr;
+	QList<QGraphicsItem*> m_items;
+};
+
 #endif
diff --git a/sources/editor/graphicspart/partarc.cpp b/sources/editor/graphicspart/partarc.cpp
@@ -170,6 +170,62 @@ QPainterPath PartArc::shadowShape() const
 	return (pps.createStroke(shape));
 }
 
+
+void PartArc::setRotation(qreal angle) {
+// idea taken from QET_ElementScaler:
+if (angle > 0) {
+	m_start_angle += 270.0 * 16;
+	while (m_start_angle < 0) { m_start_angle += (360*16); }
+	while (m_start_angle >= (360*16)) { m_start_angle -= (360*16); }
+	qreal width  = m_rect.height();
+	qreal height = m_rect.width();
+	qreal x = (m_rect.y() + m_rect.height()) * (-1);
+	qreal y = m_rect.x();
+	m_rect  = QRectF(x, y, width, height);
+} else {
+	m_start_angle -= 270.0 * 16;
+	while (m_start_angle < 0) { m_start_angle += (360*16); }
+	while (m_start_angle >= (360*16)) { m_start_angle -= (360*16); }
+	qreal width  = m_rect.height();
+	qreal height = m_rect.width();
+	qreal x = m_rect.y();
+	qreal y = (m_rect.x() + m_rect.width()) * (-1);
+	m_rect  = QRectF(x, y, width, height);
+	}
+
+	prepareGeometryChange();
+	adjustHandlerPos();
+	emit rectChanged();
+}
+
+qreal PartArc::rotation() const {
+	return qRound(m_rot * 100.0) / 100.0;
+}
+
+void PartArc::flip() {
+	m_start_angle = (-1) * m_start_angle;
+	m_span_angle  = (-1) * m_span_angle;
+	while (m_start_angle < 0) { m_start_angle += (360*16); }
+	while (m_start_angle >= (360*16)) { m_start_angle -= (360*16); }
+	qreal y = ((-1.0) * m_rect.y()) - m_rect.height();
+	m_rect  = QRectF(m_rect.x(), y, m_rect.width(), m_rect.height());
+	prepareGeometryChange();
+	adjustHandlerPos();
+	emit rectChanged();
+}
+
+void PartArc::mirror() {
+	m_start_angle = (180.0 * 16) - m_start_angle;
+	m_span_angle = (-1) * m_span_angle;
+	while (m_start_angle < 0) { m_start_angle += (360*16); }
+	while (m_start_angle >= (360*16)) { m_start_angle -= (360*16); }
+	qreal x = ((-1.0) * m_rect.x()) - m_rect.width();
+	m_rect  = QRectF(x, m_rect.y(), m_rect.width(), m_rect.height());
+	prepareGeometryChange();
+	adjustHandlerPos();
+	emit rectChanged();
+}
+
 /**
  * @brief PartArc::sceneGeometricRect
  * @return the minimum,

diff --git a/sources/editor/graphicspart/partarc.h b/sources/editor/graphicspart/partarc.h
@@ -60,6 +60,10 @@ class PartArc : public AbstractPartEllipse
 		void setStartAngle(const int &start_angle) override {AbstractPartEllipse::setStartAngle(start_angle); adjustHandlerPos();}
 		void setSpanAngle(const int &span_angle) override {AbstractPartEllipse::setSpanAngle(span_angle); adjustHandlerPos();}
 		QRectF sceneGeometricRect() const override;
+		void   setRotation(qreal angle);
+		qreal  rotation() const;
+		void   flip();
+		void   mirror();
 
 		void addHandler() override;
 		void removeHandler() override;
@@ -83,5 +87,6 @@ class PartArc : public AbstractPartEllipse
 			m_vector_index = -1;
 		QPointF m_span_point;
 		QVector<QetGraphicsHandlerItem *> m_handler_vector;
+		qreal m_rot = 0;
 };
 #endif
diff --git a/sources/editor/graphicspart/partellipse.cpp b/sources/editor/graphicspart/partellipse.cpp
@@ -236,6 +236,50 @@ bool PartEllipse::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
 	return false;
 }
 
+
+void PartEllipse::setRotation(qreal angle) {
+// idea taken from QET_ElementScaler:
+	if (angle > 0) {
+		qreal width  = m_rect.height();
+		qreal height = m_rect.width();
+		qreal x = (m_rect.y() + m_rect.height()) * (-1);
+		qreal y = m_rect.x();
+		m_rect  = QRectF(x, y, width, height);
+	} else {
+		qreal width  = m_rect.height();
+		qreal height = m_rect.width();
+		qreal x = m_rect.y();
+		qreal y = (m_rect.x() + m_rect.width()) * (-1);
+		m_rect  = QRectF(x, y, width, height);
+		}
+		prepareGeometryChange();
+		adjustHandlerPos();
+		emit rectChanged();
+}
+
+qreal PartEllipse::rotation() const {
+	return qRound(m_rot * 100.0) / 100.0;
+}
+
+void PartEllipse::flip() {
+	qreal y = ((-1.0) * m_rect.y()) - m_rect.height();
+	m_rect  = QRectF(m_rect.x(), y, m_rect.width(), m_rect.height());
+	prepareGeometryChange();
+	adjustHandlerPos();
+	emit rectChanged();
+}
+
+void PartEllipse::mirror() {
+	qreal x = ((-1.0) * m_rect.x()) - m_rect.width();
+	m_rect  = QRectF(x, m_rect.y(), m_rect.width(), m_rect.height());
+	prepareGeometryChange();
+	adjustHandlerPos();
+	emit rectChanged();
+}
+
+
+
+
 void PartEllipse::switchResizeMode()
 {
 	if (m_resize_mode == 1)

diff --git a/sources/editor/graphicspart/partellipse.h b/sources/editor/graphicspart/partellipse.h
@@ -27,7 +27,7 @@ class QPropertyUndoCommand;
 	This class represents an ellipse primitive which may be used to compose the
 	drawing of an electrical element within the element editor.
 */
-class PartEllipse : public  AbstractPartEllipse
+class PartEllipse : public AbstractPartEllipse
 {
 		Q_OBJECT
 
@@ -39,6 +39,9 @@ class PartEllipse : public  AbstractPartEllipse
 	private:
 		PartEllipse(const PartEllipse &);
 
+	signals:
+		void rotationChanged();
+
 		// methods
 	public:
 		enum { Type = UserType + 1103 };
@@ -57,6 +60,10 @@ class PartEllipse : public  AbstractPartEllipse
 		QPainterPath shape() const override;
 		QPainterPath shadowShape() const override;
 		void setRect(const QRectF &rect) override {AbstractPartEllipse::setRect(rect); adjustHandlerPos();}
+		void   setRotation(qreal angle);
+		qreal  rotation() const;
+		void   flip();
+		void   mirror();
 
 		void addHandler() override;
 		void removeHandler() override;
@@ -77,5 +84,6 @@ class PartEllipse : public  AbstractPartEllipse
 		QPropertyUndoCommand *m_undo_command;
 		int m_resize_mode = 1,
 			m_vector_index = -1;
+		qreal m_rot = 0;
 };
 #endif