Work toward adding a toolbar

RENCI · Dec 11, 2019 · efa10d1 · efa10d1
1 parent 173647e
commit efa10d1
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 10 deletions.
diff --git a/MainWindow.cxx b/MainWindow.cxx
@@ -6,17 +6,15 @@
 #include <QIcon>
 #include <QStyle>
 #include <QPushButton>
-
-#include <QIODevice>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QToolBar>
 
 #include <vtkGenericOpenGLRenderWindow.h>
 
 #include "VisualizationContainer.h"
 #include "RegionCollection.h"
 #include "RegionTable.h"
 #include "RegionMetadataIO.h"
+#include "InteractionEnums.h"
 
 #include "vtkCallbackCommand.h"
 #include "vtkSmartPointer.h"
@@ -31,6 +29,9 @@ MainWindow::MainWindow() {
 	defaultImageDirectoryKey = "default_image_directory";
 	defaultSegmentationDirectoryKey = "default_segmentation_directory";
 
+	// Create tool bar
+	CreateToolBar();
+
 	// Create render windows
 	vtkNew<vtkGenericOpenGLRenderWindow> renderWindowLeft;
 	qvtkWidgetLeft->SetRenderWindow(renderWindowLeft);
@@ -319,6 +320,15 @@ void MainWindow::on_actionExit_triggered() {
 	qApp->exit();
 }
 
+void MainWindow::on_actionNavigation() {
+
+	visualizationContainer->SetInteractionMode(NavigationMode);
+}
+
+void MainWindow::on_actionEdit() {
+	visualizationContainer->SetInteractionMode(EditMode);
+}
+
 void MainWindow::on_regionDone(int label, bool done) {
 	visualizationContainer->SetRegionDone((unsigned short)label, done);
 }
@@ -355,3 +365,28 @@ void MainWindow::SetDefaultDirectory(QString key, QString fileName) {
 	QSettings settings;
 	settings.setValue(key, fileInfo.absoluteDir().absolutePath());
 }
+
+void MainWindow::CreateToolBar() {
+	QToolBar* toolBar = new QToolBar();
+	toolBar->setFloatable(true);
+	toolBar->setMovable(true);
+	toolBar->setOrientation(Qt::Vertical);
+
+	QActionGroup* interactionModeGroup = new QActionGroup(this);
+	interactionModeGroup->setExclusive(true);
+
+	QAction* actionNavigation = new QAction("N", interactionModeGroup);
+	actionNavigation->setCheckable(true);
+	actionNavigation->setChecked(true);
+
+	QAction* actionEdit = new QAction("E", interactionModeGroup);
+	actionNavigation->setCheckable(false);
+
+	toolBar->addAction(actionNavigation);
+	toolBar->addAction(actionEdit);
+
+	QObject::connect(actionNavigation, &QAction::triggered, this, &MainWindow::on_actionNavigation);
+	QObject::connect(actionEdit, &QAction::triggered, this, &MainWindow::on_actionEdit);
+
+	toolBarWidget->layout()->addWidget(toolBar);
+}
diff --git a/MainWindow.h b/MainWindow.h
@@ -24,12 +24,13 @@ class MainWindow : public QMainWindow, private Ui::MainWindow {
 	void highlightRegion(unsigned short label);
 
 public slots:
+
+	// Menu events
 	// Use Qt's auto-connect magic to tie GUI widgets to slots,
 	// removing the need to call connect() explicitly.
 	// Names of the methods must follow the naming convention
 	// on_<widget name>_<signal name>(<signal parameters>).
 
-	// Menu events
 	virtual void on_actionOpen_Image_File_triggered();
 	virtual void on_actionOpen_Image_Stack_triggered();
 
@@ -42,6 +43,10 @@ public slots:
 
 	virtual void on_actionExit_triggered();
 
+	// Tool bar events
+	virtual void on_actionNavigation();
+	virtual void on_actionEdit();
+
 	// Region table events
 	virtual void on_regionDone(int label, bool done);
 	virtual void on_removeRegion(int label);
@@ -61,6 +66,8 @@ public slots:
 
 	QString GetDefaultDirectory(QString key);
 	void SetDefaultDirectory(QString key, QString fileName);
+
+	void CreateToolBar();
 };
 
 #endif
diff --git a/MainWindow.ui b/MainWindow.ui
@@ -35,6 +35,15 @@
       </property>
      </widget>
     </item>
+    <item>
+     <widget class="QWidget" name="toolBarWidget" native="true">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_2"/>
+       </item>
+      </layout>
+     </widget>
+    </item>
     <item>
      <widget class="QGroupBox" name="regionTableContainer">
       <property name="sizePolicy">

diff --git a/SliceView.h b/SliceView.h
@@ -20,6 +20,8 @@ class RegionOutline;
 class RegionCollection;
 class SliceLocation;
 
+enum InteractionMode;
+
 class SliceView {
 public:
 	SliceView(vtkRenderWindowInteractor* interactor, vtkLookupTable* lut);
@@ -34,7 +36,7 @@ class SliceView {
 	void SetShowProbe(bool show);
 	void SetProbePosition(double x, double y, double z);
 
-	void SetInteractionMode(enum InteractionMode mode);
+	void SetInteractionMode(InteractionMode mode);
 
 	void SetCurrentRegion(Region* region);
 

diff --git a/VisualizationContainer.cxx b/VisualizationContainer.cxx
@@ -343,15 +343,19 @@ void VisualizationContainer::SegmentVolume() {
 	Render();
 }
 
-void VisualizationContainer::ToggleInteractionMode() {
-	interactionMode = interactionMode == NavigationMode ? EditMode : NavigationMode;
+void VisualizationContainer::SetInteractionMode(InteractionMode mode) {
+	interactionMode = mode;
 
 	sliceView->SetInteractionMode(interactionMode);
 	volumeView->SetInteractionMode(interactionMode);
 
 	Render();
 }
 
+void VisualizationContainer::ToggleInteractionMode() {
+	SetInteractionMode(interactionMode == NavigationMode ? EditMode : NavigationMode);
+}
+
 void VisualizationContainer::PickLabel(int x, int y, int z) {
 	if (!labels) return;
 

diff --git a/VisualizationContainer.h b/VisualizationContainer.h
@@ -17,6 +17,8 @@ class SliceView;
 class Region;
 class RegionCollection;
 
+enum InteractionMode;
+
 class VisualizationContainer {
 public:
 	VisualizationContainer(
@@ -41,6 +43,7 @@ class VisualizationContainer {
 	void SegmentVolume();
 	FileErrorCode SaveSegmentationData(const std::string& fileName);
 
+	void SetInteractionMode(InteractionMode mode);
 	void ToggleInteractionMode();
 
 	void PickLabel(int x, int y, int z);
@@ -84,7 +87,7 @@ class VisualizationContainer {
 	SliceView *sliceView;
 
 	// Current interaction mode
-	enum InteractionMode interactionMode;
+	InteractionMode interactionMode;
 
 	void SetImageData(vtkImageData* imageData);
 	bool SetLabelData(vtkImageData* labelData);

diff --git a/VolumeView.h b/VolumeView.h
@@ -21,6 +21,8 @@ class Region;
 class RegionSurface;
 class RegionCollection;
 
+enum InteractionMode;
+
 class VolumeView {
 public:
   VolumeView(vtkRenderWindowInteractor* interactor);
@@ -34,7 +36,7 @@ class VolumeView {
   void SetShowProbe(bool visibility);
   void SetProbePosition(double x, double y, double z);
 
-  void SetInteractionMode(enum InteractionMode mode);
+  void SetInteractionMode(InteractionMode mode);
 
   void SetCurrentRegion(Region* region);