Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: #1302 Fixed crash program.

Browse source 
--HG--
branch : gsoc2011-worldeditorqt
This commit is contained in:
dnk-88 2011-08-11 14:14:56 +03:00
parent f4d699c534
commit e39cc48a3a
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_actions.cpp
View file

@ -121,7 +121,7 @@ void removeGraphicsItems(const QModelIndex &primIndex, PrimitivesTreeModel *mode
{ {
QGraphicsItem *item = qvariant_cast<QGraphicsItem *>(node->data(Constants::GRAPHICS_DATA_QT4_2D)); QGraphicsItem *item = qvariant_cast<QGraphicsItem *>(node->data(Constants::GRAPHICS_DATA_QT4_2D));
if (item != 0) if (item != 0)
delete item; scene->removeWorldItem(item);
break; break;
} }
} }

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

@ -80,6 +80,15 @@ QGraphicsItem *WorldEditorScene::addWorldItemZone(const QPolygonF &polygon)
return item; return item;
} }
void WorldEditorScene::removeWorldItem(QGraphicsItem *item)
{
updateSelectedItems(true);
m_selectedItems.clear();
m_editedSelectedItems = false;
m_firstSelection = false;
delete item;
}
void WorldEditorScene::setModeEdit(WorldEditorScene::ModeEdit mode) void WorldEditorScene::setModeEdit(WorldEditorScene::ModeEdit mode)
{ {
if (mode == WorldEditorScene::SelectMode) if (mode == WorldEditorScene::SelectMode)

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

@ -59,6 +59,8 @@ public:
QGraphicsItem *addWorldItemPath(const QPolygonF &polyline); QGraphicsItem *addWorldItemPath(const QPolygonF &polyline);
QGraphicsItem *addWorldItemZone(const QPolygonF &polygon); QGraphicsItem *addWorldItemZone(const QPolygonF &polygon);
void removeWorldItem(QGraphicsItem *item);
void setModeEdit(WorldEditorScene::ModeEdit mode); void setModeEdit(WorldEditorScene::ModeEdit mode);
WorldEditorScene::ModeEdit editMode() const; WorldEditorScene::ModeEdit editMode() const;