lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-27 08:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change python scripting 'debug' button to just attach, not run

Browse Source
This commit is contained in:
baldurk
2026-08-13 21:05:14 +01:00
parent 810e6a79d2
commit 022a5e1438
10 changed files with 107 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+4 -29
View File
@@ -1511,7 +1511,7 @@ QString PythonContext::GetTempFilename(QString filename)
return QString();
}
void PythonContext::executeString(const QString &filename, const QString &source, bool debugging)
void PythonContext::executeString(const QString &filename, const QString &source)
{
if(!initialised())
{
@@ -1527,24 +1527,6 @@ void PythonContext::executeString(const QString &filename, const QString &source
{
tempFilename = lit("<interactive.py>");
}
else if(!QFile::exists(filename))
{
for(QString path : QStandardPaths::standardLocations(QStandardPaths::AppDataLocation))
{
QDir tmpDir(path);
tmpDir.mkpath(lit("pytmp"));
tmpDir.cd(lit("pytmp"));
if(tmpDir.exists())
{
tempFilename = tmpDir.absoluteFilePath(filename);
QFile f(tempFilename);
f.open(QFile::Truncate | QFile::WriteOnly);
f.write(source.toUtf8().data());
f.close();
break;
}
}
}
location.file = tempFilename;
location.line = 1;
@@ -1557,20 +1539,13 @@ void PythonContext::executeString(const QString &filename, const QString &source
bool debugAttached = false;
if(debugging)
debugAttached = PythonContext::WaitForDebugger();
bool caughtException = false;
QString typeStr;
QString valueStr;
int finalLine = -1;
QList<QString> frames;
if(debugging && !debugAttached)
{
// don't do anything, we wanted to debug and the attaching was cancelled - don't execute
}
else if(compiled)
if(compiled)
{
PrepareDebugTracing();
@@ -1642,7 +1617,7 @@ void PythonContext::executeString(const QString &filename, const QString &source
void PythonContext::executeString(const QString &source)
{
executeString(QString(), source, false);
executeString(QString(), source);
}
void PythonContext::executeFile(const QString &filename)
@@ -1661,7 +1636,7 @@ void PythonContext::executeFile(const QString &filename)
{
QByteArray py = f.readAll();
executeString(filename, QString::fromUtf8(py), false);
executeString(filename, QString::fromUtf8(py));
}
else
{
qrenderdoc/Code/pyrenderdoc/PythonContext.h
+1 -1
View File
@@ -145,7 +145,7 @@ signals:
public slots:
void executeString(const QString &source);
void executeString(const QString &filename, const QString &source, bool debugging);
void executeString(const QString &filename, const QString &source);
void executeFile(const QString &filename);
void setGlobal(const char *varName, const char *typeName, void *object);
qrenderdoc/Code/pyrenderdoc/PythonInvokers.cpp
+4 -1
View File
@@ -1263,7 +1263,10 @@ struct IPythonShellInvoker : UIThreadInvoker<IPythonShell>
}
rdcstr GetScriptText() { return InvokeRetFunction<rdcstr>(&IPythonShell::GetScriptText); }
void RunScript() { return InvokeVoidFunction(&IPythonShell::RunScript); }
void DebugScript() { return InvokeVoidFunction(&IPythonShell::DebugScript); }
void AttachDebugger(const rdcstr &extensionName)
{
return InvokeVoidFunction(&IPythonShell::AttachDebugger, extensionName);
}
void SetExtensionOutputFilter(const rdcstr &extensionName)
{
return InvokeVoidFunction(&IPythonShell::SetExtensionOutputFilter, extensionName);