Add filter neighbors

Segmentor.qrc

@@ -7,6 +7,7 @@
     <file>icons/icon_smooth_normals.svg</file>
     <file>icons/icon_plane.svg</file>
     <file>icons/icon_filter_plane.svg</file>
+    <file>icons/icon_filter_neighbors.svg</file>
     <file>icons/icon_filter_region.svg</file>
     <file>icons/icon_dilate.svg</file>
     <file>icons/icon_erode.svg</file>

interaction/InteractionEnums.h

@@ -6,4 +6,11 @@ enum InteractionMode {
 	EditMode
 };
 
+enum FilterMode {
+	FilterNone,
+	FilterPlane,
+	FilterNeighbors,
+	FilterRegion
+};
+
 #endif

qt/MainWindow.cxx

@@ -358,15 +358,6 @@ void MainWindow::on_actionShowPlane(bool checked) {
 	visualizationContainer->GetVolumeView()->SetShowPlane(checked);
 }
 
-void MainWindow::on_actionFilterPlane(bool checked) {
-	visualizationContainer->GetVolumeView()->SetFilterPlane(checked);
-}
-
-void MainWindow::on_actionFilterRegion(bool checked) {
-	visualizationContainer->GetSliceView()->SetFilterRegion(checked);
-	visualizationContainer->GetVolumeView()->SetFilterRegion(checked);
-}
-
 void MainWindow::on_actionDilateRegion(bool) {
 	visualizationContainer->DilateCurrentRegion();
 }
@@ -422,11 +413,13 @@ void MainWindow::SetDefaultDirectory(QString key, QString fileName) {
 }
 
 void MainWindow::CreateToolBar() {
+	// Create tool bar
 	QToolBar* toolBar = new QToolBar();
 	toolBar->setFloatable(true);
 	toolBar->setMovable(true);
 	toolBar->setOrientation(Qt::Vertical);
 
+	// Interaction toggle
 	QActionGroup* interactionModeGroup = new QActionGroup(this);
 	interactionModeGroup->setExclusive(true);
 
@@ -437,6 +430,27 @@ void MainWindow::CreateToolBar() {
 	QAction* actionEdit = new QAction("E", interactionModeGroup);
 	actionEdit->setCheckable(true);
 
+	// Filter mode toggle
+	// XXX: With Qt 5.14, should be able to set exclusion policy to avoid extra logic below
+	//QActionGroup* filterModeGroup = new QActionGroup(this);
+	//interactionModeGroup->setExclusive(false);
+
+	QAction* actionFilterPlane = new QAction(QIcon(":/icons/icon_filter_plane.svg"), "Filter to plane", this);
+	actionFilterPlane->setShortcut(QKeySequence("p"));
+	actionFilterPlane->setCheckable(true);
+	actionFilterPlane->setChecked(visualizationContainer->GetFilterMode() == FilterPlane);
+
+	QAction* actionFilterNeighbors = new QAction(QIcon(":/icons/icon_filter_neighbors.svg"), "Filter neighbors", this);
+	actionFilterNeighbors->setShortcut(QKeySequence("k"));
+	actionFilterNeighbors->setCheckable(true);
+	actionFilterNeighbors->setChecked(visualizationContainer->GetFilterMode() == FilterNeighbors);
+
+	QAction* actionFilterRegion = new QAction(QIcon(":/icons/icon_filter_region.svg"), "Filter region", this);
+	actionFilterRegion->setShortcut(QKeySequence("l"));
+	actionFilterRegion->setCheckable(true);
+	actionFilterRegion->setChecked(visualizationContainer->GetFilterMode() == FilterRegion);
+
+	// Add widgets to tool bar
 	toolBar->addWidget(CreateLabel("Mode"));
 	toolBar->addAction(actionNavigation);
 	toolBar->addAction(actionEdit);
@@ -452,14 +466,15 @@ void MainWindow::CreateToolBar() {
 	toolBar->addAction(CreateActionIcon(":/icons/icon_plane.svg", "Show plane", "o", visualizationContainer->GetVolumeView()->GetShowPlane(), &MainWindow::on_actionShowPlane));
 	toolBar->addSeparator();
 	toolBar->addWidget(CreateLabel("Filter"));
-	toolBar->addAction(CreateActionIcon(":/icons/icon_filter_plane.svg", "Filter to plane", "p", visualizationContainer->GetVolumeView()->GetFilterPlane(), &MainWindow::on_actionFilterPlane));
-	toolBar->addAction(CreateActionIcon(":/icons/icon_filter_region.svg", "Filter region", "l", visualizationContainer->GetVolumeView()->GetFilterRegion(), &MainWindow::on_actionFilterRegion));
+	toolBar->addAction(actionFilterPlane);
+	toolBar->addAction(actionFilterNeighbors);
+	toolBar->addAction(actionFilterRegion);
 	toolBar->addSeparator();
 	toolBar->addWidget(CreateLabel("Edit"));
 	toolBar->addAction(CreateActionIcon(":/icons/icon_dilate.svg", "Dilate region", "z", &MainWindow::on_actionDilateRegion));
 	toolBar->addAction(CreateActionIcon(":/icons/icon_erode.svg", "Erode region", "x",&MainWindow::on_actionErodeRegion));
 
-	// Need extra logic for modes
+	// Need extra logic for interaction mode
 	QObject::connect(actionNavigation, &QAction::triggered, this, &MainWindow::on_actionNavigation);
 	QObject::connect(actionEdit, &QAction::triggered, this, &MainWindow::on_actionEdit);
 	QObject::connect(new QShortcut(QKeySequence(32), this), &QShortcut::activated, [actionNavigation, actionEdit]() {
@@ -473,6 +488,27 @@ void MainWindow::CreateToolBar() {
 		}
 	});
 
+	// Need extra logic for filter mode
+	QObject::connect(actionFilterPlane, &QAction::triggered, [actionFilterPlane, actionFilterNeighbors, actionFilterRegion, this]() {
+		actionFilterNeighbors->setChecked(false);
+		actionFilterRegion->setChecked(false);
+
+		this->visualizationContainer->SetFilterMode(actionFilterPlane->isChecked() ? FilterPlane : FilterNone);
+	});
+	QObject::connect(actionFilterNeighbors, &QAction::triggered, [actionFilterPlane, actionFilterNeighbors, actionFilterRegion, this]() {
+		actionFilterPlane->setChecked(false);
+		actionFilterRegion->setChecked(false);
+
+		this->visualizationContainer->SetFilterMode(actionFilterNeighbors->isChecked() ? FilterNeighbors : FilterNone);
+	});
+	QObject::connect(actionFilterRegion, &QAction::triggered, [actionFilterPlane, actionFilterNeighbors, actionFilterRegion, this]() {
+		//actionFilterRegion->toggle();
+		actionFilterPlane->setChecked(false);
+		actionFilterNeighbors->setChecked(false);
+
+		this->visualizationContainer->SetFilterMode(actionFilterRegion->isChecked() ? FilterRegion : FilterNone);
+	});
+
 	toolBarWidget->layout()->addWidget(toolBar);
 }
 

qt/MainWindow.h

@@ -54,8 +54,6 @@ public slots:
 	virtual void on_actionSmoothNormals(bool checked);
 	virtual void on_actionSmoothSurfaces(bool checked);
 	virtual void on_actionShowPlane(bool checked);
-	virtual void on_actionFilterPlane(bool checked);
-	virtual void on_actionFilterRegion(bool checked);
 	virtual void on_actionDilateRegion(bool checked);
 	virtual void on_actionErodeRegion(bool checked);
 

visualization/SliceView.cxx

@@ -27,6 +27,7 @@
 #include "Region.h"
 #include "RegionOutline.h"
 #include "RegionVoxelOutlines.h"
+#include "RegionSurface.h"
 #include "RegionCollection.h"
 #include "SliceLocation.h"
 
@@ -37,9 +38,9 @@ void SliceView::cameraChange(vtkObject* caller, unsigned long eventId, void* cli
 }
 
 SliceView::SliceView(vtkRenderWindowInteractor* interactor, vtkLookupTable* lut) {
+	filterMode = FilterNone;
 	showRegionOutlines = true;
 	showVoxelOutlines = false;
-	filterRegion = false;
 
 	data = nullptr;
 	labels = nullptr;
@@ -225,6 +226,13 @@ void SliceView::SetInteractionMode(enum InteractionMode mode) {
 	style->SetMode(mode);
 }
 
+void SliceView::SetFilterMode(enum FilterMode mode) {
+	filterMode = mode;
+
+	FilterRegions();
+}
+
+
 bool SliceView::GetShowLabelSlice() {
 	return labelSlice->GetVisibility();
 }
@@ -271,16 +279,6 @@ void SliceView::ToggleRegionOutlines() {
 	ShowRegionOutlines(!showRegionOutlines);
 }
 
-void SliceView::SetFilterRegion(bool filter) {
-	filterRegion = filter;
-
-	FilterRegions();
-}
-
-void SliceView::ToggleFilterRegion() {
-	SetFilterRegion(!filterRegion);
-}
-
 void SliceView::UpdatePlane() {
 	vtkCamera* cam = renderer->GetActiveCamera();
 
@@ -405,16 +403,13 @@ void SliceView::FilterRegions() {
 		RegionOutline* outline = region->GetOutline();
 		RegionVoxelOutlines* voxelOutlines = region->GetVoxelOutlines();
 
-		if (filterRegion && currentRegion) {			
-			bool visible = region == currentRegion;
+		// XXX: Setting based on surface visiblity probably indicates that the logic should be pushed up to visualization container,
+		// with a method in region for turning on and off individual pieces
+
+		bool visible = region->GetSurface()->GetActor()->GetVisibility();
 
-			outline->GetActor()->SetVisibility(visible && showRegionOutlines);
-			voxelOutlines->GetActor()->SetVisibility(visible && showVoxelOutlines);
-		}
-		else {
-			outline->GetActor()->SetVisibility(showRegionOutlines);
-			voxelOutlines->GetActor()->SetVisibility(showVoxelOutlines);
-		}
+		outline->GetActor()->SetVisibility(visible && showRegionOutlines);
+		voxelOutlines->GetActor()->SetVisibility(visible && showVoxelOutlines);
 	}
 
 	renderer->ResetCameraClippingRange();

visualization/SliceView.h

@@ -21,6 +21,7 @@ class RegionCollection;
 class SliceLocation;
 
 enum InteractionMode;
+enum FilterMode;
 
 class SliceView {
 public:
@@ -37,6 +38,7 @@ class SliceView {
 	void SetProbePosition(double x, double y, double z);
 
 	void SetInteractionMode(InteractionMode mode);
+	void SetFilterMode(FilterMode mode);
 
 	void SetCurrentRegion(Region* region);
 
@@ -52,9 +54,6 @@ class SliceView {
 	void ShowRegionOutlines(bool show);
 	void ToggleRegionOutlines();
 
-	void SetFilterRegion(bool filter);
-	void ToggleFilterRegion();
-
 	void UpdatePlane();
 
 	void Render();
@@ -63,9 +62,9 @@ class SliceView {
 	vtkSmartPointer<vtkInteractorStyleSlice> GetInteractorStyle();
 
 protected:
+	FilterMode filterMode;
 	bool showVoxelOutlines;
 	bool showRegionOutlines;
-	bool filterRegion;
 
 	Region* currentRegion;
 

visualization/VisualizationContainer.cxx

@@ -59,9 +59,11 @@ VisualizationContainer::VisualizationContainer(vtkRenderWindowInteractor* volume
 	volumeView = new VolumeView(volumeInteractor);
 	sliceView = new SliceView(sliceInteractor, labelColors);
 
-	// Set to edit mode, then toggle to propagate change
-	interactionMode = EditMode;
-	ToggleInteractionMode();
+	// Set to navigation mode
+	SetInteractionMode(NavigationMode);
+
+	// Set to no filter
+	SetFilterMode(FilterNone);
 
 	// Callbacks
 
@@ -396,6 +398,17 @@ void VisualizationContainer::ToggleInteractionMode() {
 	SetInteractionMode(interactionMode == NavigationMode ? EditMode : NavigationMode);
 }
 
+FilterMode VisualizationContainer::GetFilterMode() {
+	return filterMode;
+}
+
+void VisualizationContainer::SetFilterMode(FilterMode mode) {
+	filterMode = mode;
+
+	volumeView->SetFilterMode(filterMode);
+	sliceView->SetFilterMode(filterMode);
+}
+
 void VisualizationContainer::PickLabel(int x, int y, int z) {
 	if (!labels) return;
 

visualization/VisualizationContainer.h

@@ -18,6 +18,7 @@ class Region;
 class RegionCollection;
 
 enum InteractionMode;
+enum FilterMode;
 
 class VisualizationContainer {
 public:
@@ -47,6 +48,9 @@ class VisualizationContainer {
 	void SetInteractionMode(InteractionMode mode);
 	void ToggleInteractionMode();
 
+	FilterMode GetFilterMode();
+	void SetFilterMode(FilterMode mode);
+
 	void PickLabel(int x, int y, int z);
 	void Paint(int x, int y, int z);
 	void Erase(int x, int y, int z);
@@ -95,6 +99,9 @@ class VisualizationContainer {
 	// Current interaction mode
 	InteractionMode interactionMode;
 
+	// Current filter mode
+	FilterMode filterMode;
+
 	void SetImageData(vtkImageData* imageData);
 	bool SetLabelData(vtkImageData* labelData);