hsh and ptm enforces specific number of images.

Author: ponchio

relightlab/rtiframe.cpp

@@ -124,7 +124,34 @@ void RtiFrame::exportRti() {
 
 	emit processStarted();
 }
+void RtiFrame::updateNPlanes() {
+	// PLANES
+
+	auto &nplanes = parameters.nplanes;
+	auto &nchroma = parameters.nchroma;
 
+	switch(parameters.basis) {
+	case Rti::PTM:
+		nplanes = parameters.colorspace == Rti::RGB? 18: 9;
+		nchroma = 0;
+		planes_row->forceNPlanes(nplanes);
+		break;
+	case Rti::HSH:
+		nplanes = parameters.colorspace == Rti::RGB? 27 : 12;
+		nchroma = 0;
+		planes_row->forceNPlanes(nplanes);
+		break;
+	case Rti::RBF:
+	case Rti::BILINEAR:
+		if(parameters.colorspace != Rti::YCC) nchroma = 0;
+		planes_row->forceNPlanes(-1);
+	default:
+		break;
+	}
+
+	planes_row->setNPlanes(nplanes);
+	planes_row->setNChroma(nchroma);
+}
 
 void RtiFrame::basisChanged() {
 	//when basis is changed we try to change the other values as little as possible.
@@ -146,23 +173,7 @@ void RtiFrame::basisChanged() {
 	}
 	colorspace_row->setColorspace(colorspace);
 
-	// PLANES
-
-	auto &nplanes = parameters.nplanes;
-	auto &nchroma = parameters.nchroma;
-
-	switch(basis) {
-	case Rti::PTM: nplanes = 18; nchroma = 0; break;
-	case Rti::HSH: if(nplanes != 12 && nplanes != 27) nplanes = 27; nchroma = 0; break;
-	case Rti::RBF:
-	case Rti::BILINEAR:
-		if(colorspace != Rti::YCC) nchroma = 0;
-	default:
-		break;
-	}
-
-	planes_row->setNPlanes(nplanes);
-	planes_row->setNChroma(nchroma);
+	updateNPlanes();
 
 	//FORMAT
 	format_row->allowLegacy(!pca);
@@ -174,7 +185,8 @@ void RtiFrame::basisChanged() {
 }
 
 void RtiFrame::colorspaceChanged() {
-	planes_row->setNChroma(parameters.nchroma);
+
+	updateNPlanes();
 
 	bool pca = parameters.basis == Rti::RBF || parameters.basis == Rti::BILINEAR;
 	if(pca && parameters.format == RtiParameters::RTI) {

relightlab/rtiframe.h

@@ -50,6 +50,8 @@ public slots:
 	RtiQualityRow *quality_row = nullptr;
 	RtiWebLayoutRow *layout_row = nullptr;
 	RtiExportRow *export_row = nullptr;
+
+	void updateNPlanes();
 };
 
 

relightlab/rtiplan.cpp

@@ -11,10 +11,13 @@
 #include <QLineEdit>
 #include <QButtonGroup>
 #include <QComboBox>
+#include <QStandardItemModel>
 #include <QLineEdit>
 #include <QFileDialog>
 #include <QMessageBox>
 
+#include <iostream>
+using namespace std;
 RtiPlanRow::RtiPlanRow(RtiParameters &param, QFrame *parent): QFrame(parent), parameters(param) {
 	QHBoxLayout *layout = new QHBoxLayout(this);
 
@@ -147,9 +150,11 @@ RtiPlanesRow::RtiPlanesRow(RtiParameters &parameters, QFrame *parent): RtiPlanRo
 	nplanesbox = new QComboBox;
 	nplanesbox->setFixedWidth(100);
 	for(int i = 0; i < 7; i++) {
-		nplanesbox->addItem(QString::number(nimages[i]));
+		nplanesbox->addItem(QString::number(nimages[i]), QVariant(nimages[i]));
 	}
-	connect(nplanesbox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [this](int n) { setNPlanes(nimages[n]*3, true); });
+	connect(nplanesbox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [this](int n) {
+		setNPlanes(nimages[n]*3, true);
+	});
 	buttons->addWidget(nplanesbox);
 
 	buttons->addStretch(1);
@@ -167,6 +172,17 @@ RtiPlanesRow::RtiPlanesRow(RtiParameters &parameters, QFrame *parent): RtiPlanRo
 	setNChroma(parameters.nchroma);
 }
 
+void RtiPlanesRow::forceNPlanes(int nplanes) {
+	QStandardItemModel *model =	  qobject_cast<QStandardItemModel *>(nplanesbox->model());
+	Q_ASSERT(model != nullptr);
+	for(int i = 0; i < 7; i++) {
+		QStandardItem *item = model->item(i);
+		bool disabled = nplanes >= 0 && nplanes != nimages[i]*3;
+		item->setFlags(disabled ? item->flags() & ~Qt::ItemIsEnabled
+								: item->flags() | Qt::ItemIsEnabled);
+	}
+}
+
 void RtiPlanesRow::setNPlanes(int nplanes, bool emitting) {
 	nchromabox->setEnabled(parameters.colorspace == Rti::YCC);
 
@@ -175,8 +191,8 @@ void RtiPlanesRow::setNPlanes(int nplanes, bool emitting) {
 		emit nplanesChanged();
 		return;
 	}
-	for(int i = 0; i < 7; i++) {
-		if(nimages[i] == nplanes/3)
+	for(int i = 0; i < nplanesbox->count(); i++) {
+		if(nplanes/3 == nplanesbox->itemData(i).toInt())
 			nplanesbox->setCurrentIndex(i);
 	}
 }
@@ -399,7 +415,7 @@ void RtiExportRow::suggestPath() {
 
 		switch(parameters.basis) {
 		case Rti::PTM: filename = parameters.colorspace == Rti::RGB ? "ptm" : "lptm"; break;
-		case Rti::HSH: filename = "hsh"; break;
+		case Rti::HSH: filename = parameters.colorspace == Rti::RGB ? "hsh" : "lhsh"; break;
 		case Rti::RBF: filename = "rbf" + QString::number(parameters.nplanes); break;
 		case Rti::BILINEAR: filename = "bln" + QString::number(parameters.nplanes); break;
 		default: filename = "rti"; break;

relightlab/rtiplan.h

@@ -58,7 +58,7 @@ class RtiPlanesRow: public RtiPlanRow {
 	RtiPlanesRow(RtiParameters &parameters, QFrame *parent = nullptr);
 	void setNPlanes(int nplanes, bool emitting = false);
 	void setNChroma(int nchroma, bool emitting = false);
-
+	void forceNPlanes(int nplanes);
 private:
 	QComboBox *nplanesbox, *nchromabox;
 	int nimages[7] = { 3, 4, 5, 6, 7, 8, 9 };