| [qet] [4066] Arc editor : use QPropertyUndoCommand instead of ChangePartCommand |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4066
Author: blacksun
Date: 2015-07-23 11:32:21 +0200 (Thu, 23 Jul 2015)
Log Message:
-----------
Arc editor : use QPropertyUndoCommand instead of ChangePartCommand
Modified Paths:
--------------
trunk/sources/editor/arceditor.cpp
trunk/sources/editor/arceditor.h
trunk/sources/editor/elementitemeditor.h
trunk/sources/editor/graphicspart/abstractpartellipse.cpp
trunk/sources/editor/graphicspart/abstractpartellipse.h
trunk/sources/editor/graphicspart/partarc.h
trunk/sources/editor/polygoneditor.h
trunk/sources/editor/rectangleeditor.h
Modified: trunk/sources/editor/arceditor.cpp
===================================================================
--- trunk/sources/editor/arceditor.cpp 2015-07-22 13:36:44 UTC (rev 4065)
+++ trunk/sources/editor/arceditor.cpp 2015-07-23 09:32:21 UTC (rev 4066)
@@ -18,6 +18,8 @@
#include "arceditor.h"
#include "styleeditor.h"
#include "partarc.h"
+#include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "elementscene.h"
/**
Constructeur
@@ -27,7 +29,8 @@
*/
ArcEditor::ArcEditor(QETElementEditor *editor, PartArc *arc, QWidget *parent) :
ElementItemEditor(editor, parent),
- part(arc)
+ part(arc),
+ m_locked(false)
{
style_ = new StyleEditor(editor);
x = new QDoubleSpinBox();
@@ -71,98 +74,147 @@
}
/// Destructeur
-ArcEditor::~ArcEditor() {
-}
+ArcEditor::~ArcEditor() {}
/**
- Permet de specifier a cet editeur quelle primitive il doit editer. A noter
- qu'un editeur peut accepter ou refuser d'editer une primitive.
- L'editeur d'arc acceptera d'editer la primitive new_part s'il s'agit d'un
- objet de la classe PartArc.
- @param new_part Nouvelle primitive a editer
- @return true si l'editeur a accepter d'editer la primitive, false sinon
-*/
-bool ArcEditor::setPart(CustomElementPart *new_part) {
- if (!new_part) {
+ * @brief ArcEditor::setPart
+ * Specifie to this editor the part to edit.
+ * Note that an editor can accept or refuse to edit a part. This editor accept only partArc.
+ * @param new_part
+ * @return
+ */
+bool ArcEditor::setPart(CustomElementPart *new_part)
+{
+ if (!new_part)
+ {
+ if (part)
+ {
+ disconnect(part, &PartArc::rectChanged, this, &ArcEditor::updateForm);
+ disconnect(part, &PartArc::spanAngleChanged, this, &ArcEditor::updateForm);
+ disconnect(part, &PartArc::startAngleChanged, this, &ArcEditor::updateForm);
+ }
part = 0;
style_ -> setPart(0);
return(true);
}
- if (PartArc *part_arc = dynamic_cast<PartArc *>(new_part)) {
+
+ if (PartArc *part_arc = dynamic_cast<PartArc *>(new_part))
+ {
+ if (part == part_arc) return true;
+ if (part)
+ {
+ disconnect(part, &PartArc::rectChanged, this, &ArcEditor::updateForm);
+ disconnect(part, &PartArc::spanAngleChanged, this, &ArcEditor::updateForm);
+ disconnect(part, &PartArc::startAngleChanged, this, &ArcEditor::updateForm);
+ }
part = part_arc;
style_ -> setPart(part);
updateForm();
+ connect(part, &PartArc::rectChanged, this, &ArcEditor::updateForm);
+ connect(part, &PartArc::spanAngleChanged, this, &ArcEditor::updateForm);
+ connect(part, &PartArc::startAngleChanged, this, &ArcEditor::updateForm);
return(true);
- } else {
- return(false);
}
+
+ return(false);
}
/**
- @return la primitive actuellement editee, ou 0 si ce widget n'en edite pas
-*/
+ * @brief ArcEditor::currentPart
+ * @return the curent edited part, or 0 if there is no edited part
+ */
CustomElementPart *ArcEditor::currentPart() const {
return(part);
}
/**
- Met a jour l'arc a partir a partir des donnees du formulaire
-*/
-void ArcEditor::updateArc() {
- if (!part) return;
- part -> setProperty("centerX", x -> value());
- part -> setProperty("centerY", y -> value());
- part -> setProperty("diameter_h", h -> value());
- part -> setProperty("diameter_v", v -> value());
- part -> setProperty("startAngle", ((start_angle -> value() * -1) + 90) * 16);
- part -> setProperty("spanAngle", angle -> value() * -16);
+ * @brief ArcEditor::updateArcS
+ * Update the start angle of the arc according to the edited value.
+ */
+void ArcEditor::updateArcS()
+{
+ if (m_locked) return;
+ m_locked = true;
+ QPropertyUndoCommand *undo= new QPropertyUndoCommand(part, "startAngle", part->property("startAngle"), ((start_angle -> value() * -1) + 90) * 16);
+ undo->setText("Modifier l'angle de depart d'un arc");
+ undo->enableAnimation();
+ elementScene()->undoStack().push(undo);
+ m_locked = false;
}
-/// Met a jour l'abscisse du centre de l'arc et cree un objet d'annulation
-void ArcEditor::updateArcX() { addChangePartCommand(tr("abscisse"), part, "centerX", x -> value()); }
-/// Met a jour l'ordonnee du centre de l'arc et cree un objet d'annulation
-void ArcEditor::updateArcY() { addChangePartCommand(tr("ordonnée"), part, "centerY", y -> value()); }
-/// Met a jour le diametre horizontal de l'arc et cree un objet d'annulation
-void ArcEditor::updateArcH() { addChangePartCommand(tr("diamètre horizontal"), part, "diameter_h", h -> value()); }
-/// Met a jour le diametre vertical de l'arc et cree un objet d'annulation
-void ArcEditor::updateArcV() { addChangePartCommand(tr("diamètre vertical"), part, "diameter_v", v -> value()); }
-/// Met a jour l'angle de depart de l'arc et cree un objet d'annulation
-void ArcEditor::updateArcS() { addChangePartCommand(tr("angle de départ"), part, "startAngle", ((start_angle -> value() * -1) + 90) * 16); }
-/// Met a jour l'etendue de l'arc et cree un objet d'annulation
-void ArcEditor::updateArcA() { addChangePartCommand(tr("angle"), part, "spanAngle", angle -> value() * -16); }
+/**
+ * @brief ArcEditor::updateArcA
+ * Update the span angle of the arc according to the edited value.
+ */
+void ArcEditor::updateArcA()
+{
+ if (m_locked) return;
+ m_locked = true;
+ QPropertyUndoCommand *undo= new QPropertyUndoCommand(part, "spanAngle", part->property("spanAngle"), angle -> value() * -16);
+ undo->setText("Modifier l'angle d'un arc");
+ undo->enableAnimation();
+ elementScene()->undoStack().push(undo);
+ m_locked = false;
+}
/**
- Met a jour le formulaire d'edition
-*/
-void ArcEditor::updateForm() {
+ * @brief ArcEditor::updateArcRect
+ * Update the geometrie of the rect that define this arc according the the edited values
+ */
+void ArcEditor::updateArcRect()
+{
+ if (m_locked) return;
+ m_locked = true;
+ QPointF point = part->mapFromScene(x->value() - h->value()/2, y->value() - v->value()/2);
+ QRectF rect(point, QSizeF(h->value(), v->value()));
+ QPropertyUndoCommand *undo= new QPropertyUndoCommand(part, "rect", part->property("rect"), rect);
+ undo->setText("Modifier un arc");
+ undo->enableAnimation();
+ elementScene()->undoStack().push(undo);
+ m_locked = false;
+}
+
+/**
+ * @brief ArcEditor::updateForm
+ * Update the value of the widgets
+ */
+void ArcEditor::updateForm()
+{
if (!part) return;
activeConnections(false);
- x->setValue(part->property("x").toReal());
- y->setValue(part->property("y").toReal());
- h->setValue(part->property("diameter_h").toReal());
- v->setValue(part->property("diameter_v").toReal());
+ QRectF rect = part->property("rect").toRectF();
+ x->setValue(part->mapToScene(rect.topLeft()).x() + (rect.width()/2));
+ y->setValue(part->mapToScene(rect.topLeft()).y() + (rect.height()/2));
+ h->setValue(rect.width());
+ v->setValue(rect.height());
start_angle -> setValue(((part->property("startAngle").toInt() / 16) - 90) * -1);
angle -> setValue(part->property("spanAngle").toInt() / -16);
activeConnections(true);
}
/**
- Active ou desactive les connexionx signaux/slots entre les widgets internes.
- @param active true pour activer les connexions, false pour les desactiver
-*/
-void ArcEditor::activeConnections(bool active) {
- if (active) {
- connect(x, SIGNAL(editingFinished()), this, SLOT(updateArcX()));
- connect(y, SIGNAL(editingFinished()), this, SLOT(updateArcY()));
- connect(h, SIGNAL(editingFinished()), this, SLOT(updateArcH()));
- connect(v, SIGNAL(editingFinished()), this, SLOT(updateArcV()));
+ * @brief ArcEditor::activeConnections
+ * Enable/disable connection between editor widget and slot editingFinished
+ * True == enable | false == disable
+ * @param active
+ */
+void ArcEditor::activeConnections(bool active)
+{
+ if (active)
+ {
+ connect(x, SIGNAL(editingFinished()), this, SLOT(updateArcRect()));
+ connect(y, SIGNAL(editingFinished()), this, SLOT(updateArcRect()));
+ connect(h, SIGNAL(editingFinished()), this, SLOT(updateArcRect()));
+ connect(v, SIGNAL(editingFinished()), this, SLOT(updateArcRect()));
connect(start_angle, SIGNAL(editingFinished()), this, SLOT(updateArcS()));
connect(angle, SIGNAL(editingFinished()), this, SLOT(updateArcA()));
- } else {
- disconnect(x, SIGNAL(editingFinished()), this, SLOT(updateArcX()));
- disconnect(y, SIGNAL(editingFinished()), this, SLOT(updateArcY()));
- disconnect(h, SIGNAL(editingFinished()), this, SLOT(updateArcH()));
- disconnect(v, SIGNAL(editingFinished()), this, SLOT(updateArcV()));
+ }
+ else
+ {
+ disconnect(x, SIGNAL(editingFinished()), this, SLOT(updateArcRect()));
+ disconnect(y, SIGNAL(editingFinished()), this, SLOT(updateArcRect()));
+ disconnect(h, SIGNAL(editingFinished()), this, SLOT(updateArcRect()));
+ disconnect(v, SIGNAL(editingFinished()), this, SLOT(updateArcRect()));
disconnect(start_angle, SIGNAL(editingFinished()), this, SLOT(updateArcS()));
disconnect(angle, SIGNAL(editingFinished()), this, SLOT(updateArcA()));
}
Modified: trunk/sources/editor/arceditor.h
===================================================================
--- trunk/sources/editor/arceditor.h 2015-07-22 13:36:44 UTC (rev 4065)
+++ trunk/sources/editor/arceditor.h 2015-07-23 09:32:21 UTC (rev 4066)
@@ -17,45 +17,48 @@
*/
#ifndef ARC_EDITOR_H
#define ARC_EDITOR_H
-#include <QtWidgets>
+
#include "elementitemeditor.h"
+
class PartArc;
class StyleEditor;
+class QDoubleSpinBox;
+class QSpinBox;
+
/**
This class provides a widget to edit elliptical arcs within the element editor.
*/
-class ArcEditor : public ElementItemEditor {
+class ArcEditor : public ElementItemEditor
+{
Q_OBJECT
- // constructors, destructor
+
+ // constructors, destructor
public:
- ArcEditor(QETElementEditor *, PartArc * = 0, QWidget * = 0);
- virtual ~ArcEditor();
+ ArcEditor(QETElementEditor *, PartArc * = 0, QWidget * = 0);
+ virtual ~ArcEditor();
private:
- ArcEditor(const ArcEditor &);
+ ArcEditor(const ArcEditor &);
- // attributes
+ // attributes
private:
- PartArc *part;
- StyleEditor *style_;
- QDoubleSpinBox *x, *y, *h, *v;
- QSpinBox *angle, *start_angle;
+ PartArc *part;
+ StyleEditor *style_;
+ QDoubleSpinBox *x, *y, *h, *v;
+ QSpinBox *angle, *start_angle;
+ bool m_locked;
- // methods
+ // methods
public:
- virtual bool setPart(CustomElementPart *);
- virtual CustomElementPart *currentPart() const;
+ virtual bool setPart(CustomElementPart *);
+ virtual CustomElementPart *currentPart() const;
public slots:
- void updateArc();
- void updateArcX();
- void updateArcY();
- void updateArcH();
- void updateArcV();
- void updateArcS();
- void updateArcA();
- void updateForm();
+ void updateArcS();
+ void updateArcA();
+ void updateArcRect();
+ void updateForm();
private:
- void activeConnections(bool);
+ void activeConnections(bool);
};
#endif
Modified: trunk/sources/editor/elementitemeditor.h
===================================================================
--- trunk/sources/editor/elementitemeditor.h 2015-07-22 13:36:44 UTC (rev 4065)
+++ trunk/sources/editor/elementitemeditor.h 2015-07-23 09:32:21 UTC (rev 4066)
@@ -17,10 +17,14 @@
*/
#ifndef ELEMENT_ITEM_EDITOR_H
#define ELEMENT_ITEM_EDITOR_H
-#include <QtWidgets>
+
+#include <QWidget>
+
class QETElementEditor;
class ElementScene;
class CustomElementPart;
+class QUndoStack;
+
/**
This is the base class for primitives editors within the element editor. It
provides methods to access the editor itself, the undo stack, the edition
Modified: trunk/sources/editor/graphicspart/abstractpartellipse.cpp
===================================================================
--- trunk/sources/editor/graphicspart/abstractpartellipse.cpp 2015-07-22 13:36:44 UTC (rev 4065)
+++ trunk/sources/editor/graphicspart/abstractpartellipse.cpp 2015-07-23 09:32:21 UTC (rev 4066)
@@ -118,6 +118,7 @@
if (rect == m_rect) return;
prepareGeometryChange();
m_rect = rect;
+ emit rectChanged();
}
/**
@@ -139,8 +140,9 @@
void AbstractPartEllipse::setStartAngle(const int &start_angle)
{
if (m_start_angle == start_angle) return;
+ prepareGeometryChange();
m_start_angle = start_angle;
- update();
+ emit startAngleChanged();
}
/**
@@ -153,8 +155,9 @@
void AbstractPartEllipse::setSpanAngle(const int &span_angle)
{
if (m_span_angle == span_angle) return;
+ prepareGeometryChange();
m_span_angle = span_angle;
- update();
+ emit spanAngleChanged();
}
/**
Modified: trunk/sources/editor/graphicspart/abstractpartellipse.h
===================================================================
--- trunk/sources/editor/graphicspart/abstractpartellipse.h 2015-07-22 13:36:44 UTC (rev 4065)
+++ trunk/sources/editor/graphicspart/abstractpartellipse.h 2015-07-23 09:32:21 UTC (rev 4066)
@@ -49,6 +49,11 @@
private:
AbstractPartEllipse(const AbstractPartEllipse &);
+ signals:
+ void rectChanged();
+ void startAngleChanged();
+ void spanAngleChanged();
+
// methods
public:
virtual void startUserTransformation (const QRectF &);
Modified: trunk/sources/editor/graphicspart/partarc.h
===================================================================
--- trunk/sources/editor/graphicspart/partarc.h 2015-07-22 13:36:44 UTC (rev 4065)
+++ trunk/sources/editor/graphicspart/partarc.h 2015-07-23 09:32:21 UTC (rev 4066)
@@ -38,7 +38,6 @@
private:
PartArc(const PartArc &);
-
// methods
public:
enum { Type = UserType + 1101 };
Modified: trunk/sources/editor/polygoneditor.h
===================================================================
--- trunk/sources/editor/polygoneditor.h 2015-07-22 13:36:44 UTC (rev 4065)
+++ trunk/sources/editor/polygoneditor.h 2015-07-23 09:32:21 UTC (rev 4066)
@@ -17,9 +17,15 @@
*/
#ifndef POLYGON_EDITOR_H
#define POLYGON_EDITOR_H
+
#include "elementitemeditor.h"
+#include <QTreeWidget>
+#include <QCheckBox>
+
class PartPolygon;
class StyleEditor;
+class QTreeWidget;
+
/**
This class provides a widget to edit polygons within the element editor.
*/
Modified: trunk/sources/editor/rectangleeditor.h
===================================================================
--- trunk/sources/editor/rectangleeditor.h 2015-07-22 13:36:44 UTC (rev 4065)
+++ trunk/sources/editor/rectangleeditor.h 2015-07-23 09:32:21 UTC (rev 4066)
@@ -17,10 +17,13 @@
*/
#ifndef RECTANGLE_EDITOR_H
#define RECTANGLE_EDITOR_H
-#include <QtWidgets>
+
#include "elementitemeditor.h"
+
class PartRectangle;
class StyleEditor;
+class QDoubleSpinBox;
+
/**
This class provides a widget to edit rectangles within the element editor.
*/