kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-03-31 23:59:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

QetShapeItem : add color and improve the GUI,.

Browse Source 
the xml saving is break from previous version. 


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4303 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-01-03 13:45:30 +00:00
parent 5c2ddfafa5
commit 07b81e4106
7 changed files with 257 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
sources/ui/shapegraphicsitempropertieswidget.cpp
View File

@@ -55,14 +55,13 @@ void ShapeGraphicsItemPropertiesWidget::setItem(QetShapeItem *shape)
if (!shape) return;
if (shape == m_shape) return;
if (m_shape)
if (m_shape && m_live_edit)
disconnect(m_shape, &QetShapeItem::penChanged, this, &ShapeGraphicsItemPropertiesWidget::updateUi);
disconnect(m_shape, &QetShapeItem::widthChanged, this, &ShapeGraphicsItemPropertiesWidget::updateUi);
m_shape = shape;
connect(m_shape, &QetShapeItem::penChanged, this, &ShapeGraphicsItemPropertiesWidget::updateUi);
connect(m_shape, &QetShapeItem::widthChanged, this, &ShapeGraphicsItemPropertiesWidget::updateUi);
if (m_live_edit)
connect(m_shape, &QetShapeItem::penChanged, this, &ShapeGraphicsItemPropertiesWidget::updateUi);
updateUi();
}
@@ -73,16 +72,10 @@ void ShapeGraphicsItemPropertiesWidget::setItem(QetShapeItem *shape)
* undo stack of the shape diagram.
*/
void ShapeGraphicsItemPropertiesWidget::apply()
{
if (m_live_edit)
disconnect(m_shape, &QetShapeItem::penChanged, this, &ShapeGraphicsItemPropertiesWidget::updateUi);
{
if (m_shape->diagram())
if (QUndoCommand *undo = associatedUndo())
m_shape->diagram()->undoStack().push(undo);
if (m_live_edit)
connect(m_shape, &QetShapeItem::penChanged, this, &ShapeGraphicsItemPropertiesWidget::updateUi);
}
/**
@@ -96,15 +89,18 @@ void ShapeGraphicsItemPropertiesWidget::reset() {
/**
* @brief ShapeGraphicsItemPropertiesWidget::associatedUndo
* @return an undo command that represent the change edited by this widget.
* The returned undo command is a ChangeShapeStyleCommand.
* The returned undo command is a QPropertyUndoCommand with the properties "pen".
* If there isn't change, return nullptr
*/
QUndoCommand* ShapeGraphicsItemPropertiesWidget::associatedUndo() const
{
QPen old_pen = m_shape->pen();
QPen new_pen = old_pen;
new_pen.setStyle(Qt::PenStyle(ui->m_style_cb->currentIndex() + 1));
new_pen.setWidthF(ui->m_size_cb->value());
new_pen.setWidthF(ui->m_size_dsb->value());
new_pen.setColor(ui->m_color_pb->palette().color(QPalette::Button));
if (new_pen == old_pen) return nullptr;
QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_shape, "pen", old_pen, new_pen);
@@ -117,9 +113,13 @@ QUndoCommand* ShapeGraphicsItemPropertiesWidget::associatedUndo() const
*/
void ShapeGraphicsItemPropertiesWidget::updateUi()
{
bool le = m_live_edit;
setLiveEdit(false); //Disable temporally live edit mode to avoid weird behavior
ui->m_style_cb->setCurrentIndex(static_cast<int>(m_shape->pen().style()) - 1);
ui->m_size_cb ->setValue(m_shape->pen().widthF());
ui->m_size_dsb ->setValue(m_shape->pen().widthF());
setColorButton(m_shape->pen().color());
ui->m_lock_pos_cb->setChecked(!m_shape->isMovable());
setLiveEdit(le);
}
/**
@@ -132,15 +132,46 @@ bool ShapeGraphicsItemPropertiesWidget::setLiveEdit(bool live_edit)
if (live_edit == m_live_edit) return true;
m_live_edit = live_edit;
if (m_live_edit){
if (m_live_edit)
{
connect (ui->m_style_cb, SIGNAL(activated(int)), this, SLOT(apply()));
connect (ui->m_size_cb, SIGNAL(valueChanged(double)), this, SLOT(apply()));
}else
connect (ui->m_size_dsb, SIGNAL(valueChanged(double)), this, SLOT(apply()));
connect (m_shape, &QetShapeItem::penChanged, this, &ShapeGraphicsItemPropertiesWidget::updateUi);
}
else
{
disconnect (ui->m_style_cb, SIGNAL(activated(int)), this, SLOT(apply()));
disconnect (ui->m_size_cb, SIGNAL(valueChanged(double)), this, SLOT(apply()));
disconnect (ui->m_size_dsb, SIGNAL(valueChanged(double)), this, SLOT(apply()));
disconnect (m_shape, &QetShapeItem::penChanged, this, &ShapeGraphicsItemPropertiesWidget::updateUi);
}
return true;
}
/**
* @brief ShapeGraphicsItemPropertiesWidget::setColorButton
* Set the color of the push button to the current color of the shape
* @param color
*/
void ShapeGraphicsItemPropertiesWidget::setColorButton(const QColor &color)
{
QPalette palette;
palette.setColor(QPalette::Button, color);
ui -> m_color_pb -> setStyleSheet(QString("background-color: %1; min-height: 1.5em; border-style: outset; border-width: 2px; border-color: gray; border-radius: 4px;").arg(color.name()));
}
void ShapeGraphicsItemPropertiesWidget::on_m_lock_pos_cb_clicked() {
m_shape->setMovable(!ui->m_lock_pos_cb->isChecked());
}
/**
* @brief ShapeGraphicsItemPropertiesWidget::on_m_color_pb_clicked
* Color button was clicked, we open a QColorDialog for select the color to apply to the shape.
*/
void ShapeGraphicsItemPropertiesWidget::on_m_color_pb_clicked()
{
QColor color = QColorDialog::getColor(m_shape->pen().color(), this);
if (color.isValid())
setColorButton(color);
if(m_live_edit)
apply();
}

4
sources/ui/shapegraphicsitempropertieswidget.h
View File

@@ -49,8 +49,12 @@ class ShapeGraphicsItemPropertiesWidget : public PropertiesEditorWidget
virtual void updateUi();
virtual bool setLiveEdit(bool live_edit);
private:
void setColorButton(const QColor &color);
private slots:
void on_m_lock_pos_cb_clicked();
void on_m_color_pb_clicked();
private:
Ui::ShapeGraphicsItemPropertiesWidget *ui;

163
sources/ui/shapegraphicsitempropertieswidget.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>242</width>
<height>183</height>
<width>261</width>
<height>170</height>
</rect>
</property>
<property name="windowTitle">
@@ -15,86 +15,101 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Type de trait</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="m_style_cb">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Trait</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Normal</string>
<string>Épaisseur</string>
</property>
</item>
<item>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="m_style_cb">
<item>
<property name="text">
<string>Normal</string>
</property>
</item>
<item>
<property name="text">
<string>Tiret</string>
</property>
</item>
<item>
<property name="text">
<string>Pointillé</string>
</property>
</item>
<item>
<property name="text">
<string>Traits et points</string>
</property>
</item>
<item>
<property name="text">
<string>Traits points points</string>
</property>
</item>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="m_size_dsb">
<property name="maximumSize">
<size>
<width>16777212</width>
<height>16777215</height>
</size>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::UpDownArrows</enum>
</property>
<property name="accelerated">
<bool>true</bool>
</property>
<property name="correctionMode">
<enum>QAbstractSpinBox::CorrectToNearestValue</enum>
</property>
<property name="minimum">
<double>0.400000000000000</double>
</property>
<property name="maximum">
<double>50.000000000000000</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Tiret</string>
<string>Type</string>
</property>
</item>
<item>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Pointillé</string>
<string>Couleur</string>
</property>
</item>
<item>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="m_color_pb">
<property name="text">
<string>Traits et points</string>
<string/>
</property>
</item>
<item>
<property name="text">
<string>Traits points points</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Epaisseur de trait</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="m_size_cb">
<property name="maximumSize">
<size>
<width>16777212</width>
<height>16777215</height>
</size>
</property>
<property name="wrapping">
<bool>true</bool>
</property>
<property name="accelerated">
<bool>true</bool>
</property>
<property name="correctionMode">
<enum>QAbstractSpinBox::CorrectToNearestValue</enum>
</property>
<property name="minimum">
<double>0.400000000000000</double>
</property>
<property name="maximum">
<double>50.000000000000000</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="m_lock_pos_cb">