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 the option to save all selected captures at once

Browse Source 
* The filename selected is used as a base, then -frameXYZ is appended to each
  capture.
This commit is contained in:
baldurk
2019-02-11 12:33:14 +00:00
parent d438adb701
commit 02abe02fe8
4 changed files with 74 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/Dialogs/LiveCapture.cpp
+51 -42
View File
@@ -234,7 +234,8 @@ void LiveCapture::on_captures_mouseClicked(QMouseEvent *e)
else
{
contextOpenMenu.setEnabled(false);
contextSaveAction.setEnabled(false);
contextSaveAction.setText(tr("&Save All"));
contextDeleteAction.setText(tr("&Delete All"));
}
QObject::connect(&thisAction, &QAction::triggered, this, &LiveCapture::openCapture_triggered);
@@ -342,7 +343,25 @@ void LiveCapture::openNewWindow_triggered()
void LiveCapture::saveCapture_triggered()
{
if(ui->captures->selectedItems().size() == 1)
saveCapture(GetCapture(ui->captures->selectedItems()[0]));
{
saveCapture(GetCapture(ui->captures->selectedItems()[0]), QString());
}
else
{
QString path = m_Main->GetSavePath(tr("Save All Captures As"));
if(!path.isEmpty())
{
if(path.endsWith(lit(".rdc")))
path.chop(4);
for(QListWidgetItem *item : ui->captures->selectedItems())
{
Capture *cap = GetCapture(item);
saveCapture(cap, QFormatStr("%1-frame%2.rdc").arg(path).arg(cap->frameNumber));
}
}
}
}
void LiveCapture::deleteCapture_triggered()
@@ -628,7 +647,8 @@ QString LiveCapture::MakeText(Capture *cap)
text += tr(" (Remote)");
text += lit("\n") + cap->api;
text += lit("\n") + cap->timestamp.toString(lit("yyyy-MM-dd HH:mm:ss"));
text += tr("\nFrame #%1 ").arg(cap->frameNumber) +
cap->timestamp.toString(lit("yyyy-MM-dd HH:mm:ss"));
return text;
}
@@ -663,8 +683,9 @@ bool LiveCapture::checkAllowClose()
if(!suppressRemoteWarning && !notoall)
{
res = RDDialog::question(this, tr("Unsaved capture"),
tr("Save this capture '%1' at %2?")
tr("Save this capture '%1 Frame #%2' at %3?")
.arg(cap->name)
.arg(cap->frameNumber)
.arg(cap->timestamp.toString(lit("HH:mm:ss"))),
msgFlags);
@@ -713,7 +734,7 @@ bool LiveCapture::checkAllowClose()
if(res == QMessageBox::Yes)
{
bool success = saveCapture(cap);
bool success = saveCapture(cap, QString());
if(!success)
{
@@ -746,9 +767,10 @@ void LiveCapture::openCapture(Capture *cap)
m_Main->LoadCapture(cap->path, !cap->saved, cap->local);
}
bool LiveCapture::saveCapture(Capture *cap)
bool LiveCapture::saveCapture(Capture *cap, QString path)
{
QString path = m_Main->GetSavePath();
if(path.isEmpty())
path = m_Main->GetSavePath();
if(QString(m_Ctx.GetCaptureFilename()) == path)
{
@@ -933,8 +955,6 @@ void LiveCapture::on_captures_itemSelectionChanged()
{
int numSelected = ui->captures->selectedItems().size();
deleteAction->setEnabled(numSelected == 1);
saveAction->setEnabled(numSelected == 1);
openButton->setEnabled(numSelected == 1);
if(ui->captures->selectedItems().size() == 1)
@@ -978,27 +998,34 @@ void LiveCapture::captureCopied(uint32_t ID, const QString &localPath)
}
}
void LiveCapture::captureAdded(uint32_t ID, const QString &executable, const QString &api,
const bytebuf &thumbnail, int32_t thumbWidth, int32_t thumbHeight,
QDateTime timestamp, const QString &path, bool local)
void LiveCapture::captureAdded(const NewCaptureData &newCapture)
{
Capture *cap = new Capture();
cap->remoteID = ID;
cap->name = executable;
cap->api = api;
cap->timestamp = timestamp;
cap->thumb =
QImage(thumbnail.data(), thumbWidth, thumbHeight, thumbWidth * 3, QImage::Format_RGB888)
.copy(0, 0, thumbWidth, thumbHeight);
cap->name = QString::fromUtf8(m_Connection->GetTarget());
cap->api = newCapture.api;
if(cap->api.isEmpty())
cap->api = QString::fromUtf8(m_Connection->GetAPI());
cap->timestamp =
QDateTime(QDate(1970, 1, 1), QTime(0, 0, 0)).addSecs(newCapture.timestamp).toLocalTime();
cap->thumb = QImage(newCapture.thumbnail.data(), newCapture.thumbWidth, newCapture.thumbHeight,
newCapture.thumbWidth * 3, QImage::Format_RGB888)
.copy(0, 0, newCapture.thumbWidth, newCapture.thumbHeight);
cap->remoteID = newCapture.captureId;
cap->saved = false;
cap->path = path;
cap->local = local;
cap->path = newCapture.path;
cap->local = newCapture.local;
cap->frameNumber = newCapture.frameNumber;
QListWidgetItem *item = new QListWidgetItem();
item->setFlags(item->flags() | Qt::ItemIsEditable);
item->setText(MakeText(cap));
item->setIcon(QIcon(QPixmap::fromImage(MakeThumb(cap->thumb))));
if(!local)
if(!newCapture.local)
{
QFont f = item->font();
f.setItalic(true);
@@ -1219,26 +1246,8 @@ void LiveCapture::connectionThreadEntry()
if(msg.type == TargetControlMessageType::NewCapture)
{
uint32_t capID = msg.newCapture.captureId;
QDateTime timestamp = QDateTime(QDate(1970, 1, 1), QTime(0, 0, 0));
timestamp = timestamp.addSecs(msg.newCapture.timestamp).toLocalTime();
bytebuf thumb = msg.newCapture.thumbnail;
int32_t thumbWidth = msg.newCapture.thumbWidth;
int32_t thumbHeight = msg.newCapture.thumbHeight;
QString path = msg.newCapture.path;
QString captureAPI = msg.newCapture.api;
bool local = msg.newCapture.local;
GUIInvoke::call(
this, [this, capID, timestamp, thumb, thumbWidth, thumbHeight, path, captureAPI, local]() {
QString target = QString::fromUtf8(m_Connection->GetTarget());
QString api = captureAPI;
if(api.isEmpty())
api = QString::fromUtf8(m_Connection->GetAPI());
captureAdded(capID, target, api, thumb, thumbWidth, thumbHeight, timestamp, path, local);
});
NewCaptureData cap = msg.newCapture;
GUIInvoke::call(this, [this, cap]() { captureAdded(cap); });
}
if(msg.type == TargetControlMessageType::CaptureCopied)
qrenderdoc/Windows/Dialogs/LiveCapture.h
+3 -4
View File
@@ -102,6 +102,7 @@ private:
QString name;
QString api;
QDateTime timestamp;
uint32_t frameNumber;
QImage thumb;
@@ -137,9 +138,7 @@ private:
void connectionThreadEntry();
void captureCopied(uint32_t ID, const QString &localPath);
void captureAdded(uint32_t ID, const QString &executable, const QString &api,
const bytebuf &thumbnail, int32_t thumbWidth, int32_t thumbHeight,
QDateTime timestamp, const QString &path, bool local);
void captureAdded(const NewCaptureData &newCapture);
void connectionClosed();
void selfClose();
@@ -148,7 +147,7 @@ private:
void setTitle(const QString &title);
void openCapture(Capture *cap);
bool saveCapture(Capture *cap);
bool saveCapture(Capture *cap, QString path);
bool checkAllowDelete();
void deleteCaptureUnprompted(QListWidgetItem *item);
renderdoc/api/replay/control_types.h
+2
View File
@@ -452,6 +452,8 @@ struct NewCaptureData
DOCUMENT("An identifier to use to refer to this capture.");
uint32_t captureId = 0;
DOCUMENT("The frame number that this capture came from.");
uint32_t frameNumber = 0;
DOCUMENT("The time the capture was created, as a unix timestamp in UTC.");
uint64_t timestamp = 0;
DOCUMENT("The raw bytes that contain the capture thumbnail, as RGB8 data.");
renderdoc/core/target_control.cpp
+18 -3
View File
@@ -30,7 +30,7 @@
#include "os/os_specific.h"
#include "serialise/serialiser.h"
static const uint32_t TargetControlProtocolVersion = 4;
static const uint32_t TargetControlProtocolVersion = 5;
static bool IsProtocolVersionSupported(const uint32_t protocolVersion)
{
@@ -42,6 +42,10 @@ static bool IsProtocolVersionSupported(const uint32_t protocolVersion)
if(protocolVersion == 3)
return true;
// 4 -> 5 return frame number with new captures
if(protocolVersion == 4)
return true;
if(protocolVersion == TargetControlProtocolVersion)
return true;
@@ -218,6 +222,8 @@ void RenderDoc::TargetControlClientThread(uint32_t version, Network::Socket *cli
SERIALISE_ELEMENT(buf);
if(version >= 3)
SERIALISE_ELEMENT(captures.back().driver);
if(version >= 5)
SERIALISE_ELEMENT(captures.back().frameNumber);
}
}
else if(childprocs.size() != children.size())
@@ -729,6 +735,14 @@ public:
SERIALISE_ELEMENT(thumbnail);
if(m_Version >= 3)
SERIALISE_ELEMENT(driver);
if(m_Version >= 5)
{
SERIALISE_ELEMENT(msg.newCapture.frameNumber);
}
else
{
msg.newCapture.frameNumber = msg.newCapture.captureId + 1;
}
}
if(driver != RDCDriver::Unknown)
@@ -736,8 +750,9 @@ public:
msg.newCapture.local = FileIO::exists(msg.newCapture.path.c_str());
RDCLOG("Got a new capture: %d (time %llu) %d byte thumbnail", msg.newCapture.captureId,
msg.newCapture.timestamp, thumbnail.count());
RDCLOG("Got a new capture: %d (frame %u) (time %llu) %d byte thumbnail",
msg.newCapture.captureId, msg.newCapture.frameNumber, msg.newCapture.timestamp,
thumbnail.count());
int w = 0;
int h = 0;