(VC) Add ability to swap segmentation algorithms (#15)

* Rename chain seg base class

* (VC) Add ability to swap segmentation algorithms

* cleanup

Author: csparker247

apps/VC/CWindow.cpp

@@ -13,8 +13,10 @@
 #include "vc/core/util/Iteration.hpp"
 #include "vc/core/util/Logging.hpp"
 #include "vc/meshing/OrderedPointSetMesher.hpp"
+#include "vc/segmentation/LocalResliceParticleSim.hpp"
 
 namespace vc = volcart;
+namespace vcs = volcart::segmentation;
 using namespace ChaoVis;
 using qga = QGuiApplication;
 
@@ -216,10 +218,17 @@ void CWindow::CreateWidgets(void)
         SLOT(OnPathItemClicked(QListWidgetItem*)));
 
     // segmentation methods
-    QComboBox* aSegMethodsComboBox =
-        this->findChild<QComboBox*>("cmbSegMethods");
+    auto* aSegMethodsComboBox = this->findChild<QComboBox*>("cmbSegMethods");
     aSegMethodsComboBox->addItem(tr("Local Reslice Particle Simulation"));
+    connect(
+        aSegMethodsComboBox, SIGNAL(currentIndexChanged(int)), this,
+        SLOT(OnChangeSegAlgo(int)));
+
+    // ADD NEW SEGMENTATION ALGORITHM NAMES HERE
+    // aSegMethodsComboBox->addItem(tr("My custom algorithm"));
 
+    // LRPS segmentation parameters
+    // all of these are contained in the this->ui.lrpsParams
     fEdtAlpha = this->findChild<QLineEdit*>("edtAlphaVal");
     fEdtBeta = this->findChild<QLineEdit*>("edtBetaVal");
     fEdtDelta = this->findChild<QLineEdit*>("edtDeltaVal");
@@ -259,6 +268,9 @@ void CWindow::CreateWidgets(void)
         fEdtEndIndex, SIGNAL(editingFinished()), this,
         SLOT(OnEdtEndingSliceValChange()));
 
+    // INSERT OTHER SEGMENTATION PARAMETER WIDGETS HERE
+    // this->ui.segParamsStack->addWidget(new QLabel("Parameter widgets here"));
+
     // start segmentation button
     QPushButton* aBtnStartSeg = this->findChild<QPushButton*>("btnStartSeg");
     connect(
@@ -570,29 +582,39 @@ void CWindow::DoSegmentation(void)
 {
     statusBar->clearMessage();
 
-    // REVISIT - do we need to get the latest value from the widgets since we
-    // constantly get the values?
-    if (!SetUpSegParams()) {
+    // Make sure our seg params structure has the current values
+    if (not SetUpSegParams()) {
         QMessageBox::information(
             this, tr("Info"), tr("Invalid parameter for segmentation"));
         return;
     }
 
-    // 2) do segmentation from the starting slice
-    vc::segmentation::LocalResliceSegmentation segmenter;
-    segmenter.setChain(fStartingPath);
-    segmenter.setVolume(currentVolume);
-    segmenter.setMaterialThickness(fVpkg->materialThickness());
-    segmenter.setTargetZIndex(fSegParams.targetIndex);
-    segmenter.setOptimizationIterations(fSegParams.fNumIters);
-    segmenter.setResliceSize(fSegParams.fWindowWidth);
-    segmenter.setAlpha(fSegParams.fAlpha);
-    segmenter.setK1(fSegParams.fK1);
-    segmenter.setK2(fSegParams.fK2);
-    segmenter.setBeta(fSegParams.fBeta);
-    segmenter.setDelta(fSegParams.fDelta);
-    segmenter.setDistanceWeightFactor(fSegParams.fPeakDistanceWeight);
-    segmenter.setConsiderPrevious(fSegParams.fIncludeMiddle);
+    // Setup LRPS
+    auto segIdx = this->ui.cmbSegMethods->currentIndex();
+    Segmenter::Pointer segmenter;
+    if (segIdx == 0) {
+        auto lrps = vcs::LocalResliceSegmentation::New();
+        lrps->setMaterialThickness(fVpkg->materialThickness());
+        lrps->setTargetZIndex(fSegParams.targetIndex);
+        lrps->setOptimizationIterations(fSegParams.fNumIters);
+        lrps->setResliceSize(fSegParams.fWindowWidth);
+        lrps->setAlpha(fSegParams.fAlpha);
+        lrps->setK1(fSegParams.fK1);
+        lrps->setK2(fSegParams.fK2);
+        lrps->setBeta(fSegParams.fBeta);
+        lrps->setDelta(fSegParams.fDelta);
+        lrps->setDistanceWeightFactor(fSegParams.fPeakDistanceWeight);
+        lrps->setConsiderPrevious(fSegParams.fIncludeMiddle);
+        segmenter = lrps;
+    }
+    // ADD OTHER SEGMENTER SETUP HERE. MATCH THE IDX TO THE IDX IN THE
+    // DROPDOWN LIST
+
+    // set common parameters
+    segmenter->setChain(fStartingPath);
+    segmenter->setVolume(currentVolume);
+
+    // setup
     submitSegmentation(segmenter);
     setWidgetsEnabled(false);
     worker_progress_.show();
@@ -1036,6 +1058,11 @@ void CWindow::ToggleSegmentationTool(void)
     UpdateView();
 }
 
+void CWindow::OnChangeSegAlgo(int index)
+{
+    this->ui.segParamsStack->setCurrentIndex(index);
+}
+
 // Handle gravity value change
 void CWindow::OnEdtAlphaValChange()
 {

apps/VC/CWindow.hpp

@@ -17,7 +17,7 @@
 #include "ui_VCMain.h"
 
 #include "vc/core/types/VolumePkg.hpp"
-#include "vc/segmentation/LocalResliceParticleSim.hpp"
+#include "vc/segmentation/ChainSegmentationAlgorithm.hpp"
 
 // Volpkg version required by this app
 static constexpr int VOLPKG_SUPPORTED_VERSION = 6;
@@ -43,6 +43,8 @@ class CWindow : public QMainWindow
     };  // idle
     enum SaveResponse : bool { Cancelled, Continue };
 
+    // Structure for segmentation parameters
+    // Declare parameters for new algos here and update SetUpSegParams()
     using SSegParams = struct SSegParams_tag {
         int fNumIters;
         double fAlpha;
@@ -56,10 +58,10 @@ class CWindow : public QMainWindow
         int targetIndex;
     };
 
-    using Segmenter = volcart::segmentation::LocalResliceSegmentation;
+    using Segmenter = volcart::segmentation::ChainSegmentationAlgorithm;
 
 signals:
-    void submitSegmentation(Segmenter s);
+    void submitSegmentation(Segmenter::Pointer s);
 
 public slots:
     void onSegmentationFinished(Segmenter::PointSet ps);
@@ -121,6 +123,8 @@ private slots:
     void TogglePenTool(void);
     void ToggleSegmentationTool(void);
 
+    void OnChangeSegAlgo(int index);
+
     void OnEdtAlphaValChange();
     void OnEdtBetaValChange();
     void OnEdtDeltaValChange();
@@ -227,31 +231,29 @@ class VolPkgBackend : public QObject
 {
     Q_OBJECT
 public:
+    using Segmenter = volcart::segmentation::ChainSegmentationAlgorithm;
+
     explicit VolPkgBackend(QObject* parent = nullptr) : QObject(parent) {}
 
 signals:
     void segmentationStarted(size_t);
-    void segmentationFinished(CWindow::Segmenter::PointSet ps);
+    void segmentationFinished(Segmenter::PointSet ps);
     void segmentationFailed(std::string);
     void progressUpdated(size_t);
 
 public slots:
-    void startSegmentation(CWindow::Segmenter s)
+    void startSegmentation(Segmenter::Pointer segmenter)
     {
-        segmenter = std::move(s);
-        segmenter.progressUpdated.connect(
+        segmenter->progressUpdated.connect(
             [=](size_t p) { progressUpdated(p); });
-        segmentationStarted(segmenter.progressIterations());
+        segmentationStarted(segmenter->progressIterations());
         try {
-            auto result = segmenter.compute();
+            auto result = segmenter->compute();
             segmentationFinished(result);
         } catch (const std::exception& e) {
             segmentationFailed(e.what());
         }
     }
-
-public:
-    CWindow::Segmenter segmenter;
 };
 
 }  // namespace ChaoVis