Commit c282d157 authored by Will Schroeder's avatar Will Schroeder Committed by David Partyka
Browse files

Fixed warnings SetProp->SetProp3D

Change-Id: Ifc00c4bec998ad1dc075cd5412474e071b8fabd3
parent 4cebcaac
......@@ -275,7 +275,7 @@ int TestFollowerPicking( int argc, char* argv[] )
ia->SetScale(0.01,0.01,0.01);
VTK_CREATE(vtkProp3DFollower,p3dFollower);
p3dFollower->SetProp(ia);
p3dFollower->SetProp3D(ia);
// Debugging code
VTK_CREATE(vtkPlaneSource, plane2);
......
......@@ -57,7 +57,7 @@ vtkProp3DFollower::~vtkProp3DFollower()
}
//----------------------------------------------------------------------------
void vtkProp3DFollower::SetProp(vtkProp3D *prop)
void vtkProp3DFollower::SetProp3D(vtkProp3D *prop)
{
if (this->Device != prop)
{
......@@ -76,7 +76,7 @@ void vtkProp3DFollower::SetProp(vtkProp3D *prop)
//----------------------------------------------------------------------------
vtkProp3D *vtkProp3DFollower::GetProp()
vtkProp3D *vtkProp3DFollower::GetProp3D()
{
return this->Device;
}
......
......@@ -51,8 +51,8 @@ class VTK_RENDERING_EXPORT vtkProp3DFollower : public vtkProp3D
// Description:
// Set/Get the vtkProp3D to control (i.e., face the camera).
virtual void SetProp(vtkProp3D *prop);
virtual vtkProp3D *GetProp();
virtual void SetProp3D(vtkProp3D *prop);
virtual vtkProp3D *GetProp3D();
// Description:
// Set/Get the camera to follow. If this is not set, then the follower
......
......@@ -26,6 +26,7 @@ std::string vtkTestingInteractor::ValidBaseline;
std::string vtkTestingInteractor::TempDirectory;
std::string vtkTestingInteractor::DataDirectory;
//----------------------------------------------------------------------------------
// Start normally starts an event loop. This interator uses vtkTesting
// to grab the render window and compare the results to a baseline image
void vtkTestingInteractor::Start()
......@@ -50,3 +51,11 @@ void vtkTestingInteractor::Start()
vtkTestingInteractor::TestReturnStatus =
testing->RegressionTest(vtkTestingInteractor::ErrorThreshold);
}
//----------------------------------------------------------------------------------
void vtkTestingInteractor::PrintSelf(ostream& os, vtkIndent indent)
{
//Superclass typedef defined in vtkTypeMacro() found in vtkSetGet.h
this->Superclass::PrintSelf(os,indent);
}
......@@ -33,8 +33,15 @@
class VTK_RENDERING_EXPORT vtkTestingInteractor : public vtkRenderWindowInteractor
{
public:
// Description:
// Standard object factory instantiation method.
static vtkTestingInteractor* New();
// Description:
// Type and printing information.
vtkTypeMacro(vtkTestingInteractor,vtkRenderWindowInteractor);
void PrintSelf(ostream& os, vtkIndent indent);
virtual void Start();
static int TestReturnStatus; // Return status of the test
......
......@@ -358,7 +358,7 @@ int TestProp3DFollower( int argc, char* argv[] )
volume->SetOrigin(-32,-32,-32);
VTK_CREATE(vtkProp3DFollower,vFollower);
vFollower->SetProp(volume);
vFollower->SetProp3D(volume);
// Picking callback
VTK_CREATE(vtkPickFollowerCallback, myCallback);
......
......@@ -81,7 +81,7 @@ void vtkProp3DButtonRepresentation::SetState(int state)
this->Superclass::SetState(state);
this->CurrentProp = this->GetButtonProp(this->State);
this->Follower->SetProp(this->CurrentProp);
this->Follower->SetProp3D(this->CurrentProp);
this->Picker->InitializePickList();
this->Picker->AddPickList(this->CurrentProp);
......@@ -227,7 +227,7 @@ void vtkProp3DButtonRepresentation::BuildRepresentation()
if ( this->FollowCamera )
{
this->Follower->SetCamera(this->Renderer->GetActiveCamera());
this->Follower->SetProp(this->CurrentProp);
this->Follower->SetProp3D(this->CurrentProp);
this->Follower->SetOrigin((*iter).second.Origin);
this->Follower->SetPosition((*iter).second.Translation);
this->Follower->SetScale((*iter).second.Scale);
......
......@@ -135,7 +135,7 @@ GetButtonTexture(int i)
void vtkTexturedButtonRepresentation2D::PlaceWidget(double bds[6])
{
int i;
double bounds[6], center[3], aBds[6], aCenter[3];
double bounds[6], center[3];
this->AdjustBounds(bds, bounds, center);
for (i=0; i<6; i++)
......@@ -156,7 +156,8 @@ void vtkTexturedButtonRepresentation2D::PlaceWidget(double bds[6])
e[0] = static_cast<double>(bounds[0]);
e[1] = static_cast<double>(bounds[2]);
this->Balloon->StartWidgetInteraction(e);
this->Balloon->SetImageSize(bounds[1]-bounds[0],bounds[3]-bounds[2]);
this->Balloon->SetImageSize(static_cast<int>(bounds[1]-bounds[0]),
static_cast<int>(bounds[3]-bounds[2]));
}
//-------------------------------------------------------------------------
......
Supports Markdown
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