From 76b04d32851682bc7539c2571a7c0d876c5673d8 Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Tue, 24 Aug 2021 14:45:24 +0900 Subject: [PATCH] fix autorenumber raster level --- toonz/sources/common/timage_io/tlevel_io.cpp | 12 ++++++++---- toonz/sources/toonz/cellselection.cpp | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/toonz/sources/common/timage_io/tlevel_io.cpp b/toonz/sources/common/timage_io/tlevel_io.cpp index 31008321..0a628260 100644 --- a/toonz/sources/common/timage_io/tlevel_io.cpp +++ b/toonz/sources/common/timage_io/tlevel_io.cpp @@ -66,7 +66,7 @@ namespace { bool myLess(const TFilePath &l, const TFilePath &r) { return l.getFrame() < r.getFrame(); } -} +} // namespace //----------------------------------------------------------- @@ -184,7 +184,7 @@ TLevelWriter::TLevelWriter(const TFilePath &path, TPropertyGroup *prop) , m_path(path) , m_properties(prop) , m_contentHistory(0) { - string ext = path.getType(); + string ext = path.getType(); if (!prop) m_properties = Tiio::makeWriterProperties(ext); } @@ -282,8 +282,12 @@ void TLevelWriter::renumberFids(const std::map &table) { QString::fromStdWString(m_path.getParentDir().getWideString())); parentDir.setFilter(QDir::Files); - QStringList nameFilters(QString::fromStdWString(m_path.getWideName()) + - ".*." + QString::fromStdString(m_path.getType())); + QStringList nameFilters; + // 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); TFilePathSet fpset; diff --git a/toonz/sources/toonz/cellselection.cpp b/toonz/sources/toonz/cellselection.cpp index c78cdee2..018672f0 100644 --- a/toonz/sources/toonz/cellselection.cpp +++ b/toonz/sources/toonz/cellselection.cpp @@ -2996,7 +2996,8 @@ static void dRenumberCells(int col, int r0, int r1) { TXshSimpleLevel *sl = cell.getSimpleLevel(); 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_frameId = newFid; @@ -3016,7 +3017,8 @@ static void dRenumberCells(int col, int r0, int r1) { it->first.getSimpleLevel()->isFid(it->second.getFrameId())) { TFrameId &fid = it->second.m_frameId; fid = TFrameId(fid.getNumber(), - fid.getLetter() ? fid.getLetter() + 1 : 'a'); + fid.getLetter() ? fid.getLetter() + 1 : 'a', + fid.getZeroPadding(), fid.getStartSeqInd()); } } }