aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-24 08:06:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: #1302 Fixed undo/redo zoom items.

Browse source 
--HG--
branch : gsoc2011-worldeditorqt
This commit is contained in:
dnk-88 2011-08-11 14:05:06 +03:00
parent 89a92f1e4c
commit f4d699c534
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_scene.cpp
View file

@ -160,6 +160,7 @@ void WorldEditorScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
case WorldEditorScene::RotateMode: case WorldEditorScene::RotateMode:
break; break;
case WorldEditorScene::ScaleMode: case WorldEditorScene::ScaleMode:
m_scaleFactor = QPointF(1.0, 1.0);
break; break;
case WorldEditorScene::TurnMode: case WorldEditorScene::TurnMode:
break; break;
@ -223,6 +224,9 @@ void WorldEditorScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent)
else else
offset.setY(1.0 / (1.0 + (offset.y() / 5000))); offset.setY(1.0 / (1.0 + (offset.y() / 5000)));
m_scaleFactor.setX(offset.x() * m_scaleFactor.x());
m_scaleFactor.setY(offset.y() * m_scaleFactor.y());
Q_FOREACH(QGraphicsItem *item, m_selectedItems) Q_FOREACH(QGraphicsItem *item, m_selectedItems)
{ {
qgraphicsitem_cast<AbstractWorldItem *>(item)->scaleOn(pivot, offset); qgraphicsitem_cast<AbstractWorldItem *>(item)->scaleOn(pivot, offset);
@ -282,13 +286,8 @@ void WorldEditorScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent)
case WorldEditorScene::ScaleMode: case WorldEditorScene::ScaleMode:
{ {
QPointF pivot = calcBoundingRect(m_selectedItems).center(); QPointF pivot = calcBoundingRect(m_selectedItems).center();
QPointF offset = mouseEvent->scenePos() - m_firstPick; m_undoStack->push(new ScaleWorldItemsCommand(m_selectedItems, m_scaleFactor, pivot, m_model));
// Calculate scale factor
offset.setX(1.0 + (offset.x() / 5000));
offset.setY(1.0 + (-offset.y() / 5000));
m_undoStack->push(new ScaleWorldItemsCommand(m_selectedItems, offset, pivot, m_model));
break; break;
} }
case WorldEditorScene::TurnMode: case WorldEditorScene::TurnMode:

2
code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_scene.h
View file

@ -85,7 +85,7 @@ private:
QPen m_pen1, m_pen2; QPen m_pen1, m_pen2;
QBrush m_brush1, m_brush2; QBrush m_brush1, m_brush2;
QPointF m_firstPick; QPointF m_firstPick, m_scaleFactor;
QRectF m_selectionArea; QRectF m_selectionArea;
qreal m_firstPickX, m_firstPickY; qreal m_firstPickX, m_firstPickY;
QList<QGraphicsItem *> m_selectedItems; QList<QGraphicsItem *> m_selectedItems;