mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity

Changed the way the revert command works: it now clones the changed record and uses the new RecordBase::revert() method to restore the previous value

Browse source 
Added Flag_Dialogue_Refresh to var type and var value columns so that sub views update properly
This commit is contained in:
Doc West 2018-07-05 00:37:19 +02:00 committed by Alexander Stillich
parent 4222b44dbb
commit 4a6457c346
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -136,7 +136,7 @@ namespace CSMWorld
struct VarTypeColumn : public Column<ESXRecordT>
{
VarTypeColumn (ColumnBase::Display display)
: Column<ESXRecordT> (Columns::ColumnId_ValueType, display)
: Column<ESXRecordT> (Columns::ColumnId_ValueType, display, ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh)
{}
virtual QVariant get (const Record<ESXRecordT>& record) const
@ -161,7 +161,7 @@ namespace CSMWorld
template<typename ESXRecordT>
struct VarValueColumn : public Column<ESXRecordT>
{
VarValueColumn() : Column<ESXRecordT> (Columns::ColumnId_Value, ColumnBase::Display_Var) {}
VarValueColumn() : Column<ESXRecordT> (Columns::ColumnId_Value, ColumnBase::Display_Var, ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh) {}
virtual QVariant get (const Record<ESXRecordT>& record) const
{

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

@ -294,16 +294,19 @@ void CSMWorld::CreateCommand::undo()
}
CSMWorld::RevertCommand::RevertCommand (IdTable& model, const std::string& id, QUndoCommand* parent)
: QUndoCommand (parent), mModel (model), mId (id), mOld (0)
: QUndoCommand (parent), mModel (model), mId (id), mOld (0), mNew (0)
{
setText (("Revert record " + id).c_str());
mNew = model.getRecord(id).clone();
mNew->revert();
mOld = model.getRecord (id).clone();
}
CSMWorld::RevertCommand::~RevertCommand()
{
delete mOld;
delete mNew;
}
void CSMWorld::RevertCommand::redo()
@ -319,20 +322,7 @@ void CSMWorld::RevertCommand::redo()
}
else
{
// notify view that data has changed, previously only the modified column was
// updated in the view unless the user had selected another item or forced a
// repaint with other means
int count = mModel.columnCount (index.parent ());
for (int i=0; i<count; ++i)
{
if (i != index.column())
{
auto colIndex = mModel.index (index.row (), i, index.parent ());
auto data = mModel.data (colIndex);
mModel.setData (colIndex, data);
}
}
mModel.setRecord (mId, *mNew);
mModel.setData (index, static_cast<int> (RecordBase::State_BaseOnly));
}
}

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

@ -201,6 +201,7 @@ namespace CSMWorld
IdTable& mModel;
std::string mId;
RecordBase *mOld;
RecordBase *mNew;
// not implemented
RevertCommand (const RevertCommand&);

12
apps/opencs/model/world/record.hpp
View file

@ -24,6 +24,8 @@ namespace CSMWorld
virtual RecordBase *modifiedCopy() const = 0;
virtual void revert() = 0;
virtual void assign (const RecordBase& record) = 0;
///< Will throw an exception if the types don't match.
@ -49,6 +51,8 @@ namespace CSMWorld
virtual RecordBase *modifiedCopy() const;
void revert() override;
virtual void assign (const RecordBase& record);
const ESXRecordT& get() const;
@ -96,6 +100,12 @@ namespace CSMWorld
return new Record<ESXRecordT> (*this);
}
template<typename ESXRecordT>
void Record<ESXRecordT>::revert()
{
mModified = mBase;
}
template <typename ESXRecordT>
void Record<ESXRecordT>::assign (const RecordBase& record)
{
@ -156,4 +166,4 @@ namespace CSMWorld
}
}
#endif
#endif