Add table widget

Author: ThomasKroes

src/ScatterplotPlugin.cpp

@@ -28,12 +28,16 @@
 #include <QMetaType>
 #include <QtCore>
 #include <QPushbutton>
+#include <QTableWidget>
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 #include <actions/ViewPluginSamplerAction.h>
 
+#define VIEW_SAMPLING_HTML
+//#define VIEW_SAMPLING_WIDGET
+
 Q_PLUGIN_METADATA(IID "studio.manivault.ScatterplotPlugin")
 
 using namespace mv;
@@ -233,31 +237,10 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
     auto& selectionAction = _settingsAction.getSelectionAction();
 
     getSamplerAction().initialize(this, &selectionAction.getPixelSelectionAction(), &selectionAction.getSamplerPixelSelectionAction());
-    //getSamplerAction().setHtmlViewGeneratorFunction([this](const ViewPluginSamplerAction::SampleContext& toolTipContext) -> QString {
-    //    qDebug() << __FUNCTION__;
-    //    QStringList localPointIndices, globalPointIndices;
-
-    //    for (const auto& localPointIndex : toolTipContext["LocalPointIndices"].toList())
-    //        localPointIndices << QString::number(localPointIndex.toInt());
-
-    //    for (const auto& globalPointIndex : toolTipContext["GlobalPointIndices"].toList())
-    //        globalPointIndices << QString::number(globalPointIndex.toInt());
-
-    //    if (localPointIndices.isEmpty())
-    //        return {};
-
-    //    return  QString("<table> \
-    //                <tr> \
-    //                    <td><b>Point ID's: </b></td> \
-    //                    <td>%1</td> \
-    //                </tr> \
-    //               </table>").arg(globalPointIndices.join(", "));
-    //});
 
-    auto widget = new QPushButton();
-
-    getSamplerAction().setWidgetViewGeneratorFunction([this, widget](const ViewPluginSamplerAction::SampleContext& toolTipContext) -> QWidget* {
-		QStringList localPointIndices, globalPointIndices;
+#ifdef VIEW_SAMPLING_HTML
+    getSamplerAction().setHtmlViewGeneratorFunction([this](const ViewPluginSamplerAction::SampleContext& toolTipContext) -> QString {
+        QStringList localPointIndices, globalPointIndices;
 
         for (const auto& localPointIndex : toolTipContext["LocalPointIndices"].toList())
             localPointIndices << QString::number(localPointIndex.toInt());
@@ -268,10 +251,36 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
         if (localPointIndices.isEmpty())
             return {};
 
-        widget->setText(QString("Point ID's: %1").arg(globalPointIndices.join(", ")));
+        return  QString("<table> \
+                    <tr> \
+                        <td><b>Point ID's: </b></td> \
+                        <td>%1</td> \
+                    </tr> \
+                   </table>").arg(globalPointIndices.join(", "));
+    });
+#endif
+
+#ifdef VIEW_SAMPLING_WIDGET
+    auto pointIndicesTableWidget = new QTableWidget(5, 2);
+
+    pointIndicesTableWidget->setHorizontalHeaderLabels({ "Local point index", "Global point index" });
 
-        return widget;
+    getSamplerAction().setWidgetViewGeneratorFunction([this, pointIndicesTableWidget](const ViewPluginSamplerAction::SampleContext& sampleContext) -> QWidget* {
+        const auto localPointIndices    = sampleContext["LocalPointIndices"].toList();
+        const auto globalPointIndices   = sampleContext["GlobalPointIndices"].toList();
+
+        pointIndicesTableWidget->setRowCount(localPointIndices.count());
+
+        for (int i = 0; i < localPointIndices.count(); ++i) {
+            pointIndicesTableWidget->setItem(i, 0, new QTableWidgetItem(QString::number(localPointIndices[i].toInt())));
+            pointIndicesTableWidget->setItem(i, 1, new QTableWidgetItem(QString::number(globalPointIndices[i].toInt())));
+        }
+
+        pointIndicesTableWidget->resizeColumnsToContents();
+
+        return pointIndicesTableWidget;
     });
+#endif
 
     //getSamplerAction().setViewingMode(ViewPluginSamplerAction::ViewingMode::Tooltip);
     //getSamplerAction().getEnabledAction().setChecked(false);
@@ -443,17 +452,13 @@ void ScatterplotPlugin::selectPoints()
 
 void ScatterplotPlugin::samplePoints()
 {
-    
-
     auto& samplerPixelSelectionTool = _scatterPlotWidget->getSamplerPixelSelectionTool();
 
     qDebug() << __FUNCTION__ << samplerPixelSelectionTool.isActive() << _scatterPlotWidget->isNavigating() << samplerPixelSelectionTool.isEnabled();
 
-    if (!_positionDataset.isValid() || _scatterPlotWidget->isNavigating() || !samplerPixelSelectionTool.isEnabled())
+    if (!_positionDataset.isValid() || !samplerPixelSelectionTool.isActive() || _scatterPlotWidget->isNavigating() || !samplerPixelSelectionTool.isEnabled())
         return;
 
-    
-
     auto selectionAreaImage = samplerPixelSelectionTool.getAreaPixmap().toImage();
 
     std::vector<std::uint32_t> targetSelectionIndices;