Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
1faa5ab
Initial support for tiled rendering. 3D image and user information.
Feb 2, 2026
0d2fad2
Add tiled rendering support for the database information.
Feb 3, 2026
8c1e925
Add some debugging print statements.
Feb 5, 2026
ec0b8fe
Add tiled rendering support for the levels legend.
Feb 6, 2026
10e6ded
Add tiled rendering support for the triad.
Mar 3, 2026
44c17a1
Enhance the VisWindow to support tiled rendering.
Mar 3, 2026
9752800
Remove a debugging print statement.
Mar 3, 2026
92956ff
Add tiled rendering support for the variable and curve legends.
Mar 3, 2026
3e810bf
Restore the size, view3d, and the foreground camera after doing tiled…
Mar 20, 2026
17db720
Add tiled rendering support for 2d text annotations.
Mar 20, 2026
67e4129
Add tiled rendering support for 2d line annotations.
Apr 8, 2026
922cac8
Add tiled rendering support for the time slider.
Apr 9, 2026
16972f6
Add tiled rendering support for image annotations.
Apr 10, 2026
81fe459
Add tiled rendering width and height to the rendering attributes.
Apr 10, 2026
ee88c51
Add logic to propogate tiled rendering width and height to the engine.
Apr 10, 2026
6f7544c
Switch line2d annotation back to using vtkActor2D. Clean up line2d an…
Apr 14, 2026
3d1dba7
Switch 2d line annotation back to avtActor from avtActor2D since I fo…
Apr 14, 2026
21a2909
Remove some unnecessary code from the 2d line annotation.
Apr 14, 2026
ebd6f9c
Clean up the 2d text annotation code.
Apr 15, 2026
6e580f5
Clean up the code in avtTimeSliderColleague.
Apr 16, 2026
0a5559a
Clean up the code in VisWinAnnotations.
Apr 16, 2026
c231555
Clean up the code in VisWinLegends.
Apr 16, 2026
89b579c
Clean up the code in VisWinTriad.
Apr 16, 2026
dedd502
Clean up the code in VisWinUserInfo.
Apr 16, 2026
01eaed5
Clean up the code in VisWindowColleagueProxy.
Apr 16, 2026
2d54746
Clean up the code in VisWindow.
Apr 16, 2026
babbcf2
Add back some code to VisWindow that I thought I could remove.
Apr 16, 2026
56a42dc
Clean up the code in avtImageColleague.
Apr 16, 2026
7ce2cb5
Replace Add/Remove Actor2d with Add/Remove WinProp.
Apr 16, 2026
9229763
Clean up the code in avtLevelsLegend.
Apr 16, 2026
61a5d51
Update the default tile width and height to 2048 in the rendering att…
Apr 17, 2026
31a9e11
Clean up the code in ViewerWindow and ViewerWindowManager.
Apr 17, 2026
5aeba10
Merge branch 'develop' into task/brugger1/2026_01_12_tiled_rendering
markcmiller86 Apr 19, 2026
8e81af0
Partial cleanup of NetworkManager.
Apr 20, 2026
14752d3
Further cleanup of NetworkManager.
Apr 20, 2026
068f4fd
Further cleanup of NetworkManager.
Apr 20, 2026
3d16326
More cleanup for NetworkManager.
Apr 20, 2026
049c4cc
Update the release notes.
Apr 20, 2026
744dd21
Move release note update from 3.5.1 to 3.6 release.
Apr 20, 2026
73783ae
Replace Add/Remove Actor2D with Add/Remove ViewProp.
Apr 20, 2026
ab89a44
Add controls for setting the tiled rendering width and height to the …
Apr 21, 2026
7f5c542
Fix the tiled rendering of image based plots.
Apr 22, 2026
d756675
Fix bug with setting legend scale.
May 4, 2026
f1dffe7
Fix an indexing bug copying image tiles with alpha.
May 27, 2026
915b2d7
Initialize the scale and zoom in the volume variable legend.
May 28, 2026
1403477
Fix a bug with RedrawWindow not updating annotations.
Jun 1, 2026
97eb8b2
Fix a bug with scalable rendering.
Jun 1, 2026
48c7711
Fix some bugs with the copying of the image tiles.
Jun 3, 2026
33d6539
Skip tiled rendering if there is only a single tile.
Jun 3, 2026
98dfba7
Skip tiled rendering if we are in viewported mode.
Jun 8, 2026
cb30528
Update baseline images for serial mode.
Jun 8, 2026
b892958
Update a baseline I missed in my last commit.
Jun 8, 2026
299b8bd
Add a tiled mode to the regression suite.
Jun 15, 2026
dc54f7c
Fix a bug where the mesh plot offset was incorrect with tiled rendering.
Jun 15, 2026
b417842
Fix a bug where the label plot font size was incorrect with tiled ren…
Jun 22, 2026
6301055
Set image pan and zoom in avtViewInfo::SetViewFromCamera.
Jun 22, 2026
7f8baf0
Incorporate the focus, parallelScale, image pan and zoom in label plo…
Jun 22, 2026
091e838
Correct a bug in the bin calculation with the label plot.
Jun 24, 2026
5145d5e
Modify the Label plot to bin across the entire image.
Jun 24, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/avt/Plotter/avtActor.C
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,27 @@ avtActor::UpdateScaleFactor()
}


// ****************************************************************************
// Method: avtActor::SetTileZoom
//
// Purpose:
// Set the tile zoom in the drawable.
//
// Programmer: Eric Brugger
// Creation: Mon Feb 2 14:37:47 PST 2026
//
// ****************************************************************************

void
avtActor::SetTileZoom(const double tileZoom)
{
if (*(drawable) != NULL)
{
drawable->SetTileZoom(tileZoom);
}
}


// ****************************************************************************
// Method: avtActor::TurnLightingOn
//
Expand Down
5 changes: 5 additions & 0 deletions src/avt/Plotter/avtActor.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ class avtTransparencyActor;
// Kathleen Biagas, Thu Aug 28 15:26:21 PDT 2025
// Remove SetSurfaceRepresentation, it is no longer used.
//
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// Added SetTileZoom to pass the tile zoom to the drawable to support
// tiled rendering.
//
// ****************************************************************************

class PLOTTER_API avtActor
Expand Down Expand Up @@ -144,6 +148,7 @@ class PLOTTER_API avtActor
void ShiftByVector(const double [3]);
void ScaleByVector(const double [3]);
void UpdateScaleFactor();
void SetTileZoom(const double);

void VisibilityOn(void);
void VisibilityOff(void);
Expand Down
38 changes: 37 additions & 1 deletion src/avt/Plotter/avtCurveLegend.C
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
// Brad Whitlock, Thu Mar 22 00:12:00 PDT 2007
// Initialize scale and titleVisibility.
//
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// Initialize zoom.
//
// ****************************************************************************

avtCurveLegend::avtCurveLegend()
Expand All @@ -31,6 +34,7 @@ avtCurveLegend::avtCurveLegend()

scale[0] = 1.;
scale[1] = 1.;
zoom = 1.;
size[0] = 0.08;
size[1] = 0.26;
titleVisibility = true;
Expand Down Expand Up @@ -172,6 +176,34 @@ avtCurveLegend::SetLegendScale(double xScale, double yScale)
scale[1] = yScale;
}

// ****************************************************************************
// Method: avtCurveLegend::SetLegendZoom
//
// Purpose:
// Set the legend zoom.
//
// Arguments:
// _zoom : The zoom factor.
//
// Programmer: Eric Brugger
// Creation: Mon Feb 2 14:37:47 PST 2026
//
// Modifications:
//
// ****************************************************************************

void
avtCurveLegend::SetLegendZoom(double _zoom)
{
// Scale the color bar
double colorBarScale = lineLegend->GetBarWidth() / zoom;
colorBarScale *= _zoom;
lineLegend->SetBarWidth(colorBarScale);

// Save the zoom.
zoom = _zoom;
}

// ****************************************************************************
// Method: avtCurveLegend::SetBoundingBoxVisibility
//
Expand Down Expand Up @@ -263,12 +295,16 @@ avtCurveLegend::SetFont(int family, bool bold, bool italic, bool shadow)
// Brad Whitlock, Thu Mar 22 00:15:01 PDT 2007
// Set the position2.
//
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// I changed the routine to plot the data in world coordinates instead of
// normalized viewport coordinates to support tiled rendering.
//
// ****************************************************************************

void
avtCurveLegend::ChangePosition(double x, double y)
{
lineLegend->GetPositionCoordinate()->SetCoordinateSystemToNormalizedViewport();
lineLegend->GetPositionCoordinate()->SetCoordinateSystemToWorld();
lineLegend->GetPositionCoordinate()->SetValue(x, y, 0.);

// Set the position 2, incorporating the scale.
Expand Down
5 changes: 5 additions & 0 deletions src/avt/Plotter/avtCurveLegend.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ class vtkLineLegend;
// Brad Whitlock, Thu Mar 22 00:03:26 PDT 2007
// Added methods for controlling some more properties.
//
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// Add SetLegendZoom.
//
// ****************************************************************************

class PLOTTER_API avtCurveLegend : public avtLegend
Expand All @@ -44,6 +47,7 @@ class PLOTTER_API avtCurveLegend : public avtLegend
virtual bool GetTitleVisibility() const;

virtual void SetLegendScale(double xScale, double yScale);
virtual void SetLegendZoom(double _zoom);
virtual void SetBoundingBoxVisibility(bool);
virtual void SetBoundingBoxColor(const double *);
virtual void SetFont(int family, bool bold, bool italic, bool shadow);
Expand All @@ -55,6 +59,7 @@ class PLOTTER_API avtCurveLegend : public avtLegend
protected:
vtkLineLegend *lineLegend;
double scale[2];
double zoom;
bool titleVisibility;

virtual void ChangePosition(double, double);
Expand Down
6 changes: 6 additions & 0 deletions src/avt/Plotter/avtDrawable.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ class avtTransparencyActor;
// Kathleen Biagas, Thu Aug 28 15:28:06 PDT 2025
// Remove SetSurfaceRepresentation, no longer used.
//
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// Added SetTileZoom to pass the tile zoom to the mapper to support
// tiled rendering.
//
// ****************************************************************************

class PLOTTER_API avtDrawable
Expand All @@ -104,6 +108,8 @@ class PLOTTER_API avtDrawable
virtual void ShiftByVector(const double [3]) = 0;
virtual void ScaleByVector(const double [3]) = 0;
virtual void UpdateScaleFactor(void) = 0;
virtual void SetTileZoom(const double) {;}


virtual void TurnLightingOn(void) = 0;
virtual void TurnLightingOff(void) = 0;
Expand Down
18 changes: 18 additions & 0 deletions src/avt/Plotter/avtGeometryDrawable.C
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,24 @@ avtGeometryDrawable::UpdateScaleFactor()
}


// ****************************************************************************
// Method: avtGeometryDrawable::SetTileZoom
//
// Purpose:
// Set the tile zoom in the mapper.
//
// Programmer: Eric Brugger
// Creation: Mon Feb 2 14:37:47 PST 2026
//
// ****************************************************************************

void
avtGeometryDrawable::SetTileZoom(const double tileZoom)
{
mapper->SetTileZoom(tileZoom);
}


// ****************************************************************************
// Method: avtGeometryDrawable::TurnLightingOn
//
Expand Down
5 changes: 5 additions & 0 deletions src/avt/Plotter/avtGeometryDrawable.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ class ColorAttribute;
// Kathleen Biagas, Thu Aug 28 15:28:06 PDT 2025
// Remove SetSurfaceRepresentation, no longer used.
//
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// Added SetTileZoom to pass the tile zoom to the mapper to support
// tiled rendering.
//
// ****************************************************************************

class PLOTTER_API avtGeometryDrawable : public avtDrawable
Expand All @@ -102,6 +106,7 @@ class PLOTTER_API avtGeometryDrawable : public avtDrawable
virtual void ShiftByVector(const double [3]);
virtual void ScaleByVector(const double [3]);
virtual void UpdateScaleFactor(void);
virtual void SetTileZoom(const double);

virtual void TurnLightingOn(void);
virtual void TurnLightingOff(void);
Expand Down
27 changes: 25 additions & 2 deletions src/avt/Plotter/avtLegend.C
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,17 @@ avtLegend::~avtLegend()
// Kathleen Bonnell, Thu Aug 12 13:07:29 PDT 2004
// Only add if globalVisibility is true.
//
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// Switched to using AddViewProp.
//
// ****************************************************************************

void
avtLegend::Add(vtkRenderer *ren)
{
if (globalVisibility && legendOn && !currentlyDrawn)
{
ren->AddActor2D(legend);
ren->AddViewProp(legend);
currentlyDrawn = true;
}
renderer = ren;
Expand All @@ -145,14 +148,18 @@ avtLegend::Add(vtkRenderer *ren)
// Programmer: Hank Childs
// Creation: October 4, 2000
//
// Modifications:
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// Switched to using RemoveViewProp.
//
// ****************************************************************************

void
avtLegend::Remove(void)
{
if (currentlyDrawn)
{
renderer->RemoveActor2D(legend);
renderer->RemoveViewProp(legend);
renderer = NULL;
currentlyDrawn = false;
}
Expand Down Expand Up @@ -455,6 +462,22 @@ avtLegend::SetLegendScale(double xScale, double yScale)
// Do nothing
}

// ****************************************************************************
// Method: avtLegend::SetLegendZoom
//
// Programmer: Eric Brugger
// Creation: Mon Feb 2 14:37:47 PST 2026
//
// Modifications:
//
// ****************************************************************************

void
avtLegend::SetLegendZoom(double zoom)
{
// Do nothing
}

// ****************************************************************************
// Method: avtLegend::SetBoundingBoxVisibility
//
Expand Down
4 changes: 4 additions & 0 deletions src/avt/Plotter/avtLegend.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ class vtkRenderer;
// Kathleen Biagas, Thu May 20, 2021
// Add support for custom title.
//
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// Add SetLegendZoom.
//
// ****************************************************************************

class PLOTTER_API avtLegend
Expand Down Expand Up @@ -105,6 +108,7 @@ class PLOTTER_API avtLegend
virtual void SetNumberFormat(const char *);

virtual void SetLegendScale(double xScale, double yScale);
virtual void SetLegendZoom(double zoom);
virtual void SetBoundingBoxVisibility(bool);
virtual void SetBoundingBoxColor(const double *);
virtual void SetOrientation(LegendOrientation);
Expand Down
38 changes: 37 additions & 1 deletion src/avt/Plotter/avtLevelsLegend.C
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,17 @@
// Hank Childs, Fri Jan 23 15:43:43 PST 2009
// Initialize minmaxVisibility.
//
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// Initialize zoom.
//
// ****************************************************************************

avtLevelsLegend::avtLevelsLegend()
{
min = 0.;
max = 1.;
scale[0] = scale[1] = 1.;
zoom = 1.;
maxScale = 1.;
setMaxScale = true;

Expand Down Expand Up @@ -389,6 +393,34 @@ avtLevelsLegend::SetLegendScale(double xScale, double yScale)
scale[1] = yScale;
}

// ****************************************************************************
// Method: avtLevelsLegend::SetLegendZoom
//
// Purpose:
// Set the legend zoom.
//
// Arguments:
// _zoom : The zoom factor.
//
// Programmer: Eric Brugger
// Creation: Mon Feb 2 14:37:47 PST 2026
//
// Modifications:
//
// ****************************************************************************

void
avtLevelsLegend::SetLegendZoom(double _zoom)
{
// Scale the color bar
double colorBarScale = sBar->GetBarWidth() / zoom;
colorBarScale *= _zoom;
sBar->SetBarWidth(colorBarScale);

// Save the zoom.
zoom = _zoom;
}

// ****************************************************************************
// Method: avtLevelsLegend::SetBoundingBoxVisibility
//
Expand Down Expand Up @@ -740,12 +772,16 @@ avtLevelsLegend::SetVarRange(double nmin, double nmax)
// Brad Whitlock, Wed Mar 21 21:46:36 PST 2007
// Set position2.
//
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// I changed the routine to plot the data in world coordinates instead of
// normalized viewport coordinates to support tiled rendering.
//
// ****************************************************************************

void
avtLevelsLegend::ChangePosition(double x, double y)
{
sBar->GetPositionCoordinate()->SetCoordinateSystemToNormalizedViewport();
sBar->GetPositionCoordinate()->SetCoordinateSystemToWorld();
sBar->GetPositionCoordinate()->SetValue(x, y, 0.);

// Set the position 2, incorporating the scale.
Expand Down
5 changes: 5 additions & 0 deletions src/avt/Plotter/avtLevelsLegend.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ class vtkLookupTable;
// Added methods and ivars that allow more user control of tick marks
// and tick labels.
//
// Eric Brugger, Mon Feb 2 14:37:47 PST 2026
// Add SetLegendZoom.
//
// ****************************************************************************

class PLOTTER_API avtLevelsLegend : public avtLegend
Expand All @@ -96,6 +99,7 @@ class PLOTTER_API avtLevelsLegend : public avtLegend
virtual bool GetMinMaxVisibility() const;

virtual void SetLegendScale(double xScale, double yScale);
virtual void SetLegendZoom(double _zoom);
virtual void SetBoundingBoxVisibility(bool);
virtual void SetBoundingBoxColor(const double *);
virtual void SetOrientation(LegendOrientation);
Expand Down Expand Up @@ -123,6 +127,7 @@ class PLOTTER_API avtLevelsLegend : public avtLegend
double min, max;
int nLevels;
double scale[2];
double zoom;
double maxScale;
bool setMaxScale;

Expand Down
Loading