mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-02-13 12:29:59 +01:00
Element editor : add rounded rect
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5444 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
200
sources/editor/ui/rectangleeditor.cpp
Normal file
200
sources/editor/ui/rectangleeditor.cpp
Normal file
@@ -0,0 +1,200 @@
|
||||
/*
|
||||
Copyright 2006-2018 The QElectroTech Team
|
||||
This file is part of QElectroTech.
|
||||
|
||||
QElectroTech is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
QElectroTech is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "rectangleeditor.h"
|
||||
#include "ui_rectangleeditor.h"
|
||||
#include "styleeditor.h"
|
||||
#include "partrectangle.h"
|
||||
#include "QPropertyUndoCommand/qpropertyundocommand.h"
|
||||
#include "elementscene.h"
|
||||
#include "qeticons.h"
|
||||
|
||||
/**
|
||||
* @brief RectangleEditor::RectangleEditor
|
||||
* @param editor
|
||||
* @param rect
|
||||
* @param parent
|
||||
*/
|
||||
RectangleEditor::RectangleEditor(QETElementEditor *editor, PartRectangle *rect, QWidget *parent) :
|
||||
ElementItemEditor(editor, parent),
|
||||
m_part(rect),
|
||||
ui(new Ui::RectangleEditor)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
m_style = new StyleEditor(editor);
|
||||
ui->verticalLayout->insertWidget(0, m_style);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief RectangleEditor::~RectangleEditor
|
||||
*/
|
||||
RectangleEditor::~RectangleEditor() {
|
||||
delete ui;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief RectangleEditor::setPart
|
||||
* @param part
|
||||
* @return
|
||||
*/
|
||||
bool RectangleEditor::setPart(CustomElementPart *part)
|
||||
{
|
||||
if (!part)
|
||||
{
|
||||
if (m_part)
|
||||
{
|
||||
disconnect(m_part, &PartRectangle::rectChanged, this, &RectangleEditor::updateForm);
|
||||
disconnect(m_part, &PartRectangle::XRadiusChanged, this, &RectangleEditor::updateForm);
|
||||
disconnect(m_part, &PartRectangle::YRadiusChanged, this, &RectangleEditor::updateForm);
|
||||
disconnect(m_part, &PartRectangle::xChanged, this, &RectangleEditor::updateForm);
|
||||
disconnect(m_part, &PartRectangle::yChanged, this, &RectangleEditor::updateForm);
|
||||
}
|
||||
m_part = nullptr;
|
||||
m_style->setPart(nullptr);
|
||||
return(true);
|
||||
}
|
||||
|
||||
if (PartRectangle *part_rectangle = dynamic_cast<PartRectangle *>(part))
|
||||
{
|
||||
if (m_part == part_rectangle) {
|
||||
return true;
|
||||
}
|
||||
if (m_part)
|
||||
{
|
||||
disconnect(m_part, &PartRectangle::rectChanged, this, &RectangleEditor::updateForm);
|
||||
disconnect(m_part, &PartRectangle::XRadiusChanged, this, &RectangleEditor::updateForm);
|
||||
disconnect(m_part, &PartRectangle::YRadiusChanged, this, &RectangleEditor::updateForm);
|
||||
disconnect(m_part, &PartRectangle::xChanged, this, &RectangleEditor::updateForm);
|
||||
disconnect(m_part, &PartRectangle::yChanged, this, &RectangleEditor::updateForm);
|
||||
}
|
||||
m_part = part_rectangle;
|
||||
m_style->setPart(m_part);
|
||||
updateForm();
|
||||
connect(m_part, &PartRectangle::rectChanged, this, &RectangleEditor::updateForm);
|
||||
connect(m_part, &PartRectangle::XRadiusChanged, this, &RectangleEditor::updateForm);
|
||||
connect(m_part, &PartRectangle::YRadiusChanged, this, &RectangleEditor::updateForm);
|
||||
connect(m_part, &PartRectangle::xChanged, this, &RectangleEditor::updateForm);
|
||||
connect(m_part, &PartRectangle::yChanged, this, &RectangleEditor::updateForm);
|
||||
return(true);
|
||||
}
|
||||
|
||||
return(false);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief RectangleEditor::currentPart
|
||||
* @return
|
||||
*/
|
||||
CustomElementPart *RectangleEditor::currentPart() const {
|
||||
return m_part;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief RectangleEditor::topLeft
|
||||
* @return The edited topLeft already mapped to part coordinate
|
||||
*/
|
||||
QPointF RectangleEditor::editedTopLeft() const {
|
||||
return m_part->mapFromScene(ui->m_x_sb->value(), ui->m_y_sb->value());
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief RectangleEditor::updateForm
|
||||
*/
|
||||
void RectangleEditor::updateForm()
|
||||
{
|
||||
if (!m_part) {
|
||||
return;
|
||||
}
|
||||
activeConnections(false);
|
||||
|
||||
QRectF rect = m_part->property("rect").toRectF();
|
||||
QPointF p = m_part->mapToScene(rect.topLeft());
|
||||
ui->m_x_sb->setValue(p.x());
|
||||
ui->m_y_sb->setValue(p.y());
|
||||
ui->m_width_sb->setValue(rect.width());
|
||||
ui->m_height_sb->setValue(rect.height());
|
||||
ui->m_rx_sb->setValue(m_part->XRadius());
|
||||
ui->m_rx_sb->setMaximum(rect.width()/2);
|
||||
ui->m_ry_sb->setValue(m_part->YRadius());
|
||||
ui->m_ry_sb->setMaximum(rect.height()/2);
|
||||
|
||||
activeConnections(true);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief RectangleEditor::editingFinished
|
||||
* Slot called when a editor widget is finish to be edited
|
||||
* Update the geometry of the rectangle according to value of editing widget.
|
||||
*/
|
||||
void RectangleEditor::editingFinished()
|
||||
{
|
||||
if (m_locked) {
|
||||
return;
|
||||
}
|
||||
m_locked = true;
|
||||
|
||||
QUndoCommand *undo = new QUndoCommand();
|
||||
undo->setText(tr("Modifier un rectangle"));
|
||||
|
||||
QRectF rect(editedTopLeft(), QSizeF(ui->m_width_sb->value(), ui->m_height_sb->value()));
|
||||
if (m_part->rect() != rect)
|
||||
{
|
||||
QPropertyUndoCommand *u = new QPropertyUndoCommand(m_part, "rect", m_part->rect(), rect, undo);
|
||||
u->enableAnimation();
|
||||
}
|
||||
if (m_part->XRadius() != ui->m_rx_sb->value())
|
||||
{
|
||||
QPropertyUndoCommand *u = new QPropertyUndoCommand(m_part, "xRadius", m_part->XRadius(), ui->m_rx_sb->value(), undo);
|
||||
u->setAnimated();
|
||||
}
|
||||
if (m_part->YRadius() != ui->m_ry_sb->value())
|
||||
{
|
||||
QPropertyUndoCommand *u = new QPropertyUndoCommand(m_part, "yRadius", m_part->YRadius(), ui->m_ry_sb->value(), undo);
|
||||
u->setAnimated();
|
||||
}
|
||||
elementScene()->undoStack().push(undo);
|
||||
|
||||
m_locked = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief RectangleEditor::activeConnections
|
||||
* Enable/disable connection between editor widget and slot editingFinished
|
||||
* True == enable | false == disable
|
||||
* @param active
|
||||
*/
|
||||
void RectangleEditor::activeConnections(bool active)
|
||||
{
|
||||
if (active)
|
||||
{
|
||||
connect(ui->m_x_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
connect(ui->m_y_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
connect(ui->m_width_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
connect(ui->m_height_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
connect(ui->m_rx_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
connect(ui->m_ry_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
}
|
||||
else
|
||||
{
|
||||
disconnect(ui->m_x_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
disconnect(ui->m_y_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
disconnect(ui->m_width_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
disconnect(ui->m_height_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
disconnect(ui->m_rx_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
disconnect(ui->m_ry_sb, &QDoubleSpinBox::editingFinished, this, &RectangleEditor::editingFinished);
|
||||
}
|
||||
}
|
||||
60
sources/editor/ui/rectangleeditor.h
Normal file
60
sources/editor/ui/rectangleeditor.h
Normal file
@@ -0,0 +1,60 @@
|
||||
/*
|
||||
Copyright 2006-2018 The QElectroTech Team
|
||||
This file is part of QElectroTech.
|
||||
|
||||
QElectroTech is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
QElectroTech is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#ifndef RECTANGLEEDITOR_H
|
||||
#define RECTANGLEEDITOR_H
|
||||
|
||||
#include "elementitemeditor.h"
|
||||
#include <QWidget>
|
||||
|
||||
class StyleEditor;
|
||||
class PartRectangle;
|
||||
|
||||
namespace Ui {
|
||||
class RectangleEditor;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief The RectangleEditor class
|
||||
* This class provides a widget to edit rectangles within the element editor.
|
||||
*/
|
||||
class RectangleEditor : public ElementItemEditor
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit RectangleEditor(QETElementEditor *editor, PartRectangle *rect = nullptr, QWidget *parent = nullptr);
|
||||
~RectangleEditor();
|
||||
|
||||
bool setPart(CustomElementPart *part) override;
|
||||
CustomElementPart *currentPart() const override;
|
||||
QPointF editedTopLeft () const;
|
||||
|
||||
public slots:
|
||||
void updateForm() override;
|
||||
private:
|
||||
void editingFinished();
|
||||
void activeConnections(bool active);
|
||||
|
||||
private:
|
||||
bool m_locked = false;
|
||||
StyleEditor *m_style;
|
||||
PartRectangle *m_part;
|
||||
Ui::RectangleEditor *ui;
|
||||
};
|
||||
|
||||
#endif // RECTANGLEEDITOR_H
|
||||
166
sources/editor/ui/rectangleeditor.ui
Normal file
166
sources/editor/ui/rectangleeditor.ui
Normal file
@@ -0,0 +1,166 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>RectangleEditor</class>
|
||||
<widget class="QWidget" name="RectangleEditor">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>293</width>
|
||||
<height>147</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<property name="sizeConstraint">
|
||||
<enum>QLayout::SetMinimumSize</enum>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QGridLayout" name="m_grid_layout">
|
||||
<item row="3" column="1">
|
||||
<widget class="QDoubleSpinBox" name="m_width_sb">
|
||||
<property name="minimum">
|
||||
<double>-5000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>5000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="text">
|
||||
<string>Hauteur :</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" colspan="4">
|
||||
<widget class="QLabel" name="label_4">
|
||||
<property name="text">
|
||||
<string>Dimensions :</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>y</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QDoubleSpinBox" name="m_height_sb">
|
||||
<property name="minimum">
|
||||
<double>-5000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>5000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<widget class="QDoubleSpinBox" name="m_y_sb">
|
||||
<property name="minimum">
|
||||
<double>-5000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>5000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="3">
|
||||
<widget class="QDoubleSpinBox" name="m_rx_sb">
|
||||
<property name="maximum">
|
||||
<double>2500.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0" colspan="4">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Coin supérieur gauche :</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>Largeur :</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="2">
|
||||
<widget class="QLabel" name="label_7">
|
||||
<property name="text">
|
||||
<string>Arrondi :</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>x</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QDoubleSpinBox" name="m_x_sb">
|
||||
<property name="minimum">
|
||||
<double>-5000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>5000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="2">
|
||||
<widget class="QLabel" name="label_8">
|
||||
<property name="text">
|
||||
<string>Arrondi :</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="3">
|
||||
<widget class="QDoubleSpinBox" name="m_ry_sb">
|
||||
<property name="maximum">
|
||||
<double>2500.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
Reference in New Issue
Block a user