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

Notify views of changes in all columns when updating the ColumnId_Modification column

Browse source
This commit is contained in:
Doc West 2018-07-05 18:03:55 +02:00
parent 9bfa01c579
commit e187733811
4 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -294,19 +294,16 @@ void CSMWorld::CreateCommand::undo()
}
CSMWorld::RevertCommand::RevertCommand (IdTable& model, const std::string& id, QUndoCommand* parent)
: QUndoCommand (parent), mModel (model), mId (id), mOld (0), mNew (0)
: QUndoCommand (parent), mModel (model), mId (id), mOld (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()
@ -322,7 +319,6 @@ void CSMWorld::RevertCommand::redo()
}
else
{
mModel.setRecord (mId, *mNew);
mModel.setData (index, static_cast<int> (RecordBase::State_BaseOnly));
}
}

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

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

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

@ -86,12 +86,30 @@ bool CSMWorld::IdTable::setData (const QModelIndex &index, const QVariant &value
mIdCollection->setData (index.row(), index.column(), value);
emit dataChanged(index, index);
// Modifying a value can also change the Modified status of a record unless .
int stateColumn = searchColumnIndex(Columns::ColumnId_Modification);
if (stateColumn != -1 && index.column() != stateColumn)
if (stateColumn != -1)
{
QModelIndex stateIndex = this->index(index.row(), stateColumn);
emit dataChanged(stateIndex, stateIndex);
if (index.column() == stateColumn)
{
// modifying the state column can modify other values. we need to tell
// views that the whole row has changed.
int count = columnCount(index.parent());
for (int i=0; i<count; ++i)
{
if (i != stateColumn) // we already notified about the state column itself
{
QModelIndex columnIndex = this->index(index.row(), i);
emit dataChanged(columnIndex, columnIndex);
}
}
} else
{
// Modifying a value can also change the Modified status of a record unless .
QModelIndex stateIndex = this->index(index.row(), stateColumn);
emit dataChanged(stateIndex, stateIndex);
}
}
return true;

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

@ -24,8 +24,6 @@ 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.
@ -51,8 +49,6 @@ namespace CSMWorld
virtual RecordBase *modifiedCopy() const;
void revert() override;
virtual void assign (const RecordBase& record);
const ESXRecordT& get() const;
@ -100,12 +96,6 @@ 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)
{