mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-03 05:06:41 +00:00
Code Issues Releases Wiki Activity

Partially revert commit dab1a9e7fb

Browse source
This commit is contained in:
cc9cii 2021-08-28 09:49:45 +10:00
parent 66f028c4a1
commit 7264a10c07
2 changed files with 21 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/opencs/model/doc/savingstages.cpp
View file

@ -285,8 +285,7 @@ void CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& r
{ {
refRecord.mRefNum.mIndex = newRefNum++; refRecord.mRefNum.mIndex = newRefNum++;
} }
else if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
!= stream.str() && !interior) != stream.str() && !interior)
{ {
// An empty mOriginalCell is meant to indicate that it is the same as // An empty mOriginalCell is meant to indicate that it is the same as

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

@ -3,9 +3,6 @@
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <QAbstractItemModel>
#include <QAbstractProxyModel>
#include <components/misc/stringops.hpp> #include <components/misc/stringops.hpp>
#include <components/misc/constants.hpp> #include <components/misc/constants.hpp>
@ -142,31 +139,13 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
if (mLocked) if (mLocked)
return; return;
std::unique_ptr<CSMWorld::CloneCommand> clonedData;
std::unique_ptr<CSMWorld::DeleteCommand> deleteData;
std::string newId;
std::unique_ptr<CSMWorld::ModifyCommand> modifyData;
std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell; std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell;
QAbstractItemModel* sourceModel = model; std::unique_ptr<CSMWorld::ModifyCommand> modifyDataRefNum;
if (IdTableProxyModel* proxy = dynamic_cast<IdTableProxyModel*> (model))
sourceModel = proxy->sourceModel();
CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&>(*sourceModel); // for getId()
int stateColumn = table.findColumnIndex(Columns::ColumnId_Modification);
QModelIndex stateIndex = table.getModelIndex(table.getId(index.row()), stateColumn);
RecordBase::State state = static_cast<RecordBase::State> (sourceModel->data(stateIndex).toInt());
int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt(); int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt();
// This is not guaranteed to be the same as \a model, since a proxy could be used. if (columnId==Columns::ColumnId_PositionXPos || columnId==Columns::ColumnId_PositionYPos)
IdTable& model2 = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel(mId));
// DeleteCommand triggers a signal to the whole row from IdTable::setData(), so ignore the second call
if (state != RecordBase::State_Deleted &&
(columnId==Columns::ColumnId_PositionXPos || columnId==Columns::ColumnId_PositionYPos))
{ {
const float oldPosition = model->data (index).toFloat(); const float oldPosition = model->data (index).toFloat();
@ -178,9 +157,12 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
int row = proxy ? proxy->mapToSource (index).row() : index.row(); int row = proxy ? proxy->mapToSource (index).row() : index.row();
// This is not guaranteed to be the same as \a model, since a proxy could be used.
IdTable& model2 = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel (mId));
int cellColumn = model2.searchColumnIndex (Columns::ColumnId_Cell); int cellColumn = model2.searchColumnIndex (Columns::ColumnId_Cell);
if (cellColumn != -1) if (cellColumn!=-1)
{ {
QModelIndex cellIndex = model2.index (row, cellColumn); QModelIndex cellIndex = model2.index (row, cellColumn);
@ -188,46 +170,31 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
if (cellId.find ('#')!=std::string::npos) if (cellId.find ('#')!=std::string::npos)
{ {
RefCollection& collection = mDocument.getData().getReferences(); // Need to recalculate the cell and (if necessary) clear the instance's refNum
newId = collection.getNewId(); modifyCell.reset (new UpdateCellCommand (model2, row));
clonedData.reset(new CloneCommand(table, // Not sure which model this should be applied to
table.getId(row), int refNumColumn = model2.searchColumnIndex (Columns::ColumnId_RefNum);
newId,
CSMWorld::UniversalId::Type_Reference));
deleteData.reset(new DeleteCommand(table, if (refNumColumn!=-1)
table.getId(row), modifyDataRefNum.reset (new ModifyCommand(*model, model->index(row, refNumColumn), 0));
CSMWorld::UniversalId::Type_Reference));
} }
} }
} }
} }
if (!clonedData.get()) std::unique_ptr<CSMWorld::ModifyCommand> modifyData (
{ new CSMWorld::ModifyCommand (*model, index, new_));
// DeleteCommand will trigger executeModify after setting the state to State_Deleted
// from CommandDelegate::setModelDataImp() - ignore
if (state != RecordBase::State_Deleted)
modifyData.reset(new CSMWorld::ModifyCommand(*model, index, new_));
}
if (clonedData.get()) if (modifyCell.get())
{ {
CommandMacro macro (mDocument.getUndoStack()); CommandMacro macro (mDocument.getUndoStack());
macro.push(clonedData.release()); macro.push (modifyData.release());
macro.push(deleteData.release()); macro.push (modifyCell.release());
if (modifyDataRefNum.get())
// cannot do these earlier because newIndex is not available until CloneCommand is executed macro.push (modifyDataRefNum.release());
QModelIndex newIndex = model2.getModelIndex (newId, index.column());
modifyData.reset (new CSMWorld::ModifyCommand (*model, newIndex, new_));
macro.push(modifyData.release());
// once the data is updated update the cell location
modifyCell.reset(new UpdateCellCommand(model2, newIndex.row()));
macro.push(modifyCell.release());
} }
else if (!clonedData.get() && modifyData.get()) else
mDocument.getUndoStack().push (modifyData.release()); mDocument.getUndoStack().push (modifyData.release());
} }