Commit 3cef9868 authored by bonnell's avatar bonnell

Reduce warnings on windows.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@28201 18c085ea-50e0-402c-830e-de6fd14e8384
parent ffd94777
...@@ -54,15 +54,15 @@ ...@@ -54,15 +54,15 @@
// //
vtkYoungsMaterialInterface::vtkYoungsMaterialInterface() vtkYoungsMaterialInterface::vtkYoungsMaterialInterface()
{ {
this->FillMaterial = 0; this->FillMaterial = false;
this->InverseNormal = 0; this->InverseNormal = false;
this->AxisSymetric = 0; this->AxisSymetric = false;
this->OnionPeel = 0; this->OnionPeel = false;
this->ReverseMaterialOrder = 0; this->ReverseMaterialOrder = false;
this->UseFractionAsDistance = 0; this->UseFractionAsDistance = false;
this->VolumeFractionRange[0] = 0.0001; this->VolumeFractionRange[0] = 0.0001;
this->VolumeFractionRange[1] = 0.9999; this->VolumeFractionRange[1] = 0.9999;
this->TwoMaterialsOptimization = 0; this->TwoMaterialsOptimization = false;
} }
vtkYoungsMaterialInterface::~vtkYoungsMaterialInterface() vtkYoungsMaterialInterface::~vtkYoungsMaterialInterface()
......
...@@ -89,13 +89,13 @@ class vtkYoungsMaterialInterface ...@@ -89,13 +89,13 @@ class vtkYoungsMaterialInterface
protected: protected:
int CellProduceInterface(int dim, int np, double fraction, double minFrac, double maxFrac); int CellProduceInterface(int dim, int np, double fraction, double minFrac, double maxFrac);
int FillMaterial; bool FillMaterial;
int InverseNormal; bool InverseNormal;
int AxisSymetric; bool AxisSymetric;
int OnionPeel; bool OnionPeel;
int ReverseMaterialOrder; bool ReverseMaterialOrder;
int UseFractionAsDistance; bool UseFractionAsDistance;
int TwoMaterialsOptimization; bool TwoMaterialsOptimization;
double VolumeFractionRange[2]; double VolumeFractionRange[2];
struct MaterialDescription struct MaterialDescription
......
...@@ -106,8 +106,8 @@ avtLevelsLegend::avtLevelsLegend() ...@@ -106,8 +106,8 @@ avtLevelsLegend::avtLevelsLegend()
size[1] = 0.26; size[1] = 0.26;
sBar->SetPosition2(size[0], size[1]); sBar->SetPosition2(size[0], size[1]);
barVisibility = 1; barVisibility = true;
rangeVisibility = 1; rangeVisibility = true;
labelVisibility = 1; labelVisibility = 1;
minmaxVisibility = true; minmaxVisibility = true;
titleVisibility = true; titleVisibility = true;
...@@ -443,7 +443,7 @@ avtLevelsLegend::SetLegendScale(double xScale, double yScale) ...@@ -443,7 +443,7 @@ avtLevelsLegend::SetLegendScale(double xScale, double yScale)
void void
avtLevelsLegend::SetBoundingBoxVisibility(bool val) avtLevelsLegend::SetBoundingBoxVisibility(bool val)
{ {
sBar->SetBoundingBoxVisibility(val?1:0); sBar->SetBoundingBoxVisibility(val);
} }
// **************************************************************************** // ****************************************************************************
...@@ -536,7 +536,7 @@ avtLevelsLegend::SetFont(int family, bool bold, bool italic, bool shadow) ...@@ -536,7 +536,7 @@ avtLevelsLegend::SetFont(int family, bool bold, bool italic, bool shadow)
// **************************************************************************** // ****************************************************************************
void void
avtLevelsLegend::SetColorBarVisibility(const int val) avtLevelsLegend::SetColorBarVisibility(const bool val)
{ {
barVisibility = val; barVisibility = val;
sBar->SetColorBarVisibility(val); sBar->SetColorBarVisibility(val);
...@@ -727,7 +727,7 @@ avtLevelsLegend::SetReverseOrder(const bool rev) ...@@ -727,7 +727,7 @@ avtLevelsLegend::SetReverseOrder(const bool rev)
// **************************************************************************** // ****************************************************************************
void void
avtLevelsLegend::SetVarRangeVisibility(const int val ) avtLevelsLegend::SetVarRangeVisibility(const bool val )
{ {
rangeVisibility = val; rangeVisibility = val;
sBar->SetRangeVisibility(rangeVisibility && minmaxVisibility); sBar->SetRangeVisibility(rangeVisibility && minmaxVisibility);
......
...@@ -136,14 +136,14 @@ class PLOTTER_API avtLevelsLegend : public avtLegend ...@@ -136,14 +136,14 @@ class PLOTTER_API avtLevelsLegend : public avtLegend
virtual void SetFont(int family, bool bold, bool italic, bool shadow); virtual void SetFont(int family, bool bold, bool italic, bool shadow);
virtual void SetNumberFormat(const char *); virtual void SetNumberFormat(const char *);
void SetColorBarVisibility(const int); void SetColorBarVisibility(const bool);
void SetRange(double min, double max); void SetRange(double min, double max);
void SetLevels(const std::vector<double> &); void SetLevels(const std::vector<double> &);
void SetLevels(const std::vector<std::string> &); void SetLevels(const std::vector<std::string> &);
void SetLookupTable(vtkLookupTable *); void SetLookupTable(vtkLookupTable *);
void SetLabelColorMap(const LevelColorMap &); void SetLabelColorMap(const LevelColorMap &);
void SetReverseOrder(const bool); void SetReverseOrder(const bool);
void SetVarRangeVisibility(const int); void SetVarRangeVisibility(const bool);
void SetVarRange(double min, double max); void SetVarRange(double min, double max);
virtual void SetUseSuppliedLabels(bool); virtual void SetUseSuppliedLabels(bool);
...@@ -163,8 +163,8 @@ class PLOTTER_API avtLevelsLegend : public avtLegend ...@@ -163,8 +163,8 @@ class PLOTTER_API avtLevelsLegend : public avtLegend
vtkLookupTable *lut; vtkLookupTable *lut;
vtkVisItScalarBarActor *sBar; vtkVisItScalarBarActor *sBar;
int barVisibility; bool barVisibility;
int rangeVisibility; bool rangeVisibility;
bool titleVisibility; bool titleVisibility;
int labelVisibility; int labelVisibility;
bool minmaxVisibility; bool minmaxVisibility;
......
...@@ -106,7 +106,7 @@ bool ...@@ -106,7 +106,7 @@ bool
supported(const char *key) supported(const char *key)
{ {
#ifdef HAVE_LIBGLEW #ifdef HAVE_LIBGLEW
return glewIsSupported(key); return glewIsSupported(key)?true:false;
#else #else
return true; return true;
#endif #endif
......
...@@ -116,8 +116,8 @@ avtVariableLegend::avtVariableLegend() ...@@ -116,8 +116,8 @@ avtVariableLegend::avtVariableLegend()
sBar->SetPosition2(size[0], size[1]); sBar->SetPosition2(size[0], size[1]);
sBar->SetType(vtkVisItScalarBarActor::VTK_CONTINUOUS); sBar->SetType(vtkVisItScalarBarActor::VTK_CONTINUOUS);
barVisibility = 1; barVisibility = true;
rangeVisibility = 1; rangeVisibility = true;
titleVisibility = true; titleVisibility = true;
labelVisibility = 1; labelVisibility = 1;
minmaxVisibility = true; minmaxVisibility = true;
...@@ -192,8 +192,8 @@ avtVariableLegend::avtVariableLegend(int) ...@@ -192,8 +192,8 @@ avtVariableLegend::avtVariableLegend(int)
scale[1] = 1.; scale[1] = 1.;
size[0] = 0.08; size[0] = 0.08;
size[1] = 0.26; size[1] = 0.26;
barVisibility = 1; barVisibility = true;
rangeVisibility = 1; rangeVisibility = true;
labelVisibility = 1; labelVisibility = 1;
minmaxVisibility = true; minmaxVisibility = true;
titleVisibility = true; titleVisibility = true;
...@@ -319,7 +319,7 @@ void ...@@ -319,7 +319,7 @@ void
avtVariableLegend::SetTitleVisibility(bool val) avtVariableLegend::SetTitleVisibility(bool val)
{ {
titleVisibility = val; titleVisibility = val;
sBar->SetTitleVisibility(val?1:0); sBar->SetTitleVisibility(val);
} }
// **************************************************************************** // ****************************************************************************
...@@ -607,7 +607,7 @@ avtVariableLegend::SetFont(int family, bool bold, bool italic, bool shadow) ...@@ -607,7 +607,7 @@ avtVariableLegend::SetFont(int family, bool bold, bool italic, bool shadow)
// **************************************************************************** // ****************************************************************************
void void
avtVariableLegend::SetColorBarVisibility(const int val) avtVariableLegend::SetColorBarVisibility(const bool val)
{ {
barVisibility = val; barVisibility = val;
sBar->SetColorBarVisibility(val); sBar->SetColorBarVisibility(val);
...@@ -794,7 +794,7 @@ avtVariableLegend::SetLookupTable(vtkLookupTable *LUT) ...@@ -794,7 +794,7 @@ avtVariableLegend::SetLookupTable(vtkLookupTable *LUT)
// **************************************************************************** // ****************************************************************************
void void
avtVariableLegend::SetVarRangeVisibility(const int val ) avtVariableLegend::SetVarRangeVisibility(const bool val )
{ {
rangeVisibility = val; rangeVisibility = val;
sBar->SetRangeVisibility(rangeVisibility && minmaxVisibility); sBar->SetRangeVisibility(rangeVisibility && minmaxVisibility);
......
...@@ -137,12 +137,12 @@ class PLOTTER_API avtVariableLegend : public avtLegend ...@@ -137,12 +137,12 @@ class PLOTTER_API avtVariableLegend : public avtLegend
virtual void SetOrientation(LegendOrientation); virtual void SetOrientation(LegendOrientation);
virtual void SetFont(int family, bool bold, bool italic, bool shadow); virtual void SetFont(int family, bool bold, bool italic, bool shadow);
void SetColorBarVisibility(const int); void SetColorBarVisibility(const bool);
void SetRange(double min, double max); void SetRange(double min, double max);
void GetRange(double &, double &); void GetRange(double &, double &);
void SetScaling(int mode = 0, double skew = 1.); void SetScaling(int mode = 0, double skew = 1.);
void SetLookupTable(vtkLookupTable *); void SetLookupTable(vtkLookupTable *);
void SetVarRangeVisibility(const int); void SetVarRangeVisibility(const bool);
void SetVarRange(double min, double max); void SetVarRange(double min, double max);
virtual void SetNumTicks(int); virtual void SetNumTicks(int);
...@@ -162,8 +162,8 @@ class PLOTTER_API avtVariableLegend : public avtLegend ...@@ -162,8 +162,8 @@ class PLOTTER_API avtVariableLegend : public avtLegend
vtkLookupTable *lut; vtkLookupTable *lut;
double scale[2]; double scale[2];
int barVisibility; bool barVisibility;
int rangeVisibility; bool rangeVisibility;
bool titleVisibility; bool titleVisibility;
int labelVisibility; int labelVisibility;
bool minmaxVisibility; bool minmaxVisibility;
......
...@@ -216,13 +216,13 @@ vtkAxesActor2D::SetColor(double r, double g, double b) ...@@ -216,13 +216,13 @@ vtkAxesActor2D::SetColor(double r, double g, double b)
// **************************************************************************** // ****************************************************************************
void void
vtkAxesActor2D::SetXLogScaling(int logScale) vtkAxesActor2D::SetXLogScaling(bool logScale)
{ {
this->XAxis->SetLogScale(logScale); this->XAxis->SetLogScale(logScale);
} }
void void
vtkAxesActor2D::SetYLogScaling(int logScale) vtkAxesActor2D::SetYLogScaling(bool logScale)
{ {
this->YAxis->SetLogScale(logScale); this->YAxis->SetLogScale(logScale);
} }
...@@ -258,13 +258,13 @@ vtkAxesActor2D::SetYRange(double minY, double maxY) ...@@ -258,13 +258,13 @@ vtkAxesActor2D::SetYRange(double minY, double maxY)
// **************************************************************************** // ****************************************************************************
void void
vtkAxesActor2D::SetXLabelVisibility(int vis) vtkAxesActor2D::SetXLabelVisibility(bool vis)
{ {
this->XAxis->SetLabelVisibility(vis); this->XAxis->SetLabelVisibility(vis);
} }
void void
vtkAxesActor2D::SetYLabelVisibility(int vis) vtkAxesActor2D::SetYLabelVisibility(bool vis)
{ {
this->YAxis->SetLabelVisibility(vis); this->YAxis->SetLabelVisibility(vis);
} }
...@@ -343,7 +343,7 @@ vtkAxesActor2D::SetYLabelFontHeight(double height) ...@@ -343,7 +343,7 @@ vtkAxesActor2D::SetYLabelFontHeight(double height)
// **************************************************************************** // ****************************************************************************
void void
vtkAxesActor2D::SetAutoAdjustLabels(int autoAdjust) vtkAxesActor2D::SetAutoAdjustLabels(bool autoAdjust)
{ {
this->XAxis->SetAdjustLabels(autoAdjust); this->XAxis->SetAdjustLabels(autoAdjust);
this->YAxis->SetAdjustLabels(autoAdjust); this->YAxis->SetAdjustLabels(autoAdjust);
...@@ -411,13 +411,13 @@ vtkAxesActor2D::SetYTitleFontHeight(double height) ...@@ -411,13 +411,13 @@ vtkAxesActor2D::SetYTitleFontHeight(double height)
// **************************************************************************** // ****************************************************************************
void void
vtkAxesActor2D::SetXTitleVisibility(int vis) vtkAxesActor2D::SetXTitleVisibility(bool vis)
{ {
this->XAxis->SetTitleVisibility(vis); this->XAxis->SetTitleVisibility(vis);
} }
void void
vtkAxesActor2D::SetYTitleVisibility(int vis) vtkAxesActor2D::SetYTitleVisibility(bool vis)
{ {
this->YAxis->SetTitleVisibility(vis); this->YAxis->SetTitleVisibility(vis);
} }
...@@ -462,25 +462,25 @@ vtkAxesActor2D::SetTickLocation(int loc) ...@@ -462,25 +462,25 @@ vtkAxesActor2D::SetTickLocation(int loc)
// **************************************************************************** // ****************************************************************************
void void
vtkAxesActor2D::SetXMinorTickVisibility(int vis) vtkAxesActor2D::SetXMinorTickVisibility(bool vis)
{ {
this->XAxis->SetMinorTicksVisible(vis); this->XAxis->SetMinorTicksVisible(vis);
} }
void void
vtkAxesActor2D::SetXMajorTickVisibility(int vis) vtkAxesActor2D::SetXMajorTickVisibility(bool vis)
{ {
this->XAxis->SetTickVisibility(vis); this->XAxis->SetTickVisibility(vis);
} }
void void
vtkAxesActor2D::SetYMinorTickVisibility(int vis) vtkAxesActor2D::SetYMinorTickVisibility(bool vis)
{ {
this->YAxis->SetMinorTicksVisible(vis); this->YAxis->SetMinorTicksVisible(vis);
} }
void void
vtkAxesActor2D::SetYMajorTickVisibility(int vis) vtkAxesActor2D::SetYMajorTickVisibility(bool vis)
{ {
this->YAxis->SetTickVisibility(vis); this->YAxis->SetTickVisibility(vis);
} }
...@@ -564,13 +564,13 @@ vtkAxesActor2D::SetYMinorTickSpacing(double spacing) ...@@ -564,13 +564,13 @@ vtkAxesActor2D::SetYMinorTickSpacing(double spacing)
// **************************************************************************** // ****************************************************************************
void void
vtkAxesActor2D::SetXGridVisibility(int vis) vtkAxesActor2D::SetXGridVisibility(bool vis)
{ {
this->XAxis->SetDrawGridlines(vis); this->XAxis->SetDrawGridlines(vis);
} }
void void
vtkAxesActor2D::SetYGridVisibility(int vis) vtkAxesActor2D::SetYGridVisibility(bool vis)
{ {
this->YAxis->SetDrawGridlines(vis); this->YAxis->SetDrawGridlines(vis);
} }
......
...@@ -103,8 +103,8 @@ public: ...@@ -103,8 +103,8 @@ public:
// Description: // Description:
// Sets the log scaling for the axes. // Sets the log scaling for the axes.
void SetXLogScaling(int logScale); void SetXLogScaling(bool logScale);
void SetYLogScaling(int logScale); void SetYLogScaling(bool logScale);
// LABELS // LABELS
...@@ -117,8 +117,8 @@ public: ...@@ -117,8 +117,8 @@ public:
// Description: // Description:
// Sets the label visibility // Sets the label visibility
void SetXLabelVisibility(int vis); void SetXLabelVisibility(bool vis);
void SetYLabelVisibility(int vis); void SetYLabelVisibility(bool vis);
// Description: // Description:
// Sets the label scaling for the axes. // Sets the label scaling for the axes.
...@@ -142,7 +142,7 @@ public: ...@@ -142,7 +142,7 @@ public:
// Description: // Description:
// Sets the flag specifying if labels are auto adjusted. // Sets the flag specifying if labels are auto adjusted.
void SetAutoAdjustLabels(int autoAdjust); void SetAutoAdjustLabels(bool autoAdjust);
// Description: // Description:
// Retrieve the text property for labels // Retrieve the text property for labels
...@@ -165,8 +165,8 @@ public: ...@@ -165,8 +165,8 @@ public:
// Description: // Description:
// Sets the title visibility // Sets the title visibility
void SetXTitleVisibility(int vis); void SetXTitleVisibility(bool vis);
void SetYTitleVisibility(int vis); void SetYTitleVisibility(bool vis);
// Description: // Description:
// Retrieve the text property for titles // Retrieve the text property for titles
...@@ -182,10 +182,10 @@ public: ...@@ -182,10 +182,10 @@ public:
// Description: // Description:
// Sets the visibility of ticks. // Sets the visibility of ticks.
void SetXMinorTickVisibility(int vis); void SetXMinorTickVisibility(bool vis);
void SetXMajorTickVisibility(int vis); void SetXMajorTickVisibility(bool vis);
void SetYMinorTickVisibility(int vis); void SetYMinorTickVisibility(bool vis);
void SetYMajorTickVisibility(int vis); void SetYMajorTickVisibility(bool vis);
// Description: // Description:
// Sets the minimum value Major Ticks // Sets the minimum value Major Ticks
...@@ -212,8 +212,8 @@ public: ...@@ -212,8 +212,8 @@ public:
// Description: // Description:
// Sets the title visibility // Sets the title visibility
void SetXGridVisibility(int vis); void SetXGridVisibility(bool vis);
void SetYGridVisibility(int vis); void SetYGridVisibility(bool vis);
// Description: // Description:
......
...@@ -82,9 +82,9 @@ vtkLineLegend::vtkLineLegend() ...@@ -82,9 +82,9 @@ vtkLineLegend::vtkLineLegend()
this->PositionCoordinate->SetCoordinateSystemToNormalizedViewport(); this->PositionCoordinate->SetCoordinateSystemToNormalizedViewport();
this->PositionCoordinate->SetValue(0.82, 0.1); this->PositionCoordinate->SetValue(0.82, 0.1);
this->Bold = 0; this->Bold = false;
this->Italic = 0; this->Italic = false;
this->Shadow = 0; this->Shadow = false;
this->FontFamily = VTK_ARIAL; this->FontFamily = VTK_ARIAL;
this->FontHeight = 0.015; this->FontHeight = 0.015;
...@@ -95,8 +95,8 @@ vtkLineLegend::vtkLineLegend() ...@@ -95,8 +95,8 @@ vtkLineLegend::vtkLineLegend()
this->TitleActor->SetMapper(this->TitleMapper); this->TitleActor->SetMapper(this->TitleMapper);
this->TitleActor->GetPositionCoordinate()-> this->TitleActor->GetPositionCoordinate()->
SetReferenceCoordinate(this->PositionCoordinate); SetReferenceCoordinate(this->PositionCoordinate);
this->TitleVisibility = 1; this->TitleVisibility = true;
this->TitleOkayToDraw = 1; this->TitleOkayToDraw = true;
this->BoundingBox = vtkPolyData::New(); this->BoundingBox = vtkPolyData::New();
this->BoundingBoxMapper = vtkPolyDataMapper2D::New(); this->BoundingBoxMapper = vtkPolyDataMapper2D::New();
...@@ -109,7 +109,7 @@ vtkLineLegend::vtkLineLegend() ...@@ -109,7 +109,7 @@ vtkLineLegend::vtkLineLegend()
this->BoundingBoxColor[1] = 0.8; this->BoundingBoxColor[1] = 0.8;
this->BoundingBoxColor[2] = 0.8; this->BoundingBoxColor[2] = 0.8;
this->BoundingBoxColor[3] = 1.; this->BoundingBoxColor[3] = 1.;
this->BoundingBoxVisibility = 0; this->BoundingBoxVisibility = false;
this->BarWidth = 0.04; this->BarWidth = 0.04;
...@@ -215,7 +215,7 @@ vtkLineLegend::BuildTitle(vtkViewport *viewport) ...@@ -215,7 +215,7 @@ vtkLineLegend::BuildTitle(vtkViewport *viewport)
if (0 == viewSize[0] && 0 == viewSize[1] ) if (0 == viewSize[0] && 0 == viewSize[1] )
{ {
this->TitleOkayToDraw = 0; this->TitleOkayToDraw = false;
return; return;
} }
...@@ -246,7 +246,7 @@ vtkLineLegend::BuildTitle(vtkViewport *viewport) ...@@ -246,7 +246,7 @@ vtkLineLegend::BuildTitle(vtkViewport *viewport)
this->TitleActor->GetPositionCoordinate()-> this->TitleActor->GetPositionCoordinate()->
SetCoordinateSystemToNormalizedViewport(); SetCoordinateSystemToNormalizedViewport();
this->TitleActor->GetPositionCoordinate()->SetValue(titleOrigin); this->TitleActor->GetPositionCoordinate()->SetValue(titleOrigin);
this->TitleOkayToDraw = 1; this->TitleOkayToDraw = true;
} }
// Build the line for this actor // Build the line for this actor
...@@ -464,7 +464,7 @@ vtkLineLegend::RenderOpaqueGeometry(vtkViewport *viewport) ...@@ -464,7 +464,7 @@ vtkLineLegend::RenderOpaqueGeometry(vtkViewport *viewport)
if ( this->Title != NULL ) if ( this->Title != NULL )
this->BuildTitle(viewport); this->BuildTitle(viewport);
else else
this->TitleOkayToDraw = 0; this->TitleOkayToDraw = false;
} }
this->BuildLine(viewport); this->BuildLine(viewport);
......
...@@ -90,22 +90,22 @@ public: ...@@ -90,22 +90,22 @@ public:
// Description: // Description:
// Enable/Disable bolding annotation text. // Enable/Disable bolding annotation text.
vtkSetMacro(Bold, int); vtkSetMacro(Bold, bool);
vtkGetMacro(Bold, int); vtkGetMacro(Bold, bool);
vtkBooleanMacro(Bold, int); vtkBooleanMacro(Bold, bool);
// Description: // Description:
// Enable/Disable italicizing annotation text. // Enable/Disable italicizing annotation text.
vtkSetMacro(Italic, int); vtkSetMacro(Italic, bool);
vtkGetMacro(Italic, int); vtkGetMacro(Italic, bool);
vtkBooleanMacro(Italic, int); vtkBooleanMacro(Italic, bool);
// Description: // Description:
// Enable/Disable creating shadows on the annotation text. Shadows make // Enable/Disable creating shadows on the annotation text. Shadows make
// the text easier to read. // the text easier to read.
vtkSetMacro(Shadow, int); vtkSetMacro(Shadow, bool);
vtkGetMacro(Shadow, int); vtkGetMacro(Shadow, bool);
vtkBooleanMacro(Shadow, int); vtkBooleanMacro(Shadow, bool);
// Description: // Description:
// Set/Get the font family for the annotation text. Three font types // Set/Get the font family for the annotation text. Three font types
...@@ -129,9 +129,9 @@ public: ...@@ -129,9 +129,9 @@ public:
// Description: // Description:
// Set/Get the visibility of the title annotation text. // Set/Get the visibility of the title annotation text.
vtkSetMacro(TitleVisibility, int); vtkSetMacro(TitleVisibility, bool);
vtkGetMacro(TitleVisibility, int); vtkGetMacro(TitleVisibility, bool);
vtkBooleanMacro(TitleVisibility, int); vtkBooleanMacro(TitleVisibility, bool);
vtkTextProperty * GetTitleProperty() vtkTextProperty * GetTitleProperty()
{ return this->TitleMapper->GetTextProperty();}; { return this->TitleMapper->GetTextProperty();};
...@@ -146,9 +146,9 @@ public: ...@@ -146,9 +146,9 @@ public:
// Description: // Description:
// Set/Get the visibility of the bounding box. // Set/Get the visibility of the bounding box.
vtkSetMacro(BoundingBoxVisibility, int); vtkSetMacro(BoundingBoxVisibility, bool);
vtkGetMacro(BoundingBoxVisibility, int); vtkGetMacro(BoundingBoxVisibility, bool);
vtkBooleanMacro(BoundingBoxVisibility, int); vtkBooleanMacro(BoundingBoxVisibility, bool);
// Description: // Description:
// Set the bounding box color // Set the bounding box color
...@@ -165,9 +165,9 @@ protected: ...@@ -165,9 +165,9 @@ protected:
void BuildLine(vtkViewport *); void BuildLine(vtkViewport *);
void BuildBoundingBox(vtkViewport *); void BuildBoundingBox(vtkViewport *);
int Bold; bool Bold;
int Italic; bool Italic;
int Shadow; bool Shadow;
int FontFamily; int FontFamily;
double FontHeight; double FontHeight;
...@@ -178,9 +178,9 @@ protected: ...@@ -178,9 +178,9 @@ protected:
char *Title; char *Title;
vtkTextMapper *TitleMapper; vtkTextMapper *TitleMapper;
vtkActor2D *TitleActor; vtkActor2D *TitleActor;
int TitleVisibility;