lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add an abort button for interrupting python scripts during execution

Browse Source
This commit is contained in:
baldurk
2016-04-03 14:14:17 +02:00
parent 840338140d
commit 96aa458dd1
2 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Windows/Dialogs/PythonShell.Designer.cs
Generated
+13 -1
View File
@@ -52,6 +52,7 @@
this.openDialog = new System.Windows.Forms.OpenFileDialog();
this.newScript = new System.Windows.Forms.ToolStripButton();
this.linenumTimer = new System.Windows.Forms.Timer(this.components);
this.abortButton = new System.Windows.Forms.ToolStripButton();
toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
toolStrip1 = new System.Windows.Forms.ToolStrip();
toolStripContainer1.ContentPanel.SuspendLayout();
@@ -133,7 +134,8 @@
this.openButton,
this.saveAs,
this.toolStripSeparator2,
this.runButton});
this.runButton,
this.abortButton});
this.toolStrip2.Location = new System.Drawing.Point(0, 0);
this.toolStrip2.Name = "toolStrip2";
this.toolStrip2.Size = new System.Drawing.Size(306, 25);
@@ -308,6 +310,15 @@
this.linenumTimer.Interval = 500;
this.linenumTimer.Tick += new System.EventHandler(this.linenumTimer_Tick);
//
// abortButton
//
this.abortButton.Image = global::renderdocui.Properties.Resources.delete;
this.abortButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.abortButton.Name = "abortButton";
this.abortButton.Size = new System.Drawing.Size(54, 22);
this.abortButton.Text = "Abort";
this.abortButton.Click += new System.EventHandler(this.abortButton_Click);
//
// PythonShell
//
this.AllowDrop = true;
@@ -364,6 +375,7 @@
private System.Windows.Forms.OpenFileDialog openDialog;
private System.Windows.Forms.ToolStripButton newScript;
private System.Windows.Forms.Timer linenumTimer;
private System.Windows.Forms.ToolStripButton abortButton;
}
renderdocui/Windows/Dialogs/PythonShell.cs
+25 -3
View File
@@ -70,6 +70,8 @@ namespace renderdocui.Windows.Dialogs
mode_Changed(shellMode, null);
clearCmd_Click(null, null);
EnableButtons(true);
}
void scriptEditor_KeyDown(object sender, KeyEventArgs e)
@@ -118,6 +120,8 @@ namespace renderdocui.Windows.Dialogs
return scope;
}
private Thread pythonThread = null;
private MemoryStream stdout = null;
private StreamWriter stdoutwriter = null;
private StreamReader stdoutreader = null;
@@ -333,6 +337,13 @@ namespace renderdocui.Windows.Dialogs
shellMode.Enabled = scriptMode.Enabled =
newScript.Enabled = openButton.Enabled = saveAs.Enabled =
runButton.Enabled = enable;
abortButton.Enabled = !enable;
}
private void abortButton_Click(object sender, EventArgs e)
{
if (pythonThread != null)
pythonThread.Abort();
}
private void runButton_Click(object sender, EventArgs e)
@@ -351,18 +362,29 @@ namespace renderdocui.Windows.Dialogs
linenumTimer.Enabled = true;
linenumTimer.Start();
Thread th = Helpers.NewThread(new ThreadStart(() =>
pythonThread = Helpers.NewThread(new ThreadStart(() =>
{
pythonengine.SetTrace(PythonTrace);
string output = "";
// ignore output, the trace handler above will print output
string output = Execute(pythonengine, scriptscope, script);
try
{
output = Execute(pythonengine, scriptscope, script);
}
catch (ThreadAbortException)
{
// python was interrupted
Thread.ResetAbort();
}
linenumTimer.Stop();
pythonengine.SetTrace(null);
this.BeginInvoke(new Action(() =>
{
pythonThread = null;
scriptOutput.Text += output;
SetLineNumber(linenum);
@@ -371,7 +393,7 @@ namespace renderdocui.Windows.Dialogs
}));
}));
th.Start();
pythonThread.Start();
}
private string ValidData(IDataObject d)