ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed crash on copy rows in TAStudio. Replaced spaces with tabs in previous commits.

This commit is contained in:
kylelyk 2014-08-21 22:53:03 +00:00
parent 1b85a89b66
commit 464cde5efa
4 changed files with 79 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
View File

@ -25,10 +25,10 @@ namespace BizHawk.Client.Common
StateManager.Capture();
}
/// <summary>
/// Truncate all frames including starting frame to end of movie.
/// </summary>
/// <param name="frame">First frame to be truncated.</param>
/// <summary>
/// Truncate all frames including starting frame to end of movie.
/// </summary>
/// <param name="frame">First frame to be truncated.</param>
public override void Truncate(int frame)
{
base.Truncate(frame);
@ -46,7 +46,7 @@ namespace BizHawk.Client.Common
}
//Taseditor deletes markers that are in truncated portion of movie.
Markers.TruncateAt(frame);
Markers.TruncateAt(frame);
}
public override void PokeFrame(int frame, IController source)

36
BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs
View File

@ -72,7 +72,7 @@ namespace BizHawk.Client.Common
}
}
//Add functions as needed
//Add functions as needed
public class TasMovieMarkerList : List<TasMovieMarker>
{
private readonly TasMovie _movie;
@ -129,23 +129,23 @@ namespace BizHawk.Client.Common
this.Sort((m1, m2) => m1.Frame.CompareTo(m2.Frame));
}
/// <summary>
/// Deletes all markers at or below the given start frame.
/// </summary>
/// <param name="startFrame">The first frame for markers to be deleted.</param>
/// <returns>Number of markers deleted.</returns>
public int TruncateAt(int startFrame)
{
int deletedCount = 0;
for (int i = Count - 1; i > -1; i--)
{
if(this[i].Frame >= startFrame){
RemoveAt(i);
deletedCount++;
}
}
return deletedCount;
}
/// <summary>
/// Deletes all markers at or below the given start frame.
/// </summary>
/// <param name="startFrame">The first frame for markers to be deleted.</param>
/// <returns>Number of markers deleted.</returns>
public int TruncateAt(int startFrame)
{
int deletedCount = 0;
for (int i = Count - 1; i > -1; i--)
{
if(this[i].Frame >= startFrame){
RemoveAt(i);
deletedCount++;
}
}
return deletedCount;
}
public TasMovieMarker Previous(int currentFrame)
{

8
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -326,10 +326,10 @@ namespace BizHawk.Client.EmuHawk
SetSplicer();
}
private void TasView_VirtualItemsSelectionRangeChanged(object sender, ListViewVirtualItemsSelectionRangeChangedEventArgs e)
{
SetSplicer();
}
private void TasView_VirtualItemsSelectionRangeChanged(object sender, ListViewVirtualItemsSelectionRangeChangedEventArgs e)
{
SetSplicer();
}
private void TasView_KeyDown(object sender, KeyEventArgs e)
{

103
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -583,6 +583,7 @@ namespace BizHawk.Client.EmuHawk
var input = _currentTasMovie.GetInputState(list[i]);
_tasClipboard.Add(new TasClipboardEntry(list[i], input));
var lg = _currentTasMovie.LogGeneratorInstance();
lg.SetSource(input);
sb.AppendLine(lg.GenerateLogEntry());
}
@ -904,62 +905,62 @@ namespace BizHawk.Client.EmuHawk
base.OnShown(e);
}
private void Tastudio_Load(object sender, EventArgs e)
{
// Start Scenario 1: A regular movie is active
if (Global.MovieSession.Movie.IsActive && !(Global.MovieSession.Movie is TasMovie))
{
var result = MessageBox.Show("In order to use Tastudio, a new project must be created from the current movie\nThe current movie will be saved and closed, and a new project file will be created\nProceed?", "Convert movie", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
if (result == DialogResult.OK)
{
ConvertCurrentMovieToTasproj();
}
else
{
Close();
return;
}
}
private void Tastudio_Load(object sender, EventArgs e)
{
// Start Scenario 1: A regular movie is active
if (Global.MovieSession.Movie.IsActive && !(Global.MovieSession.Movie is TasMovie))
{
var result = MessageBox.Show("In order to use Tastudio, a new project must be created from the current movie\nThe current movie will be saved and closed, and a new project file will be created\nProceed?", "Convert movie", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
if (result == DialogResult.OK)
{
ConvertCurrentMovieToTasproj();
}
else
{
Close();
return;
}
}
// Start Scenario 2: A tasproj is already active
else if (Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie is TasMovie)
{
// Nothing to do
}
// Start Scenario 2: A tasproj is already active
else if (Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie is TasMovie)
{
// Nothing to do
}
// Start Scenario 3: No movie, but user wants to autload their last project
else if (Global.Config.AutoloadTAStudioProject && !string.IsNullOrEmpty(Global.Config.RecentTas.MostRecent))
{
LoadProject(Global.Config.RecentTas.MostRecent);
}
// Start Scenario 3: No movie, but user wants to autload their last project
else if (Global.Config.AutoloadTAStudioProject && !string.IsNullOrEmpty(Global.Config.RecentTas.MostRecent))
{
LoadProject(Global.Config.RecentTas.MostRecent);
}
// Start Scenario 4: No movie, default behavior of engaging tastudio with a new default project
else
{
NewTasMovie();
GlobalWin.MainForm.StartNewMovie(_currentTasMovie, record: true);
_currentTasMovie.CaptureCurrentState();
}
// Start Scenario 4: No movie, default behavior of engaging tastudio with a new default project
else
{
NewTasMovie();
GlobalWin.MainForm.StartNewMovie(_currentTasMovie, record: true);
_currentTasMovie.CaptureCurrentState();
}
EngageTastudio();
SetUpColumns();
LoadConfigSettings();
RefreshDialog();
}
EngageTastudio();
SetUpColumns();
LoadConfigSettings();
RefreshDialog();
}
private void Tastudio_Closing(object sender, FormClosingEventArgs e)
{
if (AskSaveChanges())
{
SaveConfigSettings();
GlobalWin.MainForm.StopMovie(saveChanges: false);
DisengageTastudio();
}
else
{
e.Cancel = true;
}
}
private void Tastudio_Closing(object sender, FormClosingEventArgs e)
{
if (AskSaveChanges())
{
SaveConfigSettings();
GlobalWin.MainForm.StopMovie(saveChanges: false);
DisengageTastudio();
}
else
{
e.Cancel = true;
}
}
#endregion