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

Fix bug 221

Browse Source 
https://qelectrotech.org/bugtracker/view.php?id=221
This commit is contained in:
joshua
2021-01-28 19:25:42 +01:00
parent 20cd0366eb
commit aa66eabe7c
2 changed files with 60 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
sources/editor/arceditor.cpp
View File

@@ -30,10 +30,10 @@
*/ */
ArcEditor::ArcEditor(QETElementEditor *editor, PartArc *arc, QWidget *parent) : ArcEditor::ArcEditor(QETElementEditor *editor, PartArc *arc, QWidget *parent) :
ElementItemEditor(editor, parent), ElementItemEditor(editor, parent),
part(arc), m_part(arc),
m_locked(false) m_locked(false)
{ {
style_ = new StyleEditor(editor); m_style = new StyleEditor(editor);
x = new QDoubleSpinBox(); x = new QDoubleSpinBox();
y = new QDoubleSpinBox(); y = new QDoubleSpinBox();
h = new QDoubleSpinBox(); h = new QDoubleSpinBox();
@@ -66,7 +66,7 @@ ArcEditor::ArcEditor(QETElementEditor *editor, PartArc *arc, QWidget *parent) :
grid -> addWidget(new QLabel(tr("Angle :")), 6, 0); grid -> addWidget(new QLabel(tr("Angle :")), 6, 0);
grid -> addWidget(angle, 6, 1); grid -> addWidget(angle, 6, 1);
v_layout -> addWidget(style_); v_layout -> addWidget(m_style);
v_layout -> addLayout(grid); v_layout -> addLayout(grid);
v_layout->addStretch(); v_layout->addStretch();
@@ -81,9 +81,9 @@ ArcEditor::~ArcEditor()
void ArcEditor::setUpChangeConnections() void ArcEditor::setUpChangeConnections()
{ {
m_change_connections << connect(part, &PartArc::rectChanged, this, &ArcEditor::updateForm); m_change_connections << connect(m_part, &PartArc::rectChanged, this, &ArcEditor::updateForm);
m_change_connections << connect(part, &PartArc::spanAngleChanged, this, &ArcEditor::updateForm); m_change_connections << connect(m_part, &PartArc::spanAngleChanged, this, &ArcEditor::updateForm);
m_change_connections << connect(part, &PartArc::startAngleChanged, this, &ArcEditor::updateForm); m_change_connections << connect(m_part, &PartArc::startAngleChanged, this, &ArcEditor::updateForm);
#if TODO_LIST #if TODO_LIST
#pragma message("@TODO implement position changes!") #pragma message("@TODO implement position changes!")
#endif #endif
@@ -110,19 +110,19 @@ bool ArcEditor::setPart(CustomElementPart *new_part)
{ {
if (!new_part) if (!new_part)
{ {
if (part) if (m_part)
disconnectChangeConnections(); disconnectChangeConnections();
part = nullptr; m_part = nullptr;
return(true); 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 (m_part == part_arc) return true;
if (part) if (m_part)
disconnectChangeConnections(); disconnectChangeConnections();
part = part_arc; m_part = part_arc;
updateForm(); updateForm();
setUpChangeConnections(); setUpChangeConnections();
return(true); return(true);
@@ -138,7 +138,7 @@ bool ArcEditor::setParts(QList <CustomElementPart *> parts)
if (!setPart(parts.first())) if (!setPart(parts.first()))
return false; return false;
return style_->setParts(parts); return m_style->setParts(parts);
} }
/** /**
@@ -147,12 +147,12 @@ bool ArcEditor::setParts(QList <CustomElementPart *> parts)
*/ */
CustomElementPart *ArcEditor::currentPart() const CustomElementPart *ArcEditor::currentPart() const
{ {
return(part); return(m_part);
} }
QList<CustomElementPart*> ArcEditor::currentParts() const QList<CustomElementPart*> ArcEditor::currentParts() const
{ {
return style_->currentParts(); return m_style->currentParts();
} }
/** /**
@@ -165,7 +165,7 @@ void ArcEditor::updateArcS()
m_locked = true; m_locked = true;
double value = start_angle->value() * 16; double value = start_angle->value() * 16;
for (auto part: style_->currentParts()) { for (auto part: m_style->currentParts()) {
PartArc* arc = static_cast<PartArc*>(part); PartArc* arc = static_cast<PartArc*>(part);
@@ -191,7 +191,7 @@ void ArcEditor::updateArcA()
m_locked = true; m_locked = true;
double value = angle->value() * 16; double value = angle->value() * 16;
for (auto part: style_->currentParts()) { for (auto part: m_style->currentParts()) {
PartArc* arc = static_cast<PartArc*>(part); PartArc* arc = static_cast<PartArc*>(part);
if (value != arc->property("spanAngle")) if (value != arc->property("spanAngle"))
@@ -206,124 +206,47 @@ void ArcEditor::updateArcA()
m_locked = false; m_locked = false;
} }
/**
@brief ArcEditor::updateArcRect
Update the geometrie of the rect that define this arc according the the edited values
*/
void ArcEditor::updateArcRectX()
{
if (m_locked) return;
m_locked = true;
for (auto part: style_->currentParts()) {
PartArc* arc = static_cast<PartArc*>(part);
QRectF rect = arc->property("rect").toRectF();
QPointF point = arc->mapFromScene(x->value() - h->value()/2, y->value() - v->value()/2); // does not matter which value y is, because only the x value is used
rect.setX(point.x()); // change only the x value
if (rect != part->property("rect"))
{
QPropertyUndoCommand *undo= new QPropertyUndoCommand(arc, "rect", arc->property("rect"), rect);
undo->setText("Modifier un arc");
undo->enableAnimation();
elementScene()->undoStack().push(undo);
}
}
m_locked = false;
}
void ArcEditor::updateArcRectY()
{
if (m_locked) return;
m_locked = true;
for (auto part: style_->currentParts()) {
PartArc* arc = static_cast<PartArc*>(part);
QRectF rect = arc->property("rect").toRectF();
QPointF point = arc->mapFromScene(x->value() - h->value()/2, y->value() - v->value()/2);
rect.setY(point.y());
if (rect != arc->property("rect"))
{
QPropertyUndoCommand *undo= new QPropertyUndoCommand(arc, "rect", arc->property("rect"), rect);
undo->setText("Modifier un arc");
undo->enableAnimation();
elementScene()->undoStack().push(undo);
}
}
m_locked = false;
}
void ArcEditor::updateArcRectH()
{
if (m_locked) return;
m_locked = true;
for (auto part: style_->currentParts()) {
PartArc* arc = static_cast<PartArc*>(part);
QRectF rect = arc->property("rect").toRectF();
if (rect.width() != h->value())
{
rect.setWidth(h->value());
QPropertyUndoCommand *undo= new QPropertyUndoCommand(arc, "rect", arc->property("rect"), rect);
undo->setText("Modifier un arc");
undo->enableAnimation();
elementScene()->undoStack().push(undo);
}
}
m_locked = false;
}
void ArcEditor::updateArcRectV()
{
if (m_locked) return;
m_locked = true;
for (auto part: style_->currentParts()) {
PartArc* arc = static_cast<PartArc*>(part);
QRectF rect = arc->property("rect").toRectF();
if (rect.height() != v->value())
{
rect.setHeight(v->value());
QPropertyUndoCommand *undo= new QPropertyUndoCommand(arc, "rect", arc->property("rect"), rect);
undo->setText("Modifier un arc");
undo->enableAnimation();
elementScene()->undoStack().push(undo);
}
}
m_locked = false;
}
/** /**
@brief ArcEditor::updateForm @brief ArcEditor::updateForm
Update the value of the widgets Update the value of the widgets
*/ */
void ArcEditor::updateForm() void ArcEditor::updateForm()
{ {
if (!part) return; if (!m_part) return;
activeConnections(false); activeConnections(false);
QRectF rect = part->property("rect").toRectF(); QRectF rect = m_part->property("rect").toRectF();
x->setValue(part->mapToScene(rect.topLeft()).x() + (rect.width()/2)); x->setValue(m_part->mapToScene(rect.topLeft()).x() + (rect.width()/2));
y->setValue(part->mapToScene(rect.topLeft()).y() + (rect.height()/2)); y->setValue(m_part->mapToScene(rect.topLeft()).y() + (rect.height()/2));
h->setValue(rect.width()); h->setValue(rect.width());
v->setValue(rect.height()); v->setValue(rect.height());
start_angle->setValue(part->property("startAngle").toInt()/16); start_angle->setValue(m_part->property("startAngle").toInt()/16);
angle->setValue(part->property("spanAngle").toInt()/16); angle->setValue(m_part->property("spanAngle").toInt()/16);
activeConnections(true); activeConnections(true);
} }
void ArcEditor::updateRect()
{
QRectF rect;
auto pos_ = m_part->mapFromScene(QPointF(x->value(), y->value()));
rect.setX(pos_.x() - h->value()/2);
rect.setY(pos_.y() - v->value()/2);
rect.setWidth(h->value());
rect.setHeight(v->value());
for (auto part: m_style->currentParts())
{
auto ellipse = static_cast<PartArc*>(part);
if (rect != part->property("rect"))
{
auto undo= new QPropertyUndoCommand(ellipse, "rect", ellipse->property("rect"), rect);
undo->setText("Modifier un arc");
undo->enableAnimation();
elementScene()->undoStack().push(undo);
}
}
}
/** /**
@brief ArcEditor::activeConnections @brief ArcEditor::activeConnections
Enable/disable connection between editor widget and slot editingFinished Enable/disable connection between editor widget and slot editingFinished
@@ -334,20 +257,20 @@ void ArcEditor::activeConnections(bool active)
{ {
if (active) if (active)
{ {
connect(x, SIGNAL(editingFinished()), this, SLOT(updateArcRectX())); connect(x, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateRect);
connect(y, SIGNAL(editingFinished()), this, SLOT(updateArcRectY())); connect(y, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateRect);
connect(h, SIGNAL(editingFinished()), this, SLOT(updateArcRectH())); connect(h, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateRect);
connect(v, SIGNAL(editingFinished()), this, SLOT(updateArcRectV())); connect(v, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateRect);
connect(start_angle, SIGNAL(editingFinished()), this, SLOT(updateArcS())); connect(start_angle, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateArcS);
connect(angle, SIGNAL(editingFinished()), this, SLOT(updateArcA())); connect(angle, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateArcA);
} }
else else
{ {
disconnect(x, SIGNAL(editingFinished()), this, SLOT(updateArcRectX())); disconnect(x, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateRect);
disconnect(y, SIGNAL(editingFinished()), this, SLOT(updateArcRectY())); disconnect(y, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateRect);
disconnect(h, SIGNAL(editingFinished()), this, SLOT(updateArcRectH())); disconnect(h, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateRect);
disconnect(v, SIGNAL(editingFinished()), this, SLOT(updateArcRectV())); disconnect(v, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateRect);
disconnect(start_angle, SIGNAL(editingFinished()), this, SLOT(updateArcS())); disconnect(start_angle, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateArcS);
disconnect(angle, SIGNAL(editingFinished()), this, SLOT(updateArcA())); disconnect(angle, &QDoubleSpinBox::editingFinished, this, &ArcEditor::updateArcA);
} }
} }

9
sources/editor/arceditor.h
View File

@@ -41,8 +41,8 @@ class ArcEditor : public ElementItemEditor
// attributes // attributes
private: private:
PartArc *part; PartArc *m_part;
StyleEditor *style_; StyleEditor *m_style;
QDoubleSpinBox *x, *y, *h, *v; QDoubleSpinBox *x, *y, *h, *v;
QSpinBox *angle, *start_angle; QSpinBox *angle, *start_angle;
bool m_locked; bool m_locked;
@@ -59,11 +59,8 @@ class ArcEditor : public ElementItemEditor
public slots: public slots:
void updateArcS(); void updateArcS();
void updateArcA(); void updateArcA();
void updateArcRectX();
void updateArcRectY();
void updateArcRectH();
void updateArcRectV();
void updateForm() override; void updateForm() override;
void updateRect();
private: private:
void activeConnections(bool); void activeConnections(bool);