Merge branch 'release/2.14.1'

CHANGELOG.md

 # Change Log:
 
+# 2.14.1 17-Oct-2019
+ - Non lazy instanciation scheme for specific situations in ScalarGlyph decorator
+
 # 2.14.0 15-Oct-2019
  - really fix viewVideoRaster widgets
  - must increase minor number because of API change in 2.13.2

CMakeLists.txt

@@ -24,7 +24,7 @@ project(dtkVisualization)
 
 set(${PROJECT_NAME}_VERSION_MAJOR 2)
 set(${PROJECT_NAME}_VERSION_MINOR 14)
-set(${PROJECT_NAME}_VERSION_PATCH 0)
+set(${PROJECT_NAME}_VERSION_PATCH 1)
 set(${PROJECT_NAME}_VERSION
   ${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH})
 

src/dtkVisualization/dtkVisualizationDecoratorScalarGlyphs.cpp

@@ -92,20 +92,30 @@ dtkVisualizationDecoratorScalarGlyphs::dtkVisualizationDecoratorScalarGlyphs(voi
 
     d->source_sphere->SetThetaResolution(12.);
     d->source_sphere->SetPhiResolution(12.);
+    d->source_sphere->Update();
 
     d->source_arrow->SetShaftRadius(d->default_glyph_size);
     d->source_arrow->SetTipRadius(d->default_glyph_size);
+    d->source_arrow->Update();
+
     d->source_cube->SetXLength(d->default_glyph_size);
     d->source_cube->SetYLength(d->default_glyph_size);
     d->source_cube->SetZLength(d->default_glyph_size);
+    d->source_cube->Update();
+
     d->source_cylinder->SetRadius(d->default_glyph_size);
+    d->source_cylinder->Update();
+
     d->source_polygon->SetRadius(d->default_glyph_size);
+    d->source_polygon->Update();
+
     d->source_sphere->SetRadius(d->default_glyph_size);
+    d->source_sphere->Update();
 
     d->cell_centers = vtkSmartPointer<vtkCellCenters>::New();
 
     d->glyphs = vtkSmartPointer<vtkGlyph3D>::New();
-    d->glyphs->SetSourceConnection(d->source_sphere->GetOutputPort());
+    d->glyphs->SetSourceData(d->source_sphere->GetOutput());
     d->glyphs->SetScaleModeToDataScalingOff();
     d->glyphs->SetColorModeToColorByScalar();
     d->glyphs->GeneratePointIdsOn();
@@ -468,5 +478,16 @@ void *dtkVisualizationDecoratorScalarGlyphs::actor(void)
     return d->actor;
 }
 
+void dtkVisualizationDecoratorScalarGlyphs::touch(void)
+{
+    dtkVisualizationDecoratorWithClut::touch();
+
+    if (!d_func()->dataset)
+        return;
+
+    d->glyphs->SetInputData(d_func()->dataset);
+    d->glyphs->Update();
+}
+
 //
 // dtkVisualizationDecoratorScalarGlyphs.cpp ends here

src/dtkVisualization/dtkVisualizationDecoratorScalarGlyphs.h

@@ -50,7 +50,10 @@ signals:
 public:
     void *glyphs(void);
     void *actor(void);
-    
+
+public:
+    void touch(void) override;
+
 protected:
     class dtkVisualizationDecoratorScalarGlyphsPrivate *d = nullptr;
 };