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

fix autorenumber raster level

Browse source
This commit is contained in:
shun-iwasawa 2021-08-24 14:45:24 +09:00 committed by manongjohn
parent 2e99a39aad
commit 76b04d3285
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
toonz/sources/common/timage_io/tlevel_io.cpp
View file

@ -66,7 +66,7 @@ namespace {
bool myLess(const TFilePath &l, const TFilePath &r) { bool myLess(const TFilePath &l, const TFilePath &r) {
return l.getFrame() < r.getFrame(); return l.getFrame() < r.getFrame();
} }
} } // namespace
//----------------------------------------------------------- //-----------------------------------------------------------
@ -184,7 +184,7 @@ TLevelWriter::TLevelWriter(const TFilePath &path, TPropertyGroup *prop)
, m_path(path) , m_path(path)
, m_properties(prop) , m_properties(prop)
, m_contentHistory(0) { , m_contentHistory(0) {
string ext = path.getType(); string ext = path.getType();
if (!prop) m_properties = Tiio::makeWriterProperties(ext); if (!prop) m_properties = Tiio::makeWriterProperties(ext);
} }
@ -282,8 +282,12 @@ void TLevelWriter::renumberFids(const std::map<TFrameId, TFrameId> &table) {
QString::fromStdWString(m_path.getParentDir().getWideString())); QString::fromStdWString(m_path.getParentDir().getWideString()));
parentDir.setFilter(QDir::Files); parentDir.setFilter(QDir::Files);
QStringList nameFilters(QString::fromStdWString(m_path.getWideName()) + QStringList nameFilters;
".*." + QString::fromStdString(m_path.getType())); // check for both period and underscore
nameFilters << QString::fromStdWString(m_path.getWideName()) + ".*." +
QString::fromStdString(m_path.getType())
<< QString::fromStdWString(m_path.getWideName()) + "_*." +
QString::fromStdString(m_path.getType());
parentDir.setNameFilters(nameFilters); parentDir.setNameFilters(nameFilters);
TFilePathSet fpset; TFilePathSet fpset;

6
toonz/sources/toonz/cellselection.cpp
View file

@ -2996,7 +2996,8 @@ static void dRenumberCells(int col, int r0, int r1) {
TXshSimpleLevel *sl = cell.getSimpleLevel(); TXshSimpleLevel *sl = cell.getSimpleLevel();
TFrameId oldFid = cell.getFrameId(); TFrameId oldFid = cell.getFrameId();
TFrameId newFid = TFrameId(r + 1); TFrameId newFid =
TFrameId(r + 1, 0, oldFid.getZeroPadding(), oldFid.getStartSeqInd());
toCell.m_level = sl; toCell.m_level = sl;
toCell.m_frameId = newFid; toCell.m_frameId = newFid;
@ -3016,7 +3017,8 @@ static void dRenumberCells(int col, int r0, int r1) {
it->first.getSimpleLevel()->isFid(it->second.getFrameId())) { it->first.getSimpleLevel()->isFid(it->second.getFrameId())) {
TFrameId &fid = it->second.m_frameId; TFrameId &fid = it->second.m_frameId;
fid = TFrameId(fid.getNumber(), fid = TFrameId(fid.getNumber(),
fid.getLetter() ? fid.getLetter() + 1 : 'a'); fid.getLetter() ? fid.getLetter() + 1 : 'a',
fid.getZeroPadding(), fid.getStartSeqInd());
} }
} }
} }