From ca7a6f51576c530d7255fe0e48a1c502164519eb Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 28 Jun 2010 09:38:25 +0200 Subject: [PATCH] ENH: add provisioning for alternative display name for lagrangian fields --- .../PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H | 3 ++- .../PV3FoamReader/vtkPV3Foam/vtkPV3FoamLagrangianFields.H | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H index 3446d3fd8e..c51769eaa5 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H @@ -574,10 +574,11 @@ class vtkPV3Foam const label datasetNo ); - //- Lagrangian field + //- Lagrangian field, use specified display name template void convertLagrangianField ( + const word& displayName, const IOField&, vtkMultiBlockDataSet* output, const arrayRange&, diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamLagrangianFields.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamLagrangianFields.H index dd4c3b450a..618eaaaf86 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamLagrangianFields.H +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamLagrangianFields.H @@ -51,7 +51,9 @@ void Foam::vtkPV3Foam::convertLagrangianFields if (iter()->headerClassName() == IOField::typeName) { IOField tf(*iter()); - convertLagrangianField(tf, output, range, datasetNo); + // display name for lagrangian field + const word& displayName = tf.name(); + convertLagrangianField(displayName, tf, output, range, datasetNo); } } } @@ -60,6 +62,7 @@ void Foam::vtkPV3Foam::convertLagrangianFields template void Foam::vtkPV3Foam::convertLagrangianField ( + const word& displayName, const IOField& tf, vtkMultiBlockDataSet* output, const arrayRange& range, @@ -72,7 +75,7 @@ void Foam::vtkPV3Foam::convertLagrangianField pointData->SetNumberOfTuples(tf.size()); pointData->SetNumberOfComponents(nComp); pointData->Allocate(nComp*tf.size()); - pointData->SetName(tf.name().c_str()); + pointData->SetName(displayName.c_str()); if (debug) {