fix autorenumber raster level
This commit is contained in:
parent
2e99a39aad
commit
76b04d3285
2 changed files with 12 additions and 6 deletions
|
@ -66,7 +66,7 @@ namespace {
|
|||
bool myLess(const TFilePath &l, const TFilePath &r) {
|
||||
return l.getFrame() < r.getFrame();
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
//-----------------------------------------------------------
|
||||
|
||||
|
@ -282,8 +282,12 @@ void TLevelWriter::renumberFids(const std::map<TFrameId, TFrameId> &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;
|
||||
|
|
|
@ -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());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue