QetShapeItem: improve code.

Other improvement related to the refactoring of QetShapeItem


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3134 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-06-14 16:04:34 +00:00
parent 22db245e6b
commit f5ca3114d1
14 changed files with 508 additions and 488 deletions

View File

@@ -1,217 +1,246 @@
/*
Copyright 2006-2014 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 "qetshapeitem.h"
#include "diagramcommands.h"
#include "createdxf.h"
#include "diagram.h"
QetShapeItem::QetShapeItem(QPointF p1, QPointF p2, ShapeType type, bool lineAngle,QGraphicsItem *parent) :
/**
* @brief QetShapeItem::QetShapeItem
* Constructor of shape item. point 1 and 2 must be in scene coordinate
* @param p1 first point
* @param p2 second point
* @param type type of item (line, rectangle, ellipse)
* @param parent parent item
*/
QetShapeItem::QetShapeItem(QPointF p1, QPointF p2, ShapeType type, QGraphicsItem *parent) :
QetGraphicsItem(parent),
_shapeStyle(Qt::DashLine),
_lineAngle(lineAngle),
_isFullyBuilt(false),
_writingXml(false)
m_shapeType(type),
m_shapeStyle(Qt::DashLine),
m_P1 (Diagram::snapToGrid(p1)),
m_P2 (Diagram::snapToGrid(p2))
{
_shapeType = type;
_boundingRect = QRectF(p1, p2);
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
}
QetShapeItem::~QetShapeItem()
{
}
/**
* @brief QetShapeItem::setStyle
* Set the new style of pen for thi item
* @param newStyle
*/
void QetShapeItem::setStyle(Qt::PenStyle newStyle)
{
_shapeStyle = newStyle;
m_shapeStyle = newStyle;
update();
}
void QetShapeItem::scale(double factor)
{
QRectF bounding_rect = boundingRect();
bounding_rect.setWidth(bounding_rect.width() * factor);
bounding_rect.setHeight(bounding_rect.height() * factor);
setBoundingRect(bounding_rect);
update();
}
void QetShapeItem::setFullyBuilt(bool isBuilt)
{
_isFullyBuilt = isBuilt;
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
}
QLineF *QetShapeItem::getLine()
{
QRectF rect = boundingRect();
QLineF *line = 0;
if (_shapeType == Line) {
if (_lineAngle)
line = new QLineF(rect.topRight(), rect.bottomLeft());
else
line = new QLineF(rect.topLeft(), rect.bottomRight());
/**
* @brief QetShapeItem::scale
* Preview the scale of this item to factor
* @param factor
*/
void QetShapeItem::previewScale(int factor) {
setTransformOriginPoint(boundingRect().center());
if (factor >= 1 && factor <= 200) {
qreal new_scale = factor;
new_scale /= 100;
setScale(new_scale);
}
return line;
}
QRectF *QetShapeItem::getRectangle()
{
QRectF rect = boundingRect();
QRectF *rec = 0;
if (_shapeType == Rectangle)
rec = new QRectF(rect);
return rec;
/**
* @brief QetShapeItem::setP2
* Set the second point of this item
* @param P2
*/
void QetShapeItem::setP2(QPointF P2) {
P2 = Diagram::snapToGrid(P2);
if (P2 == m_P2) return;
prepareGeometryChange();
m_P2 = P2;
setTransformOriginPoint(boundingRect().center());
}
QRectF *QetShapeItem::getEllipse()
{
QRectF rect = boundingRect();
QRectF *rec = 0;
if (_shapeType == Ellipse)
rec = new QRectF(rect);
return rec;
/**
* @brief QetShapeItem::boundingRect
* @return the bounding rect of this item
*/
QRectF QetShapeItem::boundingRect() const {
QRectF b(m_P1, m_P2);
return b.normalized();
}
QRectF QetShapeItem::boundingRect() const
{
return _boundingRect;
}
QPainterPath QetShapeItem::shape() const
{
/**
* @brief QetShapeItem::shape
* @return the shape of this item
*/
QPainterPath QetShapeItem::shape() const {
QPainterPath path;
QPainterPathStroker pps;
QRectF rect = boundingRect();
switch (_shapeType) {
switch (m_shapeType) {
case Line:
if (_lineAngle) {
path.moveTo(rect.topRight());
path.lineTo(rect.bottomLeft());
} else {
path.moveTo(rect.topLeft());
path.lineTo(rect.bottomRight());
}
//use @pps for grab line with bigger outerline
//more usefull
path.moveTo(m_P1);
path.lineTo(m_P2);
pps.setWidth(10);
path= pps.createStroke(path);
path = pps.createStroke(path);
break;
case Rectangle:
path = QetGraphicsItem::shape();
path.addRect(boundingRect());
break;
case Ellipse:
path.addEllipse(rect);
path.addEllipse(boundingRect());
break;
default:
path = QetGraphicsItem::shape();
Q_ASSERT(false);
break;
}
return path;
}
/**
* @brief QetShapeItem::changeGraphicsItem
* Change the curent type of this item to newtype
* @param newtype
*/
void QetShapeItem::changeGraphicsItem(const ShapeType &newtype) {
if (newtype == m_shapeType) return;
prepareGeometryChange();
m_shapeType = newtype;
}
/**
* @brief QetShapeItem::paint
* Paint this item
* @param painter
* @param option
* @param widget
*/
void QetShapeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
if (!_writingXml) {
painter -> setRenderHint(QPainter::Antialiasing, false);
QRectF rec = boundingRect();
QPen pen(Qt::black);
Q_UNUSED(option); Q_UNUSED(widget);
#ifdef Q_WS_WIN
pen.setWidthF(1);
#endif
QPen pen;
pen.setStyle(m_shapeStyle);
if (isSelected()) pen.setColor(Qt::red);
painter->setPen(pen);
if (isSelected())
pen.setColor(Qt::red);
pen.setStyle(_shapeStyle);
painter->setPen(pen);
switch(_shapeType) {
case Line:
if (_lineAngle)
painter -> drawLine(rec.topRight(), rec.bottomLeft());
else
painter -> drawLine(rec.topLeft(), rec.bottomRight());
break;
case Rectangle:
painter -> drawRect(rec);
break;
default: //(case Ellipse:)
painter ->drawEllipse(rec);
}
switch (m_shapeType) {
case Line:
painter->drawLine(QLineF(m_P1, m_P2));
break;
case Rectangle:
painter->drawRect(boundingRect());
break;
case Ellipse:
painter->drawEllipse(boundingRect());
break;
}
}
void QetShapeItem::mousePressEvent(QGraphicsSceneMouseEvent *e)
{
_origMousePress = mapToScene(e -> pos());
first_move_ = true;
if (e -> modifiers() & Qt::ControlModifier) {
setSelected(!isSelected());
}
QGraphicsItem::mousePressEvent(e);
}
/**
* @brief QetShapeItem::fromXml
* Build this item from the xml description
* @param e element where is stored this item
* @return true if load success
*/
bool QetShapeItem::fromXml(const QDomElement &e) {
if (e.tagName() != "shape") return (false);
void QetShapeItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *e)
{
if (diagram()) diagram() -> endMoveElements();
QPointF newCoord = mapToScene(e -> pos());
if (newCoord != _origMousePress) {
//translate bounding rectangle
QRectF rec = boundingRect();
rec.translate(newCoord - _origMousePress);
setBoundingRect(rec);
setPos(pos() - newCoord + _origMousePress);
}
if (!(e -> modifiers() & Qt::ControlModifier)) QGraphicsItem::mouseReleaseEvent(e);
}
bool QetShapeItem::fromXml(const QDomElement &e)
{
if (!_writingXml) {
if (e.tagName() != "shape") return (false);
_shapeType = QetShapeItem::ShapeType(e.attribute("type","0").toInt());
_shapeStyle = Qt::PenStyle(e.attribute("style","0").toInt());
_lineAngle = e.attribute("lineAngle","0").toInt();
qreal x = e.attribute("x","0").toDouble();
qreal y = e.attribute("y","0").toDouble();
qreal w = e.attribute("w","0").toDouble();
qreal h = e.attribute("h","0").toDouble();
setBoundingRect(QRectF(x, y, w, h));
setFullyBuilt(true);
}
m_shapeStyle = Qt::PenStyle(e.attribute("style","0").toInt());
m_P1.setX(e.attribute("x1", 0).toDouble());
m_P1.setY(e.attribute("y1", 0).toDouble());
m_P2.setX(e.attribute("x2", 0).toDouble());
m_P2.setY(e.attribute("y2", 0).toDouble());
changeGraphicsItem(QetShapeItem::ShapeType(e.attribute("type","0").toInt()));
return (true);
}
/**
* @brief QetShapeItem::toXml
* Save this item to xml element
* @param document parent document xml
* @return element xml where is write this item
*/
QDomElement QetShapeItem::toXml(QDomDocument &document) const {
QDomElement result = document.createElement("shape");
QRectF rec = boundingRect();
//write some attribute
result.setAttribute("type", QString::number(_shapeType));
result.setAttribute("x", QString::number(rec.topLeft().x()));
result.setAttribute("y", QString::number(rec.topLeft().y()));
result.setAttribute("w", QString::number(rec.width()));
result.setAttribute("h", QString::number(rec.height()));
result.setAttribute("lineAngle", QString::number(_lineAngle));
result.setAttribute("style", QString::number(_shapeStyle));
result.setAttribute("type", QString::number(m_shapeType));
result.setAttribute("style", QString::number(m_shapeStyle));
result.setAttribute("x1", mapToScene(m_P1).x());
result.setAttribute("y1", mapToScene(m_P1).y());
result.setAttribute("x2", mapToScene(m_P2).x());
result.setAttribute("y2", mapToScene(m_P2).y());
return(result);
}
/**
* @brief QetShapeItem::toDXF
* Draw this element to the dxf document
* @param filepath file path of the the dxf document
* @return true if draw success
*/
bool QetShapeItem::toDXF(const QString &filepath) {
switch (m_shapeType) {
case Line:
Createdxf::drawLine(filepath, QLineF(mapToScene(m_P1), mapToScene(m_P2)), 0);
return true;
break;
case Rectangle:
Createdxf::drawRectangle(filepath, QRectF(mapToScene(m_P1), mapToScene(m_P2)).normalized(), 0);
return true;
break;
case Ellipse:
Createdxf::drawEllipse(filepath, QRectF(mapToScene(m_P1), mapToScene(m_P2)).normalized(), 0);
return true;
break;
default:
return false;
break;
}
}
/**
* @brief QetShapeItem::editProperty
* Edit the property of this item
*/
void QetShapeItem::editProperty()
{
if (diagram() -> isReadOnly()) return;
//the dialog
QDialog property_dialog(diagram()->views().at(0));
property_dialog.setWindowTitle(tr("\311diter les propri\351t\351s d'une liaison, Zone ", "window title"));
property_dialog.setWindowTitle(tr("\311diter les propri\351t\351s d'une shape, Zone ", "window title"));
//the main layout
QVBoxLayout dialog_layout(&property_dialog);
//GroupBox for resizer image
QGroupBox restyle_groupe(QObject::tr("Type de ligne", "shape style"));
QGroupBox restyle_groupe(QObject::tr("Type de trait", "shape style"));
dialog_layout.addWidget(&restyle_groupe);
QHBoxLayout restyle_layout(&restyle_groupe);
@@ -223,7 +252,7 @@ void QetShapeItem::editProperty()
style_combo.addItem(QObject::tr("Traits points points"));
// The items have been added in order accordance with Qt::PenStyle.
style_combo.setCurrentIndex(int(_shapeStyle) - 1);
style_combo.setCurrentIndex(int(m_shapeStyle) - 1);
restyle_layout.addWidget(&style_combo);
@@ -231,23 +260,33 @@ void QetShapeItem::editProperty()
QCheckBox cb(tr("Verrouiller la position"), &property_dialog);
cb.setChecked(!is_movable_);
dialog_layout.addWidget(&cb);
cb.setVisible(false);
//GroupBox for Scaling
QGroupBox scale_groupe(QObject::tr("\311chelle", "shape scale"));
dialog_layout.addWidget(&scale_groupe);
QHBoxLayout scale_layout(&scale_groupe);
QLabel scale_label(&property_dialog);
scale_label.setText(tr("Facteur d'\351chelle"));
int min_range = 1;
int max_range = 200;
int factor_range = 100;
QLineEdit scale_lineedit(&property_dialog);
QDoubleValidator scale_val(0.0,1000,3, &property_dialog);
scale_lineedit.setValidator(&scale_val);
scale_lineedit.setText("1.0");
scale_layout.addWidget(&scale_label);
scale_layout.addWidget(&scale_lineedit);
//slider
QSlider slider(Qt::Horizontal, &property_dialog);
slider.setRange(min_range, max_range);
qreal scale_= scale();
slider.setValue(scale_*factor_range);
//spinbox
QSpinBox spin_box(&property_dialog);
spin_box.setRange(min_range, max_range);
spin_box.setValue(scale_*factor_range);
spin_box.setSuffix(" %");
//synchro slider with spinbox
connect(&slider, SIGNAL(valueChanged(int)), &spin_box, SLOT(setValue(int)));
connect(&slider, SIGNAL(valueChanged(int)), this, SLOT(previewScale(int)));
connect(&spin_box, SIGNAL(valueChanged(int)), &slider, SLOT(setValue(int)));
//add slider and spinbox to layout
scale_layout.addWidget(&slider);
scale_layout.addWidget(&spin_box);
//dialog button, box
QDialogButtonBox dbb(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
@@ -260,11 +299,13 @@ void QetShapeItem::editProperty()
cb.isChecked() ? is_movable_=false : is_movable_=true;
Qt::PenStyle new_style = Qt::PenStyle(style_combo.currentIndex() + 1);
if (new_style != _shapeStyle)
diagram()->undoStack().push(new ChangeShapeStyleCommand(this, _shapeStyle, new_style));
double scale_factor = scale_lineedit.text().toDouble();
if (scale_factor != 1 && scale_factor > 0 && scale_factor < 1000 )
diagram()->undoStack().push(new ChangeShapeScaleCommand(this, scale_factor));
if (new_style != m_shapeStyle) diagram()->undoStack().push(new ChangeShapeStyleCommand(this, m_shapeStyle, new_style));
qreal scale_factor = slider.value();
scale_factor /= factor_range;
if (scale_ != scale_factor) diagram()->undoStack().push(new ItemResizerCommand(this, scale_, scale_factor, tr("une shape")));
return;
}
return;
//...or not
setScale(scale_);
}