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

Normalise terminology in UI code - don't call captures 'logs'

Browse Source 
* Log is an overloaded term since it can also mean the debug log. We now
  consistently refer to capture files as capture files or just captures
  for short. The log is just for log messages and diagnostics.
* The user-facing UI was mostly already consistent, but many of the
  public interfaces exposed to python needed to be renamed, and it made
  more sense just to make everything consistent.
This commit is contained in:
baldurk
2017-11-16 14:21:42 +00:00
parent e399365ba2
commit 33ff48811b
52 changed files with 810 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/ReplayManager.cpp
+11 -11
View File
@@ -39,14 +39,14 @@ ReplayManager::~ReplayManager()
{
}
void ReplayManager::OpenCapture(const QString &logfile, float *progress)
void ReplayManager::OpenCapture(const QString &capturefile, float *progress)
{
if(m_Running)
return;
m_ProxyRenderer = -1;
m_ReplayHost = QString();
m_Logfile = logfile;
m_CaptureFilename = capturefile;
m_Progress = progress;
*progress = 0.0f;
@@ -59,17 +59,17 @@ void ReplayManager::OpenCapture(const QString &logfile, float *progress)
}
}
void ReplayManager::DeleteCapture(const QString &logfile, bool local)
void ReplayManager::DeleteCapture(const QString &capture, bool local)
{
if(IsRunning())
{
AsyncInvoke([this, logfile, local](IReplayController *) { DeleteCapture(logfile, local); });
AsyncInvoke([this, capture, local](IReplayController *) { DeleteCapture(capture, local); });
return;
}
if(local)
{
QFile::remove(logfile);
QFile::remove(capture);
}
else
{
@@ -78,7 +78,7 @@ void ReplayManager::DeleteCapture(const QString &logfile, bool local)
if(m_Remote)
{
QMutexLocker autolock(&m_RemoteLock);
m_Remote->TakeOwnershipCapture(logfile.toUtf8().data());
m_Remote->TakeOwnershipCapture(capture.toUtf8().data());
}
}
}
@@ -358,7 +358,7 @@ void ReplayManager::PingRemote()
uint32_t ReplayManager::ExecuteAndInject(const QString &exe, const QString &workingDir,
const QString &cmdLine,
const QList<EnvironmentModification> &env,
const QString &logfile, CaptureOptions opts)
const QString &capturefile, CaptureOptions opts)
{
rdcarray<EnvironmentModification> envList = env.toVector().toStdVector();
@@ -373,7 +373,7 @@ uint32_t ReplayManager::ExecuteAndInject(const QString &exe, const QString &work
else
{
ret = RENDERDOC_ExecuteAndInject(exe.toUtf8().data(), workingDir.toUtf8().data(),
cmdLine.toUtf8().data(), envList, logfile.toUtf8().data(),
cmdLine.toUtf8().data(), envList, capturefile.toUtf8().data(),
opts, false);
}
@@ -403,13 +403,13 @@ void ReplayManager::run()
if(m_Remote)
{
std::tie(m_CreateStatus, m_Renderer) =
m_Remote->OpenCapture(~0U, m_Logfile.toUtf8().data(), m_Progress);
m_Remote->OpenCapture(~0U, m_CaptureFilename.toUtf8().data(), m_Progress);
}
else
{
m_CaptureFile = RENDERDOC_OpenCaptureFile();
m_CreateStatus = m_CaptureFile->OpenFile(m_Logfile.toUtf8().data(), "rdc");
m_CreateStatus = m_CaptureFile->OpenFile(m_CaptureFilename.toUtf8().data(), "rdc");
if(m_CreateStatus == ReplayStatus::Succeeded)
std::tie(m_CreateStatus, m_Renderer) = m_CaptureFile->OpenCapture(m_Progress);
@@ -418,7 +418,7 @@ void ReplayManager::run()
if(m_Renderer == NULL)
return;
qInfo() << "QRenderDoc - renderer created for" << m_Logfile;
qInfo() << "QRenderDoc - renderer created for" << m_CaptureFilename;
m_Running = true;