Fix old project migration bugs #17983
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oktophonie
changed the title
oktophonie
previously approved these changes
Jun 14, 2023
oktophonie
approved these changes
Jun 15, 2023
oktophonie
requested review from
RomanPudashkin
and removed request for
RomanPudashkin
| @@ -142,6 +142,7 @@ Ret ProjectMigrator::migrateProject(engraving::EngravingProjectPtr project, cons | |||
| return make_ret(Ret::Code::InternalError); | |||
| } | |||
|
|
|||
| score->lockUpdates(false); | |||
There was a problem hiding this comment.
We need to make sure that this change won't cause performance issues when opening old scores (because before we called score->update() a lot of times and this caused a big slowdown)
There was a problem hiding this comment.
Performance should be unaffected, because I've added an update() call here, but I've also removed an update() call from Read206::readScore(), where it was unnecessary. I've run the profiler, and performance looks the same, with a total of 2 update() calls in both cases.
There was a problem hiding this comment.
Can you move this line to NotationProject::doLoad? It's very confusing to see it here
mike-spa
force-pushed
the
fixOldProjextMigrationBugs
branch
from
c4bd590
to
f5f13fb
Compare
mike-spa
force-pushed
the
fixOldProjextMigrationBugs
branch
from
f5f13fb
to
a923722
Compare
RomanPudashkin
approved these changes
Jun 26, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves: #17982
The bug happens because the position of some items (in this case hairpins) is reset when migrating from version 2.x, but we don't call a new layout after that, so the items aren't rendered properly until a relayout happens.
ProjectMigrator::migrateProjectshould be responsible for calling this layout. In fact, I think it was designed to do so as it callsscore->endCmd(), but was being blocked by_updatesLocked.In turn, there was a pointless layout call being made at the end of
Read206, which I've removed.