Commit d381cc7a authored by loring's avatar loring
Browse files

fix bounding box visibility issue introduced in r27514


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27571 18c085ea-50e0-402c-830e-de6fd14e8384
parent 2e1621e3
......@@ -59,7 +59,7 @@ class vtkOutlineSource;
// This is a concrete colleague for the mediator VisWindow. It places
// a 3D axes around the bounding box for the plots.
//
// Programmer: Kathleen Bonnell
// Programmer: Kathleen Bonnell
// Creation: June 28, 2001
//
// Modifications:
......@@ -67,14 +67,14 @@ class vtkOutlineSource;
// Kathleen Bonnell, Fri Aug 3 14:55:59 PDT 2001
// Changed from using a 2d cube axes actor to using a 3d version.
//
// Kathleen Bonnell, Tue Oct 30 10:30:10 PST 2001
// Kathleen Bonnell, Tue Oct 30 10:30:10 PST 2001
// Moved AdjustValues, AdjustRange and related members to the
// more appropriate location of vtkVisItCubeAxesActor
//
// Kathleen Bonnell, Wed May 28 15:52:32 PDT 2003
// Added method 'ReAddToWindow'.
//
// Kathleen Bonnell, Tue Dec 16 11:34:33 PST 2003
// Kathleen Bonnell, Wed May 28 15:52:32 PDT 2003
// Added method 'ReAddToWindow'.
//
// Kathleen Bonnell, Tue Dec 16 11:34:33 PST 2003
// Added method 'SetLabelScaling'.
//
// Brad Whitlock, Thu Jul 28 10:10:40 PDT 2005
......@@ -82,7 +82,7 @@ class vtkOutlineSource;
//
// Brad Whitlock, Tue Mar 25 16:27:40 PDT 2008
// Added methods for line width, font, font size.
//
//
// Eric Brugger, Wed Oct 15 13:05:33 PDT 2008
// Added SetAutoSetTicks, SetMajorTickMinimum, SetMajorTickMaximum,
// SetMajorTickSpacing and SetMinorTickSpacing.
......@@ -96,6 +96,9 @@ class vtkOutlineSource;
// Hank Childs, Mon May 23 13:26:09 PDT 2011
// Add method for overriding bounding box location.
//
// Burlen Loring, Wed Oct 21 15:23:16 PDT 2015
// I added a get method to query actor visibility.
//
// ****************************************************************************
class VISWINDOW_API VisWinAxes3D : public VisWinColleague
......@@ -130,6 +133,7 @@ class VISWINDOW_API VisWinAxes3D : public VisWinColleague
void SetYGridVisibility(int);
void SetZGridVisibility(int);
void SetVisibility(int);
int GetVisibility(){ return visibility; }
void SetAutoSetTicks(int);
void SetMajorTickMinimum(double, double, double);
void SetMajorTickMaximum(double, double, double);
......@@ -149,11 +153,11 @@ class VISWINDOW_API VisWinAxes3D : public VisWinColleague
void SetLineWidth(int);
void SetTitleTextAttributes(
const VisWinTextAttributes &xAxis,
const VisWinTextAttributes &xAxis,
const VisWinTextAttributes &yAxis,
const VisWinTextAttributes &zAxis);
void SetLabelTextAttributes(
const VisWinTextAttributes &xAxis,
const VisWinTextAttributes &xAxis,
const VisWinTextAttributes &yAxis,
const VisWinTextAttributes &zAxis);
......
......@@ -2130,6 +2130,11 @@ VisWindow::Realize(void)
// remove non-distributed geometry, such as axes, during order
// compositing.
//
// Burlen Loring, Wed Oct 21 15:06:58 PDT 2015
// do not alter axes visibility, note, not doing this for others
// for now because previously they hadn't made use of vtk actor
// visibility so actors were always visibible
//
// ****************************************************************************
void
......@@ -2137,10 +2142,12 @@ VisWindow::ScreenRender(
bool doViewportOnly, bool doZBufferToo, bool doOpaque,
bool doTranslucent, bool disableBackground, avtImage_p input)
{
int axesVis = axes3D->GetVisibility();
if (disableBackground)
{
// remove non-distributed geometry from the render
axes3D->SetVisibility(0);
if (axesVis)
axes3D->SetVisibility(0);
tools->SetVisibility(0);
annotations->SetVisibility(0);
}
......@@ -2152,7 +2159,8 @@ VisWindow::ScreenRender(
if (disableBackground)
{
// restore non-distributed geometry
axes3D->SetVisibility(1);
if (axesVis)
axes3D->SetVisibility(1);
tools->SetVisibility(1);
annotations->SetVisibility(1);
}
......
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