code brush

This commit is contained in:
Бычков Андрей
2022-07-01 17:30:34 +03:00
parent 2fb937a090
commit 883612e835
15 changed files with 49 additions and 260 deletions

View File

@@ -32,18 +32,6 @@ g_main(this), g_selection(this) {
anim_sel.setEasingCurve(QEasingCurve::OutCubic);
anim_sel.setDuration(400);
t_sel.start();
//g_main.setBrush(QColor(128, 128, 128, 64));
/*
BlockItemPin * pin = new BlockItemPin(Qt::AlignRight, 0, this);
pin->setText("text");
pin->setBusType(0);
addPin(pin);
pin = new BlockItemPin(Qt::AlignTop, this);
pin->setBusType(0); addPin(pin);
pin = new BlockItemPin(Qt::AlignLeft, this);
pin->setBusType(1); addPin(pin);
pin = new BlockItemPin(Qt::AlignRight, this);
pin->setBusType(1); addPin(pin);*/
}
@@ -137,7 +125,6 @@ void BlockItem::addDecor(QGraphicsItem & item) {
qgraphicsitem_cast<AlignedTextItem*>(&item)->setData(bvidDecorText, qgraphicsitem_cast<AlignedTextItem*>(&item)->text());
item.setData(bvidMoveParent, true);
item.setData(bvidBlockDecor, true);
//decors_ << &item;
item.setParentItem(this);
}
@@ -176,7 +163,7 @@ void BlockItem::clearDecors() {
decors_.clear();
if (scene()) {
scene()->blockSignals(pbs);
QMetaObject::invokeMethod(scene(), "selectionChanged");
scene()->selectionChanged();
}
}
@@ -191,14 +178,6 @@ QVector<BlockItemPin * > BlockItem::pins() const {
QByteArray BlockItem::saveModel() {
/*QDataStream s(&ret, QIODevice::ReadWrite);
QVector<BlockItemPin * > ps = pins();
s << pos() << rotation() << size() << color() << ps.size();
foreach (BlockItemPin * p, ps)
s << int(p->alignment()) << p->busType() << p->text() << p->devices();
s << decors_.size();
foreach (QGraphicsItem * i, decors_)
s << i;*/
ChunkStream cs;
cs << cs.chunk(1, pos()) << cs.chunk(2, rotation()) << cs.chunk(3, size()) << cs.chunk(4, color()) << cs.chunk(5, pins())
<< cs.chunk(6, decors_) << cs.chunk(7, pins_margin) << cs.chunk(0xFF, _blockitem_current_version_);
@@ -213,29 +192,6 @@ void BlockItem::loadModel(const QByteArray & data) {
col = Qt::lightGray;
_resize(QSizeF(100., 60.));
if (data.isEmpty()) return;
/*QDataStream s(data);
{QPointF _v; s >> _v;}
{qreal _v; s >> _v;}
{QSizeF _v; s >> _v; setSize(_v);}
{QColor _v; s >> _v; setColor(_v);}
int _s; s >> _s;
for (int i = 0; i < _s; ++i) {
BlockItemPin * pin = new BlockItemPin();
{int _v; s >> _v; pin->setAlignment((Qt::Alignment)_v);}
{int _v; s >> _v; pin->setBusType(_v);}
{QString _v; s >> _v; pin->setText(_v);}
{QMap<QString, BlockItemPin::Device> _v; s >> _v; pin->setDevices(_v);}
addPin(pin);
}
s >> _s;
for (int i = 0; i < _s; ++i) {
if (s.atEnd()) break;
QGraphicsItem * ni = 0;
s >> ni;
if (ni) {
addDecor(ni);
}
}*/
ChunkStream cs(data);
QVector<BlockItemPin * > tp;
QList<QGraphicsItem * > dl;
@@ -374,11 +330,6 @@ QRectF BlockItem::boundingRect() const {
}
void BlockItem::mouseMoveEvent(QGraphicsSceneMouseEvent * event) {
//QGraphicsItem::mouseMoveEvent(event);
}
void BlockItem::hoverEnterEvent(QGraphicsSceneHoverEvent * e) {
bool anim = ((BlockView *)scene()->views().back())->isBlockAnimationEnabled();
if (anim) {
@@ -406,9 +357,7 @@ void BlockItem::hoverLeaveEvent(QGraphicsSceneHoverEvent * e) {
#define _POS(m) (i - ((cp.size() - 1) / 2)) * m
void BlockItem::arrangePins() {
//double w = g_main.rect().width(), h = g_main.rect().height();
QVector<BlockItemPin * > pl = pins();
// pl = pl.fromList(pins().toList());
pins_.clear();
foreach (BlockItemPin * p, pl)
pins_[p->alignment()] << p;
@@ -505,11 +454,6 @@ QStringList BlockItem::getBindProps() const {
}
void BlockItem::paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget) {
//if ()
}
QVariant BlockItem::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant & value) {
if (change == QGraphicsItem::ItemSelectedChange) {
// qDebug() << "select" << value.toBool();