Commit 7c267384 authored by whitlocb's avatar whitlocb

Merge a lineout coordinate precision fix to the trunk.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@19947 18c085ea-50e0-402c-830e-de6fd14e8384
parent e3da52df
......@@ -391,6 +391,13 @@ avtLineoutFilter::PostExecute(void)
// Kathleen Bonnell, Thu Mar 6 09:07:33 PST 2008
// Removed unused variable.
//
// Brad Whitlock, Mon Jan 7 14:15:45 PST 2013
// Use VTK_FLOAT as the minimum precision for the rgrid and then adjust
// upward to VTK_DOUBLE if the input coordinates or scalar use that type.
// This fixes a bug that could cause the rgrid to be created using int
// coordinates if the field was int. That becomes a problem with small
// coordinates!
//
// ****************************************************************************
vtkRectilinearGrid *
......@@ -413,7 +420,9 @@ avtLineoutFilter::CreateRGrid(vtkDataSet *ds, double *pt1, double *pt2,
int npts = pts->GetNumberOfPoints();
int ptsType = pts->GetDataType();
int sType = scalars->GetDataType();
int dType = (sType < ptsType ? sType : ptsType);
int dType = VTK_FLOAT;
if(ptsType == VTK_DOUBLE || sType == VTK_DOUBLE)
dType == VTK_DOUBLE;
vtkRectilinearGrid *rgrid = vtkVisItUtility::Create1DRGrid(0, dType);
vtkDataArray *outXC = rgrid->GetXCoordinates();
vtkDataArray *outVal = outXC->NewInstance();
......@@ -864,6 +873,13 @@ avtLineoutFilter::Sampling(vtkDataSet *in_ds, int domain)
// Renamed Point struct to IntersectionPoint to avoid namespace conflict
// with a file in common/state.
//
// Brad Whitlock, Mon Jan 7 14:15:45 PST 2013
// Use VTK_FLOAT as the minimum precision for the rgrid and then adjust
// upward to VTK_DOUBLE if the input coordinates or scalar use that type.
// This fixes a bug that could cause the rgrid to be created using int
// coordinates if the field was int. That becomes a problem with small
// coordinates!
//
// ****************************************************************************
vtkRectilinearGrid *
......@@ -938,7 +954,9 @@ avtLineoutFilter::CreateRGridFromOrigCells(vtkDataSet *ds, double *pt1,
int ptsType = pts->GetDataType();
int sType = scalars->GetDataType();
int dType = (sType < ptsType ? sType : ptsType);
int dType = VTK_FLOAT;
if(ptsType == VTK_DOUBLE || sType == VTK_DOUBLE)
dType == VTK_DOUBLE;
vtkRectilinearGrid *rgrid = vtkVisItUtility::Create1DRGrid(0, dType);
vtkDataArray *outXC = rgrid->GetXCoordinates();
......
......@@ -31,6 +31,7 @@ list of changes in release 2.6.</p>
<li>The launch script was too aggressive about using the loopback interface when launching parallel compute engines on a local node. This interfered with the compute engine's ability to connect back to the viewer when run on a different node in a cluster from where the viewer was running. This problem was limited to running a parallel job on a login node or in an mxterm.</li>
</ul>
</li>
<li>Performing a <i>Lineout</i> query on an integer field caused the resulting curve to also use integer precision for its coordinates. This prevented the curve from storing correct coordinates for fractional values.</li>
<li>The DDCMD file format reader was fixed so it can read sets of files whose aggregate size exceeds 4Gb.</li>
<li>The XRay Image Query has had several bugs corrected that sometimes resulted in artifacts in the output images. The artifacts occured when the cells had faces with small areas (less than approximately 1e-5) or where there were cells with quadrilateral faces that were non-planar.</li>
<li>The compute engine's cell count variables were changed from integer to long precision. This fixes a problem where having over 1 billion cells in a dataset could cause the engine to think it was scalable rendering mode but never send back an image to the viewer.</li>
......
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