Commit 92b00695 authored by Dave Partyka's avatar Dave Partyka
Browse files

BUG: merge visibility fixes for the Box Widget from Yumin.

parent 92df7f1c
...@@ -542,6 +542,12 @@ int BoxWidget2( int , char *[] ) ...@@ -542,6 +542,12 @@ int BoxWidget2( int , char *[] )
// testing option fails. // testing option fails.
recorder->Off(); recorder->Off();
boxRep->SetPlaceFactor( 1.0 );
boxRep->HandlesOff();
boxRep->SetPlaceFactor( 1.25 );
boxRep->HandlesOn();
iren->Start(); iren->Start();
// Clean up // Clean up
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "vtkObjectFactory.h" #include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkBoxRepresentation, "1.9"); vtkCxxRevisionMacro(vtkBoxRepresentation, "1.9.2.1");
vtkStandardNewMacro(vtkBoxRepresentation); vtkStandardNewMacro(vtkBoxRepresentation);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
...@@ -1101,9 +1101,12 @@ int vtkBoxRepresentation::RenderOpaqueGeometry(vtkViewport *v) ...@@ -1101,9 +1101,12 @@ int vtkBoxRepresentation::RenderOpaqueGeometry(vtkViewport *v)
count += this->HexFace->RenderOpaqueGeometry(v); count += this->HexFace->RenderOpaqueGeometry(v);
// render the handles // render the handles
for (int j=0; j<7; j++) for (int j=0; j<7; j++)
{
if(this->Handle[j]->GetVisibility())
{ {
count += this->Handle[j]->RenderOpaqueGeometry(v); count += this->Handle[j]->RenderOpaqueGeometry(v);
} }
}
return count; return count;
} }
...@@ -1119,9 +1122,12 @@ int vtkBoxRepresentation::RenderTranslucentPolygonalGeometry(vtkViewport *v) ...@@ -1119,9 +1122,12 @@ int vtkBoxRepresentation::RenderTranslucentPolygonalGeometry(vtkViewport *v)
count += this->HexFace->RenderTranslucentPolygonalGeometry(v); count += this->HexFace->RenderTranslucentPolygonalGeometry(v);
// render the handles // render the handles
for (int j=0; j<7; j++) for (int j=0; j<7; j++)
{
if(this->Handle[j]->GetVisibility())
{ {
count += this->Handle[j]->RenderTranslucentPolygonalGeometry(v); count += this->Handle[j]->RenderTranslucentPolygonalGeometry(v);
} }
}
return count; return count;
} }
......
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