kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-20 08:10:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

polygon editor : use QPropertyUndoCommand instead of ChangePartCommand

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4069 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-07-24 11:11:50 +00:00
parent 5b8a6a9745
commit b32e1bf339
6 changed files with 58 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
sources/editor/polygoneditor.cpp
View File

@@ -18,9 +18,9 @@
#include "polygoneditor.h"
#include "partpolygon.h"
#include "elementscene.h"
#include "editorcommands.h"
#include "qetmessagebox.h"
#include "styleeditor.h"
#include "QPropertyUndoCommand/qpropertyundocommand.h"
/**
Constructeur
@@ -58,45 +58,40 @@ PolygonEditor::PolygonEditor(QETElementEditor *editor, PartPolygon *p, QWidget *
PolygonEditor::~PolygonEditor() {
}
/**
Met a jour le polygone a partir des donnees du formulaire : points et etat ferme ou non
*/
void PolygonEditor::updatePolygon() {
updatePolygonPoints();
updatePolygonClosedState();
}
/**
Met a jour les points du polygone et cree un objet d'annulation
*/
void PolygonEditor::updatePolygonPoints() {
void PolygonEditor::updatePolygonPoints()
{
if (!part) return;
QVector<QPointF> points = getPointsFromTree();
if (points.count() < 2) {
QET::QetMessageBox::warning(
this,
tr("Erreur", "message box title"),
tr("Le polygone doit comporter au moins deux points.", "message box content")
);
QPolygonF points = getPointsFromTree();
if (points.count() < 2)
{
QET::QetMessageBox::warning(this, tr("Erreur", "message box title"), tr("Le polygone doit comporter au moins deux points.", "message box content"));
return;
}
undoStack().push(new ChangePolygonPointsCommand(part, part -> polygon(), points));
if (points != part->polygon())
{
QPropertyUndoCommand *undo = new QPropertyUndoCommand(part, "polygon", part->property("polygon"), points);
undo->setText(tr("Modifier un polygone"));
undoStack().push(undo);
}
}
/**
Met a jour l'etat ferme ou non du polygone
*/
void PolygonEditor::updatePolygonClosedState() {
void PolygonEditor::updatePolygonClosedState()
{
if (!part) return;
undoStack().push(
new ChangePartCommand(
tr("fermeture du polygone"),
part,
"closed",
QVariant(!close_polygon.isChecked()),
QVariant(close_polygon.isChecked())
)
);
bool close = close_polygon.isChecked();
if (close != part->isClosed())
{
QPropertyUndoCommand *undo = new QPropertyUndoCommand(part, "closed", part->property("closed"), close);
undo->setText(tr("Modifier un polygone"));
undoStack().push(undo);
}
}
/**
@@ -126,20 +121,35 @@ void PolygonEditor::updateForm() {
@param new_part Nouvelle primitive a editer
@return true si l'editeur a accepter d'editer la primitive, false sinon
*/
bool PolygonEditor::setPart(CustomElementPart *new_part) {
if (!new_part) {
bool PolygonEditor::setPart(CustomElementPart *new_part)
{
if (!new_part)
{
if (part)
{
disconnect(part, &PartPolygon::polygonChanged, this, &PolygonEditor::updateForm);
disconnect(part, &PartPolygon::closedChange, this, &PolygonEditor::updateForm);
}
part = 0;
style_ -> setPart(0);
return(true);
}
if (PartPolygon *part_polygon = dynamic_cast<PartPolygon *>(new_part)) {
if (PartPolygon *part_polygon = dynamic_cast<PartPolygon *>(new_part))
{
if (part == part_polygon) return true;
if (part)
{
disconnect(part, &PartPolygon::polygonChanged, this, &PolygonEditor::updateForm);
disconnect(part, &PartPolygon::closedChange, this, &PolygonEditor::updateForm);
}
part = part_polygon;
style_ -> setPart(part);
updateForm();
connect(part, &PartPolygon::polygonChanged, this, &PolygonEditor::updateForm);
connect(part, &PartPolygon::closedChange, this, &PolygonEditor::updateForm);
return(true);
} else {
return(false);
}
return(false);
}
/**