Merge branch 'develop' of https://gitlab.inria.fr/dtk/dtk-visualization into...

Merge branch 'develop' of https://gitlab.inria.fr/dtk/dtk-visualization into feature/separe_points_from_cells

app/dtkVisualizationViewer/dtkVisualizationViewer.cpp

@@ -162,6 +162,7 @@ void dtkVisualizationViewer::importDataSet(const QString& path)
     dtkVisualizationDecoratorScalarIsolines *decorator_scalar_isolines = new dtkVisualizationDecoratorScalarIsolines;
     dtkVisualizationDecoratorScalarGlyphs *decorator_scalar_glyphs = new dtkVisualizationDecoratorScalarGlyphs;
 
+    decorator_clut_editor->setName("my clut editor");
     //chain all decorators
     *decorator_clut_editor << *decorator_scalar_isolines << *decorator_scalar_glyphs << *decorator_scalar_color_map ;
 

src/dtkVisualization/dtkVisualizationDecorator.cpp

@@ -27,6 +27,7 @@
 class dtkVisualizationDecoratorPrivate
 {
 public:
+    QString name;
     QVariant data;
     dtkVisualizationCanvas *canvas = nullptr;
     dtkVisualizationDecorator *previous = nullptr;
@@ -37,9 +38,9 @@ public:
 // dtkVisualizationDecorator implementation
 // ///////////////////////////////////////////////////////////////////
 
-dtkVisualizationDecorator::dtkVisualizationDecorator(void) : d(new dtkVisualizationDecoratorPrivate)
+dtkVisualizationDecorator::dtkVisualizationDecorator(const QString &name) : d(new dtkVisualizationDecoratorPrivate)
 {
-
+    d->name = name;
 }
 
 dtkVisualizationDecorator::~dtkVisualizationDecorator(void)
@@ -96,6 +97,16 @@ void dtkVisualizationDecorator::unsetCanvas(void)
     d->canvas = nullptr;
 }
 
+void dtkVisualizationDecorator::setName(const QString &name)
+{
+    d->name = name;
+}
+
+const QString &dtkVisualizationDecorator::name(void)
+{
+    return d->name;
+}
+
 QVariant dtkVisualizationDecorator::data(void) const
 {
     return d->data;

src/dtkVisualization/dtkVisualizationDecorator.h

@@ -36,7 +36,7 @@ class DTKVISUALIZATION_EXPORT dtkVisualizationDecorator : public QObject
     Q_OBJECT
 
 public:
-     dtkVisualizationDecorator(void);
+     dtkVisualizationDecorator(const QString& name = "");
     ~dtkVisualizationDecorator(void);
 
 public slots:
@@ -47,6 +47,10 @@ public:
     virtual void setCanvas(dtkVisualizationCanvas *);
     virtual void unsetCanvas(void);
 
+public:
+    void setName(const QString& name);
+    const QString& name(void);
+
 public:
     QVariant data(void) const;
     dtkVisualizationCanvas *canvas(void) const;

src/dtkVisualization/dtkVisualizationDecoratorClutEditor.cpp

@@ -78,8 +78,11 @@ public:
 // dtkVisualizationDecoratorClutEditor implementation
 // ///////////////////////////////////////////////////////////////////
 
-dtkVisualizationDecoratorClutEditor::dtkVisualizationDecoratorClutEditor(void): d(new dtkVisualizationDecoratorClutEditorPrivate())
+dtkVisualizationDecoratorClutEditor::dtkVisualizationDecoratorClutEditor(const QString& name): dtkVisualizationDecorator("clut Editor"), d(new dtkVisualizationDecoratorClutEditorPrivate())
 {
+    if(!name.isEmpty())
+        this->setName(name);
+
     d->scalar_bar = vtkSmartPointer<vtkScalarBarActor>::New();
     d->scalar_bar->SetWidth(0.08);
     d->scalar_bar->SetHeight(0.6);
@@ -310,7 +313,7 @@ void dtkVisualizationDecoratorClutEditor::setCanvas(dtkVisualizationCanvas *canv
     dtkVisualizationWidgetsClutEditor *clut_editor = new dtkVisualizationWidgetsClutEditor;
 
     dtkWidgetsOverlayPaneItem *pane_item = new dtkWidgetsOverlayPaneItem;
-    pane_item->setTitle("Clut Editor");
+    pane_item->setTitle(this->name());
     pane_item->addWidget(widget_bar_and_fields);
     pane_item->addWidget(clut_editor);
     pane_item->addWidget(range_widget);

src/dtkVisualization/dtkVisualizationDecoratorClutEditor.h

@@ -29,7 +29,7 @@ class DTKVISUALIZATION_EXPORT dtkVisualizationDecoratorClutEditor : public dtkVi
     Q_OBJECT
 
 public:
-     dtkVisualizationDecoratorClutEditor(void);
+     dtkVisualizationDecoratorClutEditor(const QString& name="");
     ~dtkVisualizationDecoratorClutEditor(void);
 
 public:

src/dtkVisualization/dtkVisualizationDecoratorScalarColorMap.cpp

@@ -76,8 +76,11 @@ public:
 // dtkVisualizationDecoratorScalarColorMap implementation
 // ///////////////////////////////////////////////////////////////////
 
-dtkVisualizationDecoratorScalarColorMap::dtkVisualizationDecoratorScalarColorMap(void): d(new dtkVisualizationDecoratorScalarColorMapPrivate())
+dtkVisualizationDecoratorScalarColorMap::dtkVisualizationDecoratorScalarColorMap(const QString& name): dtkVisualizationDecorator("Scalar Color Map"), d(new dtkVisualizationDecoratorScalarColorMapPrivate())
 {
+    if(!name.isEmpty())
+        this->setName(name);
+
     d->mapper = vtkSmartPointer<vtkDataSetMapper>::New();
     d->mapper->SetColorModeToMapScalars();
     d->mapper->SetScalarVisibility(true);
@@ -204,7 +207,7 @@ void dtkVisualizationDecoratorScalarColorMap::setCanvas(dtkVisualizationCanvas *
     form_layout->addRow("Field", d->fields_box);
 
     dtkWidgetsOverlayPaneItem *pane_item = new dtkWidgetsOverlayPaneItem;
-    pane_item->setTitle("Scalar Color Map");
+    pane_item->setTitle(this->name());
     pane_item->addWidget(model_widget);
     canvas_pane->addWidget(pane_item);
 

src/dtkVisualization/dtkVisualizationDecoratorScalarColorMap.h

@@ -29,7 +29,7 @@ class DTKVISUALIZATION_EXPORT dtkVisualizationDecoratorScalarColorMap : public d
     Q_OBJECT
 
 public:
-     dtkVisualizationDecoratorScalarColorMap(void);
+     dtkVisualizationDecoratorScalarColorMap(const QString& name="");
     ~dtkVisualizationDecoratorScalarColorMap(void);
 
 public:

src/dtkVisualization/dtkVisualizationDecoratorScalarGlyphs.cpp

@@ -38,6 +38,7 @@
 #include <vtkPointData.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkProperty.h>
+#include <vtkRegularPolygonSource.h>
 #include <vtkRendererCollection.h>
 #include <vtkRenderWindow.h>
 #include <vtkRenderWindowInteractor.h>
@@ -78,6 +79,7 @@ public:
     vtkSmartPointer<vtkCylinderSource>    source_cylinder;
     vtkSmartPointer<vtkSphereSource>      source_sphere;
     vtkSmartPointer<vtkGlyph3D>           glyphs;
+    vtkSmartPointer<vtkRegularPolygonSource> source_polygon;
 
 public:
     QHash<QString, double>                glyphs_sizes;
@@ -91,8 +93,11 @@ public:
 // dtkVisualizationDecoratorScalarGlyphs implementation
 // ///////////////////////////////////////////////////////////////////
 
-dtkVisualizationDecoratorScalarGlyphs::dtkVisualizationDecoratorScalarGlyphs(void): d(new dtkVisualizationDecoratorScalarGlyphsPrivate())
+dtkVisualizationDecoratorScalarGlyphs::dtkVisualizationDecoratorScalarGlyphs(const QString& name): dtkVisualizationDecorator("Scalar Glyphs"), d(new dtkVisualizationDecoratorScalarGlyphsPrivate())
 {
+    if(!name.isEmpty())
+        this->setName(name);
+
     d->source_arrow = vtkSmartPointer<vtkArrowSource>::New();
 
     d->source_cube = vtkSmartPointer<vtkCubeSource>::New();
@@ -103,6 +108,8 @@ dtkVisualizationDecoratorScalarGlyphs::dtkVisualizationDecoratorScalarGlyphs(voi
     d->source_sphere->SetThetaResolution(12.);
     d->source_sphere->SetPhiResolution(12.);
 
+    d->source_polygon = vtkSmartPointer<vtkRegularPolygonSource>::New();
+
     d->glyphs = vtkSmartPointer<vtkGlyph3D>::New();
     d->glyphs->SetScaleModeToDataScalingOff();
     d->glyphs->SetColorModeToColorByScalar();
@@ -237,6 +244,7 @@ void dtkVisualizationDecoratorScalarGlyphs::setCanvas(dtkVisualizationCanvas *ca
     glyphs_source_cb->addItem("Cube");
     glyphs_source_cb->addItem("Cylinder");
     glyphs_source_cb->addItem("Sphere");
+    glyphs_source_cb->addItem("Polygon");
 
     QWidget *model_widget = new QWidget;
     QFormLayout *form_layout = new QFormLayout(model_widget);
@@ -246,7 +254,7 @@ void dtkVisualizationDecoratorScalarGlyphs::setCanvas(dtkVisualizationCanvas *ca
     form_layout->addRow("Source", glyphs_source_cb);
 
     dtkWidgetsOverlayPaneItem *pane_item = new dtkWidgetsOverlayPaneItem;
-    pane_item->setTitle("Scalar Glyphs");
+    pane_item->setTitle(this->name());
     pane_item->addWidget(model_widget);
     canvas_pane->addWidget(pane_item);
 
@@ -460,6 +468,10 @@ bool dtkVisualizationDecoratorScalarGlyphs::setCurrentFieldName(const QString& s
         d->source_sphere->SetRadius(glyphs_size);
         d->source_sphere->Modified();
         d->glyphs->SetSourceConnection(d->source_sphere->GetOutputPort());
+    } else if (glyphs_source == "Polygon") {
+        d->source_polygon->SetRadius(glyphs_size);
+        d->source_polygon->Modified();
+        d->glyphs->SetSourceConnection(d->source_polygon->GetOutputPort());
     }
 
     d->glyphs->Modified();
@@ -503,6 +515,9 @@ void dtkVisualizationDecoratorScalarGlyphs::setCurrentGlyphsSize(double size)
     } else if (source == "Sphere") {
         d->source_sphere->SetRadius(size);
         d->source_sphere->Modified();
+    } else if (source == "Polygon") {
+        d->source_polygon->SetRadius(size);
+        d->source_polygon->Modified();
     }
 
     d->glyphs->Modified();
@@ -531,8 +546,12 @@ void dtkVisualizationDecoratorScalarGlyphs::setCurrentGlyphsSource(const QString
         d->glyphs->SetSourceConnection(d->source_cylinder->GetOutputPort());
     } else if (source == "Sphere") {
         d->glyphs->SetSourceConnection(d->source_sphere->GetOutputPort());
+    } else if (source == "Polygon") {
+        d->glyphs->SetSourceConnection(d->source_polygon->GetOutputPort());
     }
 
+    d->glyphs_sources[d->current_field_name]= source;
+
     d->glyphs->Modified();
     d->mapper->Modified();
     d->actor->Modified();

src/dtkVisualization/dtkVisualizationDecoratorScalarGlyphs.h

@@ -32,7 +32,7 @@ class DTKVISUALIZATION_EXPORT dtkVisualizationDecoratorScalarGlyphs : public dtk
 {
     Q_OBJECT
 public:
-     dtkVisualizationDecoratorScalarGlyphs(void);
+     dtkVisualizationDecoratorScalarGlyphs(const QString& name="");
     ~dtkVisualizationDecoratorScalarGlyphs(void);
 
 public:

src/dtkVisualization/dtkVisualizationDecoratorScalarIsolines.cpp

@@ -85,8 +85,10 @@ public:
 // dtkVisualizationDecoratorScalarIsolines implementation
 // ///////////////////////////////////////////////////////////////////
 
-dtkVisualizationDecoratorScalarIsolines::dtkVisualizationDecoratorScalarIsolines(void): d(new dtkVisualizationDecoratorScalarIsolinesPrivate())
+dtkVisualizationDecoratorScalarIsolines::dtkVisualizationDecoratorScalarIsolines(const QString &name): dtkVisualizationDecorator("Scalar Isolines"), d(new dtkVisualizationDecoratorScalarIsolinesPrivate())
 {
+    if(!name.isEmpty())
+        this->setName(name);
 
     d->isolines = vtkSmartPointer<vtkContourFilter>::New();
 
@@ -228,7 +230,7 @@ void dtkVisualizationDecoratorScalarIsolines::setCanvas(dtkVisualizationCanvas *
     form_layout->addRow("Max", isolines_max_sb);
 
     dtkWidgetsOverlayPaneItem *pane_item = new dtkWidgetsOverlayPaneItem;
-    pane_item->setTitle("Scalar Isolines");
+    pane_item->setTitle(this->name());
     pane_item->addWidget(model_widget);
     canvas_pane->addWidget(pane_item);
 

src/dtkVisualization/dtkVisualizationDecoratorScalarIsolines.h

@@ -32,7 +32,7 @@ class DTKVISUALIZATION_EXPORT dtkVisualizationDecoratorScalarIsolines : public d
 {
     Q_OBJECT
 public:
-     dtkVisualizationDecoratorScalarIsolines(void);
+     dtkVisualizationDecoratorScalarIsolines(const QString& name="");
     ~dtkVisualizationDecoratorScalarIsolines(void);
 
 public: