krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Undo for delete operation in referenceables table. Implemented by saving UniversalId::Type in DeleteCommand.

Browse source
This commit is contained in:
cc9cii 2015-04-25 06:06:11 +10:00
parent a6925683c6
commit 8aaa74a983
7 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/opencs/model/world/commanddispatcher.cpp
View file

@ -8,6 +8,7 @@
#include "../doc/document.hpp"
#include "idtable.hpp"
#include "idtree.hpp"
#include "record.hpp"
#include "commands.hpp"
@ -153,7 +154,15 @@ void CSMWorld::CommandDispatcher::executeDelete()
std::string id = model.data (model.getModelIndex (*iter, columnIndex)).
toString().toUtf8().constData();
mDocument.getUndoStack().push (new CSMWorld::DeleteCommand (model, id));
if (mId.getType() == UniversalId::Type_Referenceables)
{
IdTree& tree = dynamic_cast<IdTree&> (*mDocument.getData().getTableModel (mId));
std::pair<int, UniversalId::Type> localIndex = tree.searchId (id);
mDocument.getUndoStack().push (new CSMWorld::DeleteCommand (model, id, localIndex.second));
}
else
mDocument.getUndoStack().push (new CSMWorld::DeleteCommand (model, id));
}
if (rows.size()>1)
@ -219,8 +228,17 @@ void CSMWorld::CommandDispatcher::executeExtendedDelete()
Misc::StringUtils::lowerCase (record.get().mCell)))
continue;
mDocument.getUndoStack().push (
new CSMWorld::DeleteCommand (model, record.get().mId));
if (mId.getType() == UniversalId::Type_Referenceables)
{
IdTree& tree = dynamic_cast<IdTree&> (*mDocument.getData().getTableModel (mId));
std::pair<int, UniversalId::Type> localIndex = tree.searchId (record.get().mId);
mDocument.getUndoStack().push (
new CSMWorld::DeleteCommand (model, record.get().mId, localIndex.second));
}
else
mDocument.getUndoStack().push (
new CSMWorld::DeleteCommand (model, record.get().mId));
}
}
}

7
apps/opencs/model/world/commands.cpp
View file

@ -103,8 +103,9 @@ void CSMWorld::RevertCommand::undo()
mModel.setRecord (mId, *mOld);
}
CSMWorld::DeleteCommand::DeleteCommand (IdTable& model, const std::string& id, QUndoCommand* parent)
: QUndoCommand (parent), mModel (model), mId (id), mOld (0)
CSMWorld::DeleteCommand::DeleteCommand (IdTable& model,
const std::string& id, CSMWorld::UniversalId::Type type, QUndoCommand* parent)
: QUndoCommand (parent), mModel (model), mId (id), mOld (0), mType(type)
{
setText (("Delete record " + id).c_str());
@ -135,7 +136,7 @@ void CSMWorld::DeleteCommand::redo()
void CSMWorld::DeleteCommand::undo()
{
mModel.setRecord (mId, *mOld);
mModel.setRecord (mId, *mOld, mType);
}

4
apps/opencs/model/world/commands.hpp
View file

@ -111,6 +111,7 @@ namespace CSMWorld
IdTable& mModel;
std::string mId;
RecordBase *mOld;
UniversalId::Type mType;
// not implemented
DeleteCommand (const DeleteCommand&);
@ -118,7 +119,8 @@ namespace CSMWorld
public:
DeleteCommand (IdTable& model, const std::string& id, QUndoCommand *parent = 0);
DeleteCommand (IdTable& model, const std::string& id,
UniversalId::Type type = UniversalId::Type_None, QUndoCommand *parent = 0);
virtual ~DeleteCommand();

4
apps/opencs/model/world/idtable.cpp
View file

@ -145,7 +145,7 @@ QModelIndex CSMWorld::IdTable::getModelIndex (const std::string& id, int column)
return index(mIdCollection->getIndex (id), column);
}
void CSMWorld::IdTable::setRecord (const std::string& id, const RecordBase& record)
void CSMWorld::IdTable::setRecord (const std::string& id, const RecordBase& record, CSMWorld::UniversalId::Type type)
{
int index = mIdCollection->searchId (id);
@ -155,7 +155,7 @@ void CSMWorld::IdTable::setRecord (const std::string& id, const RecordBase& reco
beginInsertRows (QModelIndex(), index, index);
mIdCollection->appendRecord (record);
mIdCollection->appendRecord (record, type);
endInsertRows();
}

3
apps/opencs/model/world/idtable.hpp
View file

@ -59,7 +59,8 @@ namespace CSMWorld
virtual QModelIndex getModelIndex (const std::string& id, int column) const;
void setRecord (const std::string& id, const RecordBase& record);
void setRecord (const std::string& id, const RecordBase& record,
UniversalId::Type type = UniversalId::Type_None);
///< Add record or overwrite existing recrod.
const RecordBase& getRecord (const std::string& id) const;

7
apps/opencs/model/world/idtree.cpp
View file

@ -4,6 +4,7 @@
#include "collectionbase.hpp"
#include "nestedcollection.hpp"
#include "refidcollection.hpp" // HACK: for searchId() only
#include "columnbase.hpp"
// NOTE: parent class still needs idCollection
@ -257,3 +258,9 @@ CSMWorld::NestedTableWrapperBase* CSMWorld::IdTree::nestedTable(const QModelInde
return mNestedCollection->nestedTable(index.row(), index.column());
}
// HACK: to get the UniversalId::Type associated with a particular record
std::pair<int, CSMWorld::UniversalId::Type> CSMWorld::IdTree::searchId (const std::string& id) const
{
return dynamic_cast<CSMWorld::RefIdCollection*>(idCollection())->getDataSet().searchId(id);
}

2
apps/opencs/model/world/idtree.hpp
View file

@ -73,6 +73,8 @@ namespace CSMWorld
virtual bool hasChildren (const QModelIndex& index) const;
std::pair<int, UniversalId::Type> searchId (const std::string& id) const;
signals:
void resetStart(const QString& id);