Skip to content

Fix auto part extension (part2) #1886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maiko3tattun wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix auto part extension (part2) #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions OpenUtau.Core/Commands/NoteCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,19 @@ public class AddNoteCommand : NoteCommand {
readonly int OldPartDuration;
public AddNoteCommand(UVoicePart part, UNote note) : base(part, note) {
OldPartDuration = part.Duration;
DocManager.Inst.Project.timeAxis.TickPosToBarBeat(note.End - 1, out int bar, out int beat, out int remainingTicks);
int minDurTick = DocManager.Inst.Project.timeAxis.BarBeatToTickPos(bar + 2, 0) - part.position;
int minDurTick = part.GetMinDurTickForNoteEdit(DocManager.Inst.Project, note.End);
if (part.Duration < minDurTick) {
NewPartDuration = minDurTick;
}
}
public AddNoteCommand(UVoicePart part, List<UNote> notes) : base(part, notes) {
OldPartDuration = part.Duration;
DocManager.Inst.Project.timeAxis.TickPosToBarBeat((Notes.LastOrDefault()?.End ?? 1) - 1, out int bar, out int beat, out int remainingTicks);
int minDurTick = DocManager.Inst.Project.timeAxis.BarBeatToTickPos(bar + 2, 0) - part.position;
if (part.Duration < minDurTick) {
NewPartDuration = minDurTick;
var note = notes.LastOrDefault();
if (note != null) {
int minDurTick = part.GetMinDurTickForNoteEdit(DocManager.Inst.Project, note.End);
if (part.Duration < minDurTick) {
NewPartDuration = minDurTick;
}
}
}
public override string ToString() { return "Add note"; }
Expand Down Expand Up @@ -83,13 +84,28 @@ public override void Unexecute() {

public class MoveNoteCommand : NoteCommand {
readonly int DeltaPos, DeltaNoteNum;
readonly int NewPartDuration;
readonly int OldPartDuration;
public MoveNoteCommand(UVoicePart part, UNote note, int deltaPos, int deltaNoteNum) : base(part, note) {
DeltaPos = deltaPos;
DeltaNoteNum = deltaNoteNum;
OldPartDuration = part.Duration;
int minDurTick = part.GetMinDurTickForNoteEdit(DocManager.Inst.Project, note.End + deltaPos);
if (part.Duration < minDurTick) {
NewPartDuration = minDurTick;
}
}
public MoveNoteCommand(UVoicePart part, List<UNote> notes, int deltaPos, int deltaNoteNum) : base(part, notes) {
DeltaPos = deltaPos;
DeltaNoteNum = deltaNoteNum;
OldPartDuration = part.Duration;
var note = notes.LastOrDefault();
if (note != null) {
int minDurTick = part.GetMinDurTickForNoteEdit(DocManager.Inst.Project, note.End + deltaPos);
if (part.Duration < minDurTick) {
NewPartDuration = minDurTick;
}
}
}
public override string ToString() { return $"Move {Notes.Count()} notes"; }
public override void Execute() {
Expand All @@ -100,6 +116,9 @@ public override void Execute() {
note.tone += DeltaNoteNum;
Part.notes.Add(note);
}
if (NewPartDuration > 0) {
Part.Duration = NewPartDuration;
}
}
}
public override void Unexecute() {
Expand All @@ -110,6 +129,7 @@ public override void Unexecute() {
note.tone -= DeltaNoteNum;
Part.notes.Add(note);
}
Part.Duration = OldPartDuration;
}
}
}
Expand All @@ -121,19 +141,20 @@ public class ResizeNoteCommand : NoteCommand {
public ResizeNoteCommand(UVoicePart part, UNote note, int deltaDur) : base(part, note) {
DeltaDur = deltaDur;
OldPartDuration = part.Duration;
DocManager.Inst.Project.timeAxis.TickPosToBarBeat(note.End + deltaDur - 1, out int bar, out int beat, out int remainingTicks);
int minDurTick = DocManager.Inst.Project.timeAxis.BarBeatToTickPos(bar + 2, 0) - part.position;
int minDurTick = part.GetMinDurTickForNoteEdit(DocManager.Inst.Project, note.End + deltaDur);
if (part.Duration < minDurTick) {
NewPartDuration = minDurTick;
}
}
public ResizeNoteCommand(UVoicePart part, List<UNote> notes, int deltaDur) : base(part, notes) {
DeltaDur = deltaDur;
OldPartDuration = part.Duration;
DocManager.Inst.Project.timeAxis.TickPosToBarBeat((Notes.LastOrDefault()?.End ?? 1) + deltaDur - 1, out int bar, out int beat, out int remainingTicks);
int minDurTick = DocManager.Inst.Project.timeAxis.BarBeatToTickPos(bar + 2, 0) - part.position;
if (part.Duration < minDurTick) {
NewPartDuration = minDurTick;
var note = notes.LastOrDefault();
if (note != null) {
int minDurTick = part.GetMinDurTickForNoteEdit(DocManager.Inst.Project, note.End + deltaDur);
if (part.Duration < minDurTick) {
NewPartDuration = minDurTick;
}
}
}
public override string ToString() { return $"Change {Notes.Count()} notes duration"; }
Expand Down
4 changes: 4 additions & 0 deletions OpenUtau.Core/Ustx/UPart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ public override int GetMinDurTick(UProject project) {
project.timeAxis.TickPosToBarBeat(endTicks, out int bar, out int beat, out int remainingTicks);
return project.timeAxis.BarBeatToTickPos(bar, beat + 1) - position;
}
public int GetMinDurTickForNoteEdit(UProject project, int noteEnd) {
project.timeAxis.TickPosToBarBeat(position + noteEnd - 1, out int bar, out int beat, out int remainingTicks);
return project.timeAxis.BarBeatToTickPos(bar + 2, 0) - position;
}

public override int GetMaxPosiTick(UProject project) {
int maxStartTick = position + (notes.FirstOrDefault()?.position ?? Duration);
Expand Down
2 changes: 1 addition & 1 deletion OpenUtau/ViewModels/TracksViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ private void SetPlayPos(int tick, bool waitingRendering) {

public void OnNext(UCommand cmd, bool isUndo) {
if (cmd is NoteCommand noteCommand) {
if (noteCommand is ResizeNoteCommand || noteCommand is AddNoteCommand) {
if (noteCommand is ResizeNoteCommand || noteCommand is AddNoteCommand || noteCommand is MoveNoteCommand) {
MessageBus.Current.SendMessage(new PartRefreshEvent(noteCommand.Part));
}
MessageBus.Current.SendMessage(new PartRedrawEvent(noteCommand.Part));
Expand Down
Loading