Set region done from checkbox, grey out in visualizations if done

MainWindow.cxx

@@ -41,7 +41,8 @@ MainWindow::MainWindow() {
 	regionTable->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
 	regionTableContainer->layout()->addWidget(regionTable);
 
-	connect(regionTable, SIGNAL(removeRegion(int)), this, SLOT(on_removeRegion(int)));
+	QObject::connect(regionTable, &RegionTable::regionDone, this, &MainWindow::on_regionDone);
+	QObject::connect(regionTable, &RegionTable::removeRegion, this, &MainWindow::on_removeRegion);
 
 	qApp->installEventFilter(this);
 }
@@ -200,6 +201,9 @@ void MainWindow::on_actionExit_triggered() {
 	qApp->exit();
 }
 
+void MainWindow::on_regionDone(int label, bool done) {
+	visualizationContainer->SetRegionDone((unsigned short)label, done);
+}
 void MainWindow::on_removeRegion(int label) {
 	visualizationContainer->RemoveRegion((unsigned short)label);
 }

MainWindow.h

@@ -38,6 +38,7 @@ public slots:
 	virtual void on_actionExit_triggered();
 
 	// Region table events
+	virtual void on_regionDone(int label, bool done);
 	virtual void on_removeRegion(int label);
 
 protected:

Region.cxx

@@ -6,6 +6,8 @@
 #include <algorithm>
 
 Region::Region(vtkImageData* inputData, unsigned short regionLabel, double regionColor[3]) {
+	done = false;
+
 	// Input data info
 	data = inputData;
 	unsigned short* scalars = static_cast<unsigned short*>(data->GetScalarPointer());
@@ -120,6 +122,10 @@ void Region::UpdateExtent() {
 	voi->SetVOI(padExtent);
 }
 
+void Region::SetDone(bool isDone) {
+	done = isDone;
+}
+
 unsigned short Region::GetLabel() {
 	return label;
 }
@@ -145,4 +151,8 @@ int Region::GetNumVoxels() {
 
 const int* Region::GetExtent() {
 	return extent;
+}
+
+bool Region::GetDone() {
+	return done;
 }

Region.h

@@ -16,16 +16,19 @@ class Region {
 
 	void SetExtent(int newExtent[6]);
 	void UpdateExtent(int x, int y, int z);
+	void SetDone(bool done);
 
 	unsigned short GetLabel();
 	const double* GetColor();
 	int GetNumVoxels();
 	const int* GetExtent();
+	bool GetDone();
 
 protected:
 	unsigned short label;
 	double color[3];
 	int extent[6];
+	bool done;
 
 	vtkSmartPointer<vtkImageData> data;
 	vtkSmartPointer<vtkExtractVOI> voi;

RegionTable.cxx

@@ -7,6 +7,7 @@
 #include <QStyle>
 #include <QPushButton>
 #include <QSignalMapper>
+#include <QCheckBox>
 
 #include "Region.h"
 
@@ -21,8 +22,6 @@ RegionTable::RegionTable(QWidget* parent)
 	verticalHeader()->setVisible(false);
 
 	setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
-
-	removeMapper = new QSignalMapper(this);
 }
 
 void RegionTable::Update(const std::vector<Region*>& regions) {
@@ -36,9 +35,10 @@ void RegionTable::Update(const std::vector<Region*>& regions) {
 
 	for (int i = 0; i < numRegions; i++) {
 		Region* region = regions[i];
+		int label = (int)region->GetLabel();
 
 		// Id
-		QTableWidgetItem* idItem = new QTableWidgetItem(QString::number(region->GetLabel()));
+		QTableWidgetItem* idItem = new QTableWidgetItem(QString::number(label));
 		idItem->setTextAlignment(Qt::AlignCenter);
 
 		// Color
@@ -52,24 +52,26 @@ void RegionTable::Update(const std::vector<Region*>& regions) {
 		sizeItem->setTextAlignment(Qt::AlignCenter);
 
 		// Checkbox
-		//QCheckbox* checkBox = new QCheckBox();
-		QTableWidgetItem* checkItem = new QTableWidgetItem();
-		checkItem->setCheckState(Qt::Unchecked);
+		QCheckBox* checkBox = new QCheckBox(this);
+		checkBox->setChecked(region->GetDone());
+		checkBox->setStyleSheet("margin-left:10%;margin-right:5%;");
+		QObject::connect(checkBox, &QCheckBox::stateChanged, [this, label](int state) {
+			regionDone(label, state);
+		});
 
 		// Remove button
 		QPushButton* removeButton = new QPushButton(this);
 		removeButton->setIcon(removeIcon);
-		connect(removeButton, SIGNAL(clicked()), removeMapper, SLOT(map()));
-		removeMapper->setMapping(removeButton, (int)region->GetLabel());
+		QObject::connect(removeButton, &QPushButton::clicked, [this, label]() {
+			removeRegion(label);
+		});
 
 		setItem(i, 0, idItem);
 		setItem(i, 1, colorItem);
 		setItem(i, 2, sizeItem);
-		setItem(i, 3, checkItem);
+		setCellWidget(i, 3, checkBox);
 		setCellWidget(i, 4, removeButton);
 	}
 
-	connect(removeMapper, SIGNAL(mapped(int)), this, SIGNAL(removeRegion(int)));
-
 	resizeColumnsToContents();
 }

RegionTable.h

@@ -15,10 +15,8 @@ class RegionTable : public QTableWidget {
 	void Update(const std::vector<Region*>& regions);
 
 signals:
+	void regionDone(int label, bool done);
 	void removeRegion(int label);
-
-protected:
-	QSignalMapper * removeMapper;
 };
 
 #endif

VisualizationContainer.cxx

@@ -583,6 +583,28 @@ void VisualizationContainer::GrowRegion(int x, int y, int z) {
 	Render();
 }
 
+void VisualizationContainer::SetRegionDone(unsigned short label, bool done) {
+	Region* region = GetRegion(label);
+
+	if (!region) return;
+
+	region->SetDone(done);
+
+	if (done) {
+		// Set to grey
+		labelColors->SetTableValue(label, 0.5, 0.5, 0.5);
+		labelColors->Build();
+	}
+	else {
+		// Set to color map
+		UpdateColors(label);
+	}
+
+	volumePipeline->SetSurfaceDone(label, done);
+
+	Render();
+}
+
 void VisualizationContainer::RemoveRegion(unsigned short label) {
 	int index = GetRegionIndex(label);
 
@@ -602,7 +624,7 @@ void VisualizationContainer::RemoveRegion(unsigned short label) {
 	}
 
 	regions.erase(regions.begin() + index);
-	volumePipeline->RemoveSurface(index);
+	volumePipeline->RemoveSurface(label);
 	qtWindow->UpdateRegionTable(regions);
 
 	labels->Modified();
@@ -652,12 +674,20 @@ void VisualizationContainer::UpdateColors(unsigned short label) {
 		{ 177,89,40 }
 	};
 
+	for (int i = 0; i < numColors; i++) {
+		for (int j = 0; j < 3; j++) {
+			colors[i][j] /= 255.0;
+		}
+	}
+
 	if (label >= labelColors->GetNumberOfTableValues()) {
 		labelColors->SetNumberOfTableValues(label + 1);
 		labelColors->SetRange(0, label);
-		double* c = colors[(label - 1) % numColors];
-		labelColors->SetTableValue(label, c[0], c[1], c[2]);
 	}
+
+	double* c = colors[(label - 1) % numColors];
+	labelColors->SetTableValue(label, c[0], c[1], c[2]);
+	labelColors->Build();
 }
 
 void VisualizationContainer::UpdateColors() {
@@ -706,6 +736,12 @@ int VisualizationContainer::GetRegionIndex(unsigned short label) {
 	return -1;
 }
 
+Region* VisualizationContainer::GetRegion(unsigned short label) {
+	int index = GetRegionIndex(label);
+
+	return index == -1 ? nullptr : regions[index];
+}
+
 void VisualizationContainer::RemoveRegions() {
 	for (int i = 0; i < (int)regions.size(); i++) {
 		delete regions[i];

VisualizationContainer.h

@@ -50,6 +50,7 @@ class VisualizationContainer {
 
 	void GrowRegion(int x, int y, int z);
 	void RemoveRegion(unsigned short label);
+	void SetRegionDone(unsigned short label, bool done);
 
 	void Render();
 
@@ -83,6 +84,7 @@ class VisualizationContainer {
 	unsigned short GetNewLabel();
 
 	int GetRegionIndex(unsigned short label);
+	Region* GetRegion(unsigned short label);
 	void RemoveRegions();
 	void ExtractRegions();
 

VolumePipeline.cxx

@@ -128,8 +128,31 @@ void VolumePipeline::AddSurface(Region* region) {
 	surfaces.push_back(surface);
 }
 
-void VolumePipeline::RemoveSurface(int index) {
-	surfaces.erase(surfaces.begin() + index);
+void VolumePipeline::RemoveSurface(unsigned short label) {
+	for (int i = 0; i < (int)surfaces.size(); i++) {
+		if (surfaces[i]->GetRegion()->GetLabel() == label) {
+			surfaces.erase(surfaces.begin() + i);
+			return;
+		}
+	}
+}
+
+void VolumePipeline::SetSurfaceDone(unsigned short label, bool done) {
+	for (int i = 0; i < (int)surfaces.size(); i++) {
+		Region* region = surfaces[i]->GetRegion();
+
+		if (region->GetLabel() == label) {
+			if (region->GetDone()) {
+				surfaces[i]->GetActor()->GetProperty()->SetColor(0.5, 0.5, 0.5);
+			}
+			else {
+				const double* color = region->GetColor();
+				surfaces[i]->GetActor()->GetProperty()->SetColor(color[0], color[1], color[2]);
+			}
+
+			return;
+		}
+	}
 }
 
 void VolumePipeline::SetCurrentLabel(unsigned short label) {

VolumePipeline.h

@@ -29,7 +29,8 @@ class VolumePipeline {
   void SetRegions(vtkImageData* data, std::vector<Region*> regions);
 
   void AddSurface(Region* region);
-  void RemoveSurface(int index);
+  void RemoveSurface(unsigned short label);
+  void SetSurfaceDone(unsigned short label, bool done);
 
   void SetShowProbe(bool visibility);
   void SetProbePosition(double x, double y, double z);