Differential D3286 Diff 7948 src/wrtembed/KReportDesignerItemRectBase.cpp

Changeset View

Standalone View

View Options

src/wrtembed/KReportDesignerItemRectBase.cpp

Show All 22 Lines
23#include "KReportSize.h" 23​#include "KReportSize.h"
24#include "KReportDesignerSectionScene.h" 24​#include "KReportDesignerSectionScene.h"
25#include "KReportDpi.h" 25​#include "KReportDpi.h"
26 26​
27#include <KPropertySet> 27​#include <KPropertySet>
28#include <QGraphicsSceneMouseEvent> 28​#include <QGraphicsSceneMouseEvent>
29#include <QApplication> 29​#include <QApplication>
30 30​
31KReportDesignerItemRectBase::KReportDesignerItemRectBase(KReportDesigner *r) 31​KReportDesignerItemRectBase::KReportDesignerItemRectBase(KReportDesigner *r, KReportItemBase *b)
32 : QGraphicsRectItem(), KReportDesignerItemBase(r) 32​ : QGraphicsRectItem(), KReportDesignerItemBase(r, b)
33{ 33​{
34 m_dpiX = KReportDpi::dpiX(); 34​ m_dpiX = KReportDpi::dpiX();
35 m_dpiY = KReportDpi::dpiY(); 35​ m_dpiY = KReportDpi::dpiY();
36 36​
37 m_ppos = 0; ​
38 m_psize = 0; ​
39 m_grabAction = 0; 37​ m_grabAction = 0;
40 setAcceptHoverEvents(true); 38​ setAcceptHoverEvents(true);
41 39​
42#if QT_VERSION >= 0x040600 ​
43 setFlags(ItemIsSelectable | ItemIsMovable | ItemSendsGeometryChanges); 40​ setFlags(ItemIsSelectable | ItemIsMovable | ItemSendsGeometryChanges);
44#else ​
45 setFlags(ItemIsSelectable | ItemIsMovable); ​
46#endif ​
47} 41​}
48 42​
43​#if 0
staniekUnsubmitted
Done

what about this?

staniek: what about this?
piggzAuthorUnsubmitted
Done

Will remove , no longer required

piggz: Will remove , no longer required
49void KReportDesignerItemRectBase::init(KReportPosition* p, KReportSize* s, KPropertySet* se, KReportDesigner *d) 44​void KReportDesignerItemRectBase::init(KReportPosition* p, KReportSize* s, KPropertySet* se, KReportDesigner *d)
50{ 45​{
51 Q_UNUSED(d); 46​ Q_UNUSED(d);
52 m_ppos = p; 47​ m_ppos = p;
53 m_psize = s; 48​ m_psize = s;
54 m_pset = se; 49​ m_pset = se;
55} 50​}
51​#endif
56 52​
57KReportDesignerItemRectBase::~KReportDesignerItemRectBase() 53​KReportDesignerItemRectBase::~KReportDesignerItemRectBase()
58{ 54​{
59} 55​}
60 56​
61QRectF KReportDesignerItemRectBase::sceneRect() 57​QRectF KReportDesignerItemRectBase::sceneRect()
62{ 58​{
63 return QRectF(m_ppos->toScene(), m_psize->toScene()); 59​ return QRectF(KReportItemBase::scenePosition(item()->position()), KReportItemBase::sceneSize(item()->size()));
64} 60​}
65 61​
66QRectF KReportDesignerItemRectBase::pointRect() const 62​QRectF KReportDesignerItemRectBase::pointRect() const
67{ 63​{
68 if (m_ppos && m_psize) 64​ return QRectF(item()->position(), item()->size());
69 return QRectF(m_ppos->toPoint(), m_psize->toPoint()); ​
70 else ​
71 return QRectF(0, 0, 0, 0); ​
72} 65​}
73 66​
74void KReportDesignerItemRectBase::setSceneRect(const QPointF& topLeft, const QSizeF& size, UpdatePropertyFlag update) 67​void KReportDesignerItemRectBase::setSceneRect(const QPointF& topLeft, const QSizeF& size, UpdatePropertyFlag update)
75{ 68​{
76 setSceneRect(QRectF(topLeft, size), update); 69​ setSceneRect(QRectF(topLeft, size), update);
77} 70​}
78 71​
79void KReportDesignerItemRectBase::setSceneRect(const QRectF& rect, UpdatePropertyFlag update) 72​void KReportDesignerItemRectBase::setSceneRect(const QRectF& rect, UpdatePropertyFlag update)
80{ 73​{
81 QGraphicsRectItem::setPos(rect.x(), rect.y()); 74​ QGraphicsRectItem::setPos(rect.x(), rect.y());
82 setRect(0, 0, rect.width(), rect.height()); 75​ setRect(0, 0, rect.width(), rect.height());
83 if (update == UpdateProperty) { 76​ if (update == UpdateProperty) {
84 m_ppos->setScenePos(QPointF(rect.x(), rect.y())); 77​ item()->setPosition(KReportItemBase::positionFromScene(QPointF(rect.x(), rect.y())));
85 m_psize->setSceneSize(QSizeF(rect.width(), rect.height())); 78​ item()->setSize(KReportItemBase::sizeFromScene(QSizeF(rect.width(), rect.height())));
86 } 79​ }
87 this->update(); 80​ this->update();
88} 81​}
89 82​
90void KReportDesignerItemRectBase::mousePressEvent(QGraphicsSceneMouseEvent * event) 83​void KReportDesignerItemRectBase::mousePressEvent(QGraphicsSceneMouseEvent * event)
91{ 84​{
92 //Update and show properties 85​ //Update and show properties
93 m_ppos->setScenePos(QPointF(sceneRect().x(), sceneRect().y())); 86​ item()->setPosition(KReportItemBase::positionFromScene(QPointF(sceneRect().x(), sceneRect().y())));
94 m_reportDesigner->changeSet(m_pset); 87​ designer()->changeSet(item()->propertySet());
95 setSelected(true); 88​ setSelected(true);
96 scene()->update(); 89​ scene()->update();
97 90​
98 QGraphicsItem::mousePressEvent(event); 91​ QGraphicsItem::mousePressEvent(event);
99} 92​}
100 93​
101void KReportDesignerItemRectBase::mouseReleaseEvent(QGraphicsSceneMouseEvent * event) 94​void KReportDesignerItemRectBase::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
102{ 95​{
103 //Keep the size and position in sync 96​ //Keep the size and position in sync
104 m_ppos->setScenePos(pos()); 97​ item()->setPosition(KReportItemBase::positionFromScene(pos()));
105 m_psize->setSceneSize(QSizeF(rect().width(), rect().height())); 98​// m_ppos->setScenePos(pos());
staniekUnsubmitted
Done

8X

staniek: 8X
99​ item()->setSize(KReportItemBase::sizeFromScene(QSizeF(rect().width(), rect().height())));
100​
101​// m_psize->setSceneSize(QSizeF(rect().width(), rect().height()));
staniekUnsubmitted
Done

8X

staniek: 8X
106 102​
107 QGraphicsItem::mouseReleaseEvent(event); 103​ QGraphicsItem::mouseReleaseEvent(event);
108} 104​}
109 105​
110void KReportDesignerItemRectBase::mouseMoveEvent(QGraphicsSceneMouseEvent * event) 106​void KReportDesignerItemRectBase::mouseMoveEvent(QGraphicsSceneMouseEvent * event)
111{ 107​{
112 //kreportDebug() << m_grabAction; 108​ //kreportDebug() << m_grabAction;
113 109​
▲ Show 20 Lines • Show All 164 Lines • ▼ Show 20 Line(s)266 if (change == ItemPositionChange && scene()) {
278 274​
279 if (newPos.y() < 0) 275​ if (newPos.y() < 0)
280 newPos.setY(0); 276​ newPos.setY(0);
281 else if (newPos.y() > (scene()->height() - rect().height())) 277​ else if (newPos.y() > (scene()->height() - rect().height()))
282 newPos.setY(scene()->height() - rect().height()); 278​ newPos.setY(scene()->height() - rect().height());
283 279​
284 return newPos; 280​ return newPos;
285 } else if (change == ItemPositionHasChanged && scene()) { 281​ } else if (change == ItemPositionHasChanged && scene()) {
286 m_ppos->setScenePos(value.toPointF(), KReportPosition::DontUpdateProperty); 282​ item()->setPosition(KReportItemBase::positionFromScene(value.toPointF()));
287 } else if (change == ItemSceneHasChanged && scene() && m_psize) { 283​ //TODO dont update property
284​ //m_ppos->setScenePos(value.toPointF(), KReportPosition::DontUpdateProperty);
285​ } else if (change == ItemSceneHasChanged && scene() && item()) {
288 QPointF newPos = pos(); 286​ QPointF newPos = pos();
289 287​
290 newPos = dynamic_cast<KReportDesignerSectionScene*>(scene())->gridPoint(newPos); 288​ newPos = dynamic_cast<KReportDesignerSectionScene*>(scene())->gridPoint(newPos);
291 if (newPos.x() < 0) 289​ if (newPos.x() < 0)
292 newPos.setX(0); 290​ newPos.setX(0);
293 else if (newPos.x() > (scene()->width() - rect().width())) 291​ else if (newPos.x() > (scene()->width() - rect().width()))
294 newPos.setX(scene()->width() - rect().width()); 292​ newPos.setX(scene()->width() - rect().width());
295 293​
296 if (newPos.y() < 0) 294​ if (newPos.y() < 0)
297 newPos.setY(0); 295​ newPos.setY(0);
298 else if (newPos.y() > (scene()->height() - rect().height())) 296​ else if (newPos.y() > (scene()->height() - rect().height()))
299 newPos.setY(scene()->height() - rect().height()); 297​ newPos.setY(scene()->height() - rect().height());
300 298​
301 setSceneRect(newPos, m_psize->toScene(), KReportDesignerItemRectBase::DontUpdateProperty); 299​ setSceneRect(newPos, KReportItemBase::sceneSize(item()->size()), KReportDesignerItemRectBase::DontUpdateProperty);
302 } 300​ }
303 301​
304 return QGraphicsItem::itemChange(change, value); 302​ return QGraphicsItem::itemChange(change, value);
305} 303​}
306 304​
307void KReportDesignerItemRectBase::propertyChanged(const KPropertySet &s, const KProperty &p) 305​void KReportDesignerItemRectBase::propertyChanged(const KPropertySet &s, const KProperty &p)
308{ 306​{
309 Q_UNUSED(s) 307​ Q_UNUSED(s)
310 308​
311 if (p.name() == "position") { 309​ if (p.name() == "position") {
312 m_ppos->setUnitPos(p.value().toPointF(), KReportPosition::DontUpdateProperty); 310​ item()->setPosition(p.value().toPointF()); //TODO dont update property
313 } else if (p.name() == "size") { 311​ } else if (p.name() == "size") {
314 m_psize->setUnitSize(p.value().toSizeF(), KReportSize::DontUpdateProperty); 312​ item()->setSize(p.value().toSizeF()); //TODO dont update property
315 } 313​ }
316 314​
317 setSceneRect(m_ppos->toScene(), m_psize->toScene(), DontUpdateProperty); 315​ setSceneRect(KReportItemBase::scenePosition(item()->position()), KReportItemBase::sceneSize(item()->size()), DontUpdateProperty);
318} 316​}
319 317​
320void KReportDesignerItemRectBase::move(const QPointF& /*m*/) 318​void KReportDesignerItemRectBase::move(const QPointF& /*m*/)
321{ 319​{
322//! @todo 320​//! @todo
323} 321​}
324 322​
325QPointF KReportDesignerItemRectBase::properPressPoint(const KReportDesigner &d) const 323​QPointF KReportDesignerItemRectBase::properPressPoint(const KReportDesigner &d) const
▲ Show 20 Lines • Show All 61 Lines • Show Last 20 Lines