Commit 6334364d authored by ghweber's avatar ghweber
Browse files

Fixed problem in HDF5_FastQuer that extents were always returned for time step...

Fixed problem in HDF5_FastQuer that extents were always returned for time step 0 causing problems for accelerated parallel coordinates via histograms.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12705 18c085ea-50e0-402c-830e-de6fd14e8384
parent fedcd089
...@@ -274,25 +274,25 @@ bool HDF5_FQ::getDataMinMax(const std::string& variableName, ...@@ -274,25 +274,25 @@ bool HDF5_FQ::getDataMinMax(const std::string& variableName,
switch (type) { switch (type) {
case BaseFileInterface::H5_Float: { case BaseFileInterface::H5_Float: {
float buff[2]; float buff[2];
ret = dataFile->getActualRange(variableName, 0, (void*)buff); ret = dataFile->getActualRange(variableName, timestep, (void*)buff);
*(float*)min = buff[0]; *(float*)min = buff[0];
*(float*)max = buff[1]; *(float*)max = buff[1];
break;} break;}
case BaseFileInterface::H5_Double: { case BaseFileInterface::H5_Double: {
double buff[2]; double buff[2];
ret = dataFile->getActualRange(variableName, 0, (void*)buff); ret = dataFile->getActualRange(variableName, timestep, (void*)buff);
*(double*)min = buff[0]; *(double*)min = buff[0];
*(double*)max = buff[1]; *(double*)max = buff[1];
break;} break;}
case BaseFileInterface::H5_Int32: { case BaseFileInterface::H5_Int32: {
int32_t buff[2]; int32_t buff[2];
ret = dataFile->getActualRange(variableName, 0, (void*)buff); ret = dataFile->getActualRange(variableName, timestep, (void*)buff);
*(int32_t*)min = buff[0]; *(int32_t*)min = buff[0];
*(int32_t*)max = buff[1]; *(int32_t*)max = buff[1];
break;} break;}
case BaseFileInterface::H5_Int64: { case BaseFileInterface::H5_Int64: {
int64_t buff[2]; int64_t buff[2];
ret = dataFile->getActualRange(variableName, 0, (void*)buff); ret = dataFile->getActualRange(variableName, timestep, (void*)buff);
*(int64_t*)min = buff[0]; *(int64_t*)min = buff[0];
*(int64_t*)max = buff[1]; *(int64_t*)max = buff[1];
if (ret == true) if (ret == true)
...@@ -301,7 +301,7 @@ bool HDF5_FQ::getDataMinMax(const std::string& variableName, ...@@ -301,7 +301,7 @@ bool HDF5_FQ::getDataMinMax(const std::string& variableName,
break;} break;}
case BaseFileInterface::H5_Byte: { case BaseFileInterface::H5_Byte: {
char buff[2]; char buff[2];
ret = dataFile->getActualRange(variableName, 0, (void*)buff); ret = dataFile->getActualRange(variableName, timestep, (void*)buff);
*(char*)min = buff[0]; *(char*)min = buff[0];
*(char*)max = buff[1]; *(char*)max = buff[1];
break;} break;}
...@@ -324,25 +324,25 @@ bool HDF5_FQ::getDataMinMax_Double(const std::string& variableName, ...@@ -324,25 +324,25 @@ bool HDF5_FQ::getDataMinMax_Double(const std::string& variableName,
switch (type) { switch (type) {
case BaseFileInterface::H5_Float: { case BaseFileInterface::H5_Float: {
float buff[2]; float buff[2];
ret = dataFile->getActualRange(variableName, 0, (void*)buff); ret = dataFile->getActualRange(variableName, timestep, (void*)buff);
min = buff[0]; min = buff[0];
max = buff[1]; max = buff[1];
break;} break;}
case BaseFileInterface::H5_Double: { case BaseFileInterface::H5_Double: {
double buff[2]; double buff[2];
ret = dataFile->getActualRange(variableName, 0, (void*)buff); ret = dataFile->getActualRange(variableName, timestep, (void*)buff);
min = buff[0]; min = buff[0];
max = buff[1]; max = buff[1];
break;} break;}
case BaseFileInterface::H5_Int32: { case BaseFileInterface::H5_Int32: {
int32_t buff[2]; int32_t buff[2];
ret = dataFile->getActualRange(variableName, 0, (void*)buff); ret = dataFile->getActualRange(variableName, timestep, (void*)buff);
min = buff[0]; min = buff[0];
max = buff[1]; max = buff[1];
break;} break;}
case BaseFileInterface::H5_Int64: { case BaseFileInterface::H5_Int64: {
int64_t buff[2]; int64_t buff[2];
ret = dataFile->getActualRange(variableName, 0, (void*)buff); ret = dataFile->getActualRange(variableName, timestep, (void*)buff);
min = buff[0]; min = buff[0];
max = buff[1]; max = buff[1];
if (ret == true) if (ret == true)
...@@ -351,7 +351,7 @@ bool HDF5_FQ::getDataMinMax_Double(const std::string& variableName, ...@@ -351,7 +351,7 @@ bool HDF5_FQ::getDataMinMax_Double(const std::string& variableName,
break;} break;}
case BaseFileInterface::H5_Byte: { case BaseFileInterface::H5_Byte: {
char buff[2]; char buff[2];
ret = dataFile->getActualRange(variableName, 0, (void*)buff); ret = dataFile->getActualRange(variableName, timestep, (void*)buff);
min = buff[0]; min = buff[0];
max = buff[1]; max = buff[1];
break;} break;}
...@@ -362,8 +362,6 @@ bool HDF5_FQ::getDataMinMax_Double(const std::string& variableName, ...@@ -362,8 +362,6 @@ bool HDF5_FQ::getDataMinMax_Double(const std::string& variableName,
return ret; return ret;
} }
long HDF5_FQ::get1DHistogram(int64_t timestep, long HDF5_FQ::get1DHistogram(int64_t timestep,
const char* variableName, const char* variableName,
std::vector<double> &bounds, std::vector<double> &bounds,
......
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