razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #1598 from manongjohn/filmstrip_renumber_fix

Browse source 
Fix filmstrip renumber issues
This commit is contained in:
Jeremy Bullock 2017-11-28 08:11:13 -06:00 committed by GitHub
commit e4ec175144
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
toonz/sources/toonz/filmstripcommand.cpp
View file

@ -145,7 +145,6 @@ void makeSpaceForFids(TXshSimpleLevel *sl,
if (Preferences::instance()->isSyncLevelRenumberWithXsheetEnabled())
updateXSheet(sl, oldFids, fids);
sl->renumber(fids);
invalidateIcons(sl, touchedFids);
sl->setDirtyFlag(true);
}
}
@ -986,6 +985,7 @@ public:
updateXSheet(m_sl.getPointer(), newFrames, m_oldLevelFrameId);
}
m_sl->renumber(m_oldLevelFrameId);
m_sl->setDirtyFlag(true);
TApp::instance()
->getPaletteController()
->getCurrentLevelPalette()
@ -1198,7 +1198,6 @@ public:
updateXSheet(m_level.getPointer(), newFrames, m_oldFids);
}
m_level->renumber(m_oldFids);
invalidateIcons(m_level.getPointer(), m_oldFids);
m_level->setDirtyFlag(true);
TApp *app = TApp::instance();
@ -1310,7 +1309,7 @@ public:
m_level->renumber(fids);
TSelection *selection = TSelection::getCurrent();
if (selection) selection->selectNone();
invalidateIcons(m_level.getPointer(), fids);
m_level->setDirtyFlag(true);
TApp::instance()->getCurrentLevel()->notifyLevelChange();
}
void undo() const override {
@ -1403,9 +1402,7 @@ void FilmstripCmd::renumber(
updateXSheet(sl, oldFrames, fids);
}
sl->renumber(fids);
sl->setDirtyFlag(true);
TApp::instance()->getCurrentScene()->setDirtyFlag(true);
invalidateIcons(sl, fids);
TApp::instance()->getCurrentLevel()->notifyLevelChange();
/*
@ -1481,7 +1478,6 @@ void FilmstripCmd::renumber(TXshSimpleLevel *sl, std::set<TFrameId> &frames,
assert(frames.size() == newFrames.size());
frames.swap(newFrames);
invalidateIcons(sl, fids);
TApp::instance()->getCurrentLevel()->notifyLevelChange();
}
@ -1751,7 +1747,7 @@ public:
updateXSheet(m_level.getPointer(), newFrames, m_oldFrames);
}
m_level->renumber(m_oldFrames);
invalidateIcons(m_level.getPointer(), m_oldFrames);
m_level->setDirtyFlag(true);
TApp::instance()->getCurrentLevel()->notifyLevelChange();
}
@ -1833,7 +1829,6 @@ void performReverse(const TXshSimpleLevelP &sl,
sl->renumber(fids);
sl->setDirtyFlag(true);
// TApp::instance()->getCurrentScene()->setDirtyFlag(true);
invalidateIcons(sl.getPointer(), frames);
TApp::instance()->getCurrentLevel()->notifyLevelChange();
}
@ -2005,6 +2000,7 @@ void stepFilmstripFrames(const TXshSimpleLevelP &sl,
}
}
invalidateIcons(sl.getPointer(), changedFids);
sl->setDirtyFlag(true);
TApp::instance()->getCurrentLevel()->notifyLevelChange();
}
@ -2043,7 +2039,7 @@ public:
m_level->renumber(m_oldFrames);
TSelection *selection = TSelection::getCurrent();
if (selection) selection->selectNone();
invalidateIcons(m_level.getPointer(), m_oldFrames);
m_level->setDirtyFlag(true);
TApp::instance()->getCurrentLevel()->notifyLevelChange();
}
void redo() const override {
@ -2209,7 +2205,7 @@ public:
updateXSheet(m_level.getPointer(), newFrames, m_oldFrames);
}
m_level->renumber(m_oldFrames);
invalidateIcons(m_level.getPointer(), m_oldFrames);
m_level->setDirtyFlag(true);
TApp::instance()->getCurrentLevel()->notifyLevelChange();
}
void redo() const override {
@ -2556,6 +2552,7 @@ void FilmstripCmd::renumberDrawing(TXshSimpleLevel *sl, const TFrameId &oldFid,
updateXSheet(sl, oldFrames, fids);
}
sl->renumber(fids);
sl->setDirtyFlag(true);
TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
TApp::instance()->getCurrentLevel()->notifyLevelChange();

10
toonz/sources/toonzlib/txshsimplelevel.cpp
View file

@ -1960,21 +1960,25 @@ void TXshSimpleLevel::renumber(const std::vector<TFrameId> &fids) {
}
ImageManager *im = ImageManager::instance();
TImageCache *ic = TImageCache::instance();
std::map<TFrameId, TFrameId>::iterator jt;
{
for (i = 0, jt = table.begin(); jt != table.end(); ++jt, ++i) {
std::string Id = getImageId(jt->first);
ImageLoader::BuildExtData extData(this, jt->first);
TImageP img = im->getImage(Id, ImageManager::none, &extData);
ic->add(getIconId(jt->first), img, false);
im->rebind(Id, "^" + std::to_string(i));
TImageCache::instance()->remap("^icon:" + std::to_string(i),
"icon:" + Id);
ic->remap("^icon:" + std::to_string(i),
getIconId(jt->first));
}
for (i = 0, jt = table.begin(); jt != table.end(); ++jt, ++i) {
std::string Id = getImageId(jt->second);
im->rebind("^" + std::to_string(i), Id);
TImageCache::instance()->remap("icon:" + Id,
ic->remap(getIconId(jt->second),
"^icon:" + std::to_string(i));
im->renumber(Id, jt->second);
}