Commit 1c944cdc authored by Andrew Heather's avatar Andrew Heather

STYLE: Consistency updates

parent d16dbee6
......@@ -99,7 +99,7 @@ Foam::functionObjects::runTimePostPro::geometryBase::geometryBase
name_(dict.dictName()),
visible_(readBool(dict.lookup("visible"))),
renderMode_(rmGouraud),
opacity_(NULL),
opacity_(nullptr),
colours_(colours)
{
if (dict.found("renderMode"))
......
......@@ -75,14 +75,14 @@ const Foam::NamedEnum
void Foam::functionObjects::runTimePostPro::pathline::addLines
(
const label frameI,
const label framei,
vtkActor* actor,
vtkPolyData* data
) const
{
geometryBase::initialiseActor(actor);
vector colour = lineColour_->value(frameI);
vector colour = lineColour_->value(framei);
actor->GetProperty()->SetColor(colour[0], colour[1], colour[2]);
vtkPolyDataMapper* mapper =
......@@ -141,7 +141,7 @@ Foam::functionObjects::runTimePostPro::pathline::pathline
representationTypeNames.read(dict.lookup("representation"))
),
tubeRadius_(0.0),
lineColour_(NULL)
lineColour_(nullptr)
{
if (dict.found("lineColour"))
{
......
......@@ -104,7 +104,7 @@ protected:
//- Add the pathlines to the renderer
void addLines
(
const label frameI,
const label framei,
vtkActor* actor,
vtkPolyData* data
) const;
......
......@@ -72,7 +72,7 @@ const Foam::NamedEnum
void Foam::functionObjects::runTimePostPro::pointData::addPoints
(
const label frameI,
const label framei,
vtkActor* actor,
vtkPolyDataMapper* mapper,
vtkPolyData* data
......@@ -80,7 +80,7 @@ void Foam::functionObjects::runTimePostPro::pointData::addPoints
{
geometryBase::initialiseActor(actor);
vector colour = pointColour_->value(frameI);
vector colour = pointColour_->value(framei);
actor->GetProperty()->SetColor(colour[0], colour[1], colour[2]);
switch (representation_)
......@@ -109,7 +109,7 @@ Foam::functionObjects::runTimePostPro::pointData::pointData
representationTypeNames.read(dict.lookup("representation"))
),
maxGlyphLength_(readScalar(dict.lookup("maxGlyphLength"))),
pointColour_(NULL)
pointColour_(nullptr)
{
if (dict.found("pointColour"))
{
......
......@@ -102,7 +102,7 @@ protected:
//- Add the point data to the renderer
void addPoints
(
const label frameI,
const label framei,
vtkActor* actor,
vtkPolyDataMapper* mapper,
vtkPolyData* data
......
......@@ -339,10 +339,10 @@ Foam::functionObjects::runTimePostPro::scene::scene
name_(name),
colours_(),
mode_(mtStatic),
cameraPosition_(NULL),
cameraFocalPoint_(NULL),
cameraUp_(NULL),
cameraViewAngle_(NULL),
cameraPosition_(nullptr),
cameraFocalPoint_(nullptr),
cameraUp_(nullptr),
cameraViewAngle_(nullptr),
clipBox_(),
parallelProjection_(true),
nFrameTotal_(1),
......
......@@ -160,8 +160,8 @@ Foam::functionObjects::runTimePostPro::surface::surface
representationTypeNames.read(dict.lookup("representation"))
),
featureEdges_(false),
surfaceColour_(NULL),
edgeColour_(NULL),
surfaceColour_(nullptr),
edgeColour_(nullptr),
surfaceActor_(),
edgeActor_(),
maxGlyphLength_(0.0)
......
......@@ -47,7 +47,7 @@ Foam::functionObjects::runTimePostPro::text::text
string_(dict.lookup("string")),
position_(dict.lookup("position")),
size_(readScalar(dict.lookup("size"))),
colour_(NULL),
colour_(nullptr),
bold_(readBool(dict.lookup("bold"))),
timeStamp_(dict.lookupOrDefault<bool>("timeStamp", false))
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment