improved queue labels for rti processes.

Author: ponchio

relightlab/queueitem.cpp

@@ -32,42 +32,39 @@ QueueItem::QueueItem(Task *_task, QListWidget *parent): QListWidgetItem(parent)
 
 	QGridLayout *grid = new QGridLayout();
 
-	QLabel *label = new QLabel(task->label);
+	QLabel *label = new QLabel("<b>" + task->label + "<b>");
 	grid->addWidget(label, 0, 0, 1, 2);
 
 	QFont font = label->font();
 	font.setPointSize(10);
 
-	QLabel *input = new QLabel(task->input_folder);
-	input->setFont(font);
-	grid->addWidget(input, 1, 0, 1, 2);
-
 	QLabel *output = new QLabel(task->output);
 	output->setFont(font);
-	grid->addWidget(output, 2, 0, 1, 2);
+	grid->addWidget(output, 1, 0, 1, 2);
+
 
 	status = new QLabel();
 	status->setMinimumWidth(250);
 //	status->hide();
-	grid->addWidget(status, 3, 0, 1, 1);
+	grid->addWidget(status, 2, 0, 1, 1);
 
 	progressbar = new QProgressBar();
 	progressbar->setValue(0);
 //	progressbar->hide();
-	grid->addWidget(progressbar, 3, 1, 1, 1);
+	grid->addWidget(progressbar, 2, 1, 1, 1);
 
 
 	cast = new QPushButton();
 	cast->setIcon(QIcon::fromTheme("cast"));
 	cast->setEnabled(false);
-	grid->addWidget(cast, 0, 2, 4, 1);
+	grid->addWidget(cast, 0, 2, 3, 1);
 
 	connect(cast, SIGNAL(clicked(bool)), this, SLOT(casting()));
 
 	folder = new QPushButton();
 	folder->setIcon(QIcon::fromTheme("folder"));
 	folder->setEnabled(true);
-	grid->addWidget(folder, 0, 3, 4, 1);
+	grid->addWidget(folder, 0, 3, 3, 1);
 
 	connect(folder, SIGNAL(clicked(bool)), this, SLOT(openFolder()));
 

relightlab/rtiframe.cpp

@@ -116,7 +116,7 @@ void RtiFrame::exportRti() {
 		return;
 	}
 	RtiTask *rti_task = new RtiTask(qRelightApp->project());
-	rti_task->parameters = parameters;
+	rti_task->setParameters(parameters);
 	rti_task->output = parameters.path;
 
 	ProcessQueue &queue = ProcessQueue::instance();

relightlab/rtirecents.cpp

@@ -53,24 +53,7 @@ RtiRecents::RtiRecents(QFrame *parent): QFrame(parent) {
 
 	std::vector<RtiParameters> params = recentRtis();
 	for(RtiParameters &p: params) {
-		QString basisLabels[] =  { "PTM", "HSH", "RBF", "BLN", "NEURAL" };
-		QString colorspaceLabels[] =  { "RGB", "LRGB", "YCC", "RGB", "YCC" };
-		QString formatLabels[] = { "", "relight", "deepzoom", "tarzoom", "itarzoom", "tiff" };
 
-		QString basis  = basisLabels[p.basis];
-		QString colorspace = colorspaceLabels[p.colorspace];
-		QString planes = QString::number(p.nplanes);
-		if(p.nchroma) {
-			planes += "." + QString::number(p.nchroma);
-		}
-		QString format;
-		if(p.format == RtiParameters::RTI)
-			format = p.basis == Rti::PTM ? ".ptm" : ".rti";
-		else
-			format = formatLabels[p.format];
-
-		QString txt = QString("<h2>%1 <span style='font-size:80%'>(%2)</span> %3</h2>"
-							  "<p>%4</p>").arg(basis).arg(colorspace).arg(planes).arg(format);
-		content->addWidget(new QLabelButton(txt));
+		content->addWidget(new QLabelButton(p.summary()));
 	}
 }

relightlab/rtitask.cpp

@@ -20,14 +20,43 @@ int convertToRTI(const char *filename, const char *output);
 int convertRTI(const char *file, const char *output, int quality);
 
 void setupLights(ImageSet &imageset, Dome &dome);
+
+QString RtiParameters::summary() {
+	QString basisLabels[] =  { "PTM", "HSH", "RBF", "BLN", "NEURAL" };
+	QString colorspaceLabels[] =  { "RGB", "LRGB", "YCC", "RGB", "YCC" };
+	QString formatLabels[] = { "", "images", "deepzoom", "tarzoom", "itarzoom", "tiff" };
+
+	QString s_basis  = basisLabels[basis];
+	QString s_colorspace = colorspaceLabels[colorspace];
+	QString s_planes = QString::number(nplanes);
+	if(nchroma) {
+		s_planes += "." + QString::number(nchroma);
+	}
+	QString s_format;
+	if(format == RtiParameters::RTI)
+		s_format = basis == Rti::PTM ? ".ptm" : ".rti";
+	else
+		s_format = formatLabels[format];
+
+	QString txt = QString("%1 (%2) %3 %4").arg(s_basis).arg(s_colorspace).arg(s_planes).arg(s_format).arg(path);
+	return txt;
+}
+
 RtiTask::RtiTask(const Project &_project): Task(), project(_project) {}
 
 RtiTask::~RtiTask() {
 	if(builder)
 		delete builder;
 }
 
+void RtiTask::setParameters(RtiParameters &p) {
+	parameters = p;
+	label = parameters.summary();
+}
+
 void RtiTask::run() {
+	label = parameters.summary();
+
 	status = RUNNING;	
 	std::function<bool(QString s, int d)> callback = [this](QString s, int n)->bool { return this->progressed(s, n); };
 

relightlab/rtitask.h

@@ -29,6 +29,8 @@ class RtiParameters {
 
 	int quality = 95;
 	QString path;
+
+	QString summary();
 };
 
 class RtiTask: public Task {
@@ -41,6 +43,7 @@ class RtiTask: public Task {
 	RtiTask(const Project &_project);
 	virtual ~RtiTask();
 	virtual void run() override;
+	void setParameters(RtiParameters &p);
 
 public slots: