Commit 088397fe authored by bonnell's avatar bonnell

Added logic so that avtActualExtentsFilter can get data extents for nodal data...

Added logic so that avtActualExtentsFilter can get data extents for nodal data from connected nodes only.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23379 18c085ea-50e0-402c-830e-de6fd14e8384
parent 37e4e51b
This diff is collapsed.
......@@ -138,6 +138,9 @@ class vtkDataArray;
// Kathleen Biagas, Mon Jan 28 10:06:01 PST 2013
// Remove no longer used method CUpdateData.
//
// Kathleen Biagas, Wed May 28 17:25:57 MST 2014
// Added connectedNodesOnly to GetVariableRangeArgs.
//
// ****************************************************************************
//
......@@ -238,6 +241,7 @@ typedef struct
{
double *extents;
const char *varname;
bool connectedNodesOnly;
} GetVariableRangeArgs;
typedef struct
......
......@@ -313,11 +313,15 @@ avtDatasetExaminer::GetSpatialExtents(std::vector<avtDataTree_p> &l,double *se)
// Hank Childs, Fri Jun 9 13:25:31 PDT 2006
// Remove unused variable
//
// Kathleen Biagas, Wed May 28 17:38:40 MST 2014
// Added connectedNodesOnly.
//
// ****************************************************************************
bool
avtDatasetExaminer::GetDataExtents(avtDataset_p &ds, double *de,
const char *varname)
const char *varname,
bool connectedNodesOnly)
{
if (*ds == NULL || *(ds->GetDataTree()) == NULL)
return false;
......@@ -336,6 +340,7 @@ avtDatasetExaminer::GetDataExtents(avtDataset_p &ds, double *de,
GetVariableRangeArgs gvra;
gvra.varname = varname;
gvra.extents = de;
gvra.connectedNodesOnly = connectedNodesOnly;
if (*dataTree != NULL)
{
dataTree->Traverse(CGetDataExtents, (void *) &gvra, foundExtents);
......
......@@ -87,6 +87,10 @@ class vtkDataArray;
// Hank Childs, Fri May 21 11:22:21 CDT 2010
// Added CalculateHistogram.
//
// Kathleen Biagas, Wed May 28 17:37:30 MST 2014
// Added 'connecteNodesOnly' to GetDataExtents. Meant to be set to true
// if actual extents are desired.
//
// ****************************************************************************
class PIPELINE_API avtDatasetExaminer
......@@ -103,7 +107,8 @@ class PIPELINE_API avtDatasetExaminer
static bool GetSpatialExtents(std::vector<avtDataTree_p> &,
double *);
static bool GetDataExtents(avtDataset_p &, double *,
const char * = NULL);
const char * = NULL,
bool connectedNodesOnly=false);
static void FindMinimum(avtDataset_p &, double *, double &);
static void FindMaximum(avtDataset_p &, double *, double &);
static bool FindZone(avtDataset_p &, int, int, double *);
......
......@@ -39,6 +39,7 @@ list of changes in release 2.7.</p>
<li>The internal launcher was modified so that VisIt would work on systems where the OpenGL libraries were located in the LD_LIBRARY_PATH.</li>
<li>The VisItSetMPICommunicator() function in libsim was fixed.</li>
<li>Datalevel comparison wizard was fixed so that it doesn't create expressions with nested <>.</li>
<li>Fixed a bug with Pseudocolor plot not using the correct data extents when Material selection appled and 'Current Plot' option chosen.</li>
</ul>
<p><b><font size="4">Enhancements in version 2.7.3</font></b></p>
......
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