Commit 67ce4f4e authored by ahern's avatar ahern

Coverted spaces to tabs.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@9146 18c085ea-50e0-402c-830e-de6fd14e8384
parent 98c0fcaa
......@@ -1008,11 +1008,11 @@ avtTransformManager::CSGToDiscrete(const avtDatabaseMetaData *const md,
int csgdom = dom, csgreg;
md->ConvertCSGDomainToBlockAndRegion(vname, &csgdom, &csgreg);
debug1 << "Preparing to obtain CSG discretized grid for "
<< ", dom=" << dom
<< ", csgdom=" << csgdom
<< ", csgreg=" << csgreg
<< endl;
debug1 << "Preparing to obtain CSG discretized grid for "
<< ", dom=" << dom
<< ", csgdom=" << csgdom
<< ", csgreg=" << csgreg
<< endl;
//
// See if we have discretized result in xform's cache
......@@ -1029,7 +1029,7 @@ avtTransformManager::CSGToDiscrete(const avtDatabaseMetaData *const md,
(olddataRequest->DiscMode() != dataRequest->DiscMode()))
dgrid = 0;
else
debug1 << "Found discretized CSG grid in cache for current timestate." << endl;
debug1 << "Found discretized CSG grid in cache for current timestate." << endl;
}
//
......@@ -1041,7 +1041,7 @@ avtTransformManager::CSGToDiscrete(const avtDatabaseMetaData *const md,
if (dgrid == 0)
{
debug1 << "No discretized CSG grid in cache. Computing a disrcetization..." << endl;
debug1 << "No discretized CSG grid in cache. Computing a disrcetization..." << endl;
vtkCSGGrid *csgmesh = vtkCSGGrid::SafeDownCast(ds);
const double *bnds = csgmesh->GetBounds();
......@@ -1126,7 +1126,7 @@ avtTransformManager::CSGToDiscrete(const avtDatabaseMetaData *const md,
vector<int> mapvals;
for (int j = 0; j < rv->GetNumberOfCells(); j++)
mapvals.push_back(csgreg);
debug1 << "Mapping array \"" << da->GetName() << "\" to the discretized CSG mesh" << endl;
debug1 << "Mapping array \"" << da->GetName() << "\" to the discretized CSG mesh" << endl;
newda = BuildMappedArray(da, mapvals);
if (newda)
{
......
This diff is collapsed.
......@@ -117,8 +117,8 @@ avtZoneTypeExpression::DeriveVariable(vtkDataSet *in_ds)
{
float val = (float) '?';
switch (in_ds->GetCellType(i))
{
// 2D cell types, lower case letters
{
// 2D cell types, lower case letters
case VTK_EMPTY_CELL: val = (float) 'e'; break;
case VTK_VERTEX: val = (float) 'v'; break;
case VTK_POLY_VERTEX: val = (float) 'w'; break;
......@@ -130,7 +130,7 @@ avtZoneTypeExpression::DeriveVariable(vtkDataSet *in_ds)
case VTK_PIXEL: val = (float) 'x'; break;
case VTK_QUAD: val = (float) 'q'; break;
// 3D cell types, upper case letters
// 3D cell types, upper case letters
case VTK_TETRA: val = (float) 'T'; break;
case VTK_VOXEL: val = (float) 'V'; break;
case VTK_HEXAHEDRON: val = (float) 'H'; break;
......
......@@ -293,7 +293,7 @@ class avtIVPSolver
TIME,
DISTANCE,
STEPS,
INTERSECTIONS
INTERSECTIONS
};
virtual void Reset(const double& t_start, const avtVector& y_start) = 0;
......
......@@ -451,7 +451,7 @@ avtExtractor::ExtractLine(int xi, int yi, float z1, float z2,
void
avtExtractor::StoreRay(int x, int y, int frontZ, int backZ,
const float (*samples)[AVT_VARIABLE_LIMIT])
const float (*samples)[AVT_VARIABLE_LIMIT])
{
avtRay *ray = volume->GetRay(x, y);
ray->SetSamples(frontZ, backZ, samples);
......
......@@ -118,7 +118,7 @@ class PIPELINE_API avtExtractor
float[AVT_VARIABLE_LIMIT],
float[AVT_VARIABLE_LIMIT], int);
virtual void StoreRay(int, int, int, int,
const float (*)[AVT_VARIABLE_LIMIT]);
const float (*)[AVT_VARIABLE_LIMIT]);
void OrientTriangle(float [3], float [3],
......
......@@ -378,7 +378,7 @@ avtHexahedron20Extractor::StoreRay(int x, int y, int frontZ, int backZ,
const float (*samples)[AVT_VARIABLE_LIMIT])
{
// The temporary ray we will fill up with samples
float (*tmp)[AVT_VARIABLE_LIMIT] = new float [backZ-frontZ+1][AVT_VARIABLE_LIMIT];
float (*tmp)[AVT_VARIABLE_LIMIT] = new float [backZ-frontZ+1][AVT_VARIABLE_LIMIT];
float weight;
int index;
......@@ -422,7 +422,7 @@ avtHexahedron20Extractor::StoreRay(int x, int y, int frontZ, int backZ,
// Finally store the actual ray samples
avtExtractor::StoreRay(x,y,frontZ,backZ,tmp);
delete [] tmp;
delete [] tmp;
}
......
......@@ -99,7 +99,7 @@ class PIPELINE_API avtHexahedron20Extractor : public avtHexahedronExtractor
virtual void StoreRay(int, int, int, int,
const float (*)[AVT_VARIABLE_LIMIT]);
const float (*)[AVT_VARIABLE_LIMIT]);
float TriLinearWeight(int, float, float, float);
float QuadraticWeight(int, float, float, float);
float ClosestParametricNeighbor(float, float, float);
......
......@@ -340,10 +340,10 @@ avtHexahedron27Extractor::QuadraticHexExtract(const avtHexahedron27 &hex)
void
avtHexahedron27Extractor::StoreRay(int x, int y, int frontZ, int backZ,
const float (*samples)[AVT_VARIABLE_LIMIT])
const float (*samples)[AVT_VARIABLE_LIMIT])
{
// The temporary ray we will fill up with samples
float (*tmp)[AVT_VARIABLE_LIMIT] = new float[backZ-frontZ+1][AVT_VARIABLE_LIMIT];
float (*tmp)[AVT_VARIABLE_LIMIT] = new float[backZ-frontZ+1][AVT_VARIABLE_LIMIT];
float weight;
int index;
......@@ -386,7 +386,7 @@ avtHexahedron27Extractor::StoreRay(int x, int y, int frontZ, int backZ,
// Finally store the actual ray sampels
avtExtractor::StoreRay(x,y,frontZ,backZ,tmp);
delete [] tmp;
delete [] tmp;
}
......@@ -406,8 +406,8 @@ avtHexahedron27Extractor::TriLinearWeight(int v_index, float s, float t,
float u)
{
return 0.125*( (1+sControlPointParam[v_index][0]*s)
* (1+sControlPointParam[v_index][1]*t)
* (1+sControlPointParam[v_index][2]*u));
* (1+sControlPointParam[v_index][1]*t)
* (1+sControlPointParam[v_index][2]*u));
}
......@@ -480,8 +480,8 @@ avtHexahedron27Extractor::ClosestParametricNeighbor(float s, float t, float u)
for (int i = 0 ; i < 27 ; i++)
{
tmp = sqrt(pow(sControlPointParam[i][0] - s,2)
+ pow(sControlPointParam[i][1] - t,2)
+ pow(sControlPointParam[i][2] - u,2));
+ pow(sControlPointParam[i][1] - t,2)
+ pow(sControlPointParam[i][2] - u,2));
if (tmp < min)
{
min = tmp;
......
......@@ -99,7 +99,7 @@ class PIPELINE_API avtHexahedron27Extractor : public avtHexahedronExtractor
virtual void StoreRay(int, int, int, int,
const float (*)[AVT_VARIABLE_LIMIT]);
const float (*)[AVT_VARIABLE_LIMIT]);
float TriLinearWeight(int, float, float, float);
float QuadraticWeight(int, float, float, float);
float ClosestParametricNeighbor(float, float, float);
......
......@@ -322,14 +322,14 @@ class PLOTTER_API avtPlot
float GetCellCountMultiplierForSRThreshold() const;
const PlotInfoAttributes &GetPlotInformation() const;
bool SetScaleMode(ScaleMode, ScaleMode, WINDOW_MODE);
bool ScaleModeRequiresUpdate(WINDOW_MODE, ScaleMode,
ScaleMode rs);
virtual bool NeedZBufferToCompositeEvenIn2D(void)
bool SetScaleMode(ScaleMode, ScaleMode, WINDOW_MODE);
bool ScaleModeRequiresUpdate(WINDOW_MODE, ScaleMode,
ScaleMode rs);
virtual bool NeedZBufferToCompositeEvenIn2D(void)
{ return false; };
virtual void RegisterNamedSelection(const std::string &) {;};
virtual void RegisterNamedSelection(const std::string &) {;};
virtual avtFilter *GetFilterForTopOfPipeline() { return 0; }
virtual avtFilter *GetFilterForTopOfPipeline() { return 0; }
protected:
bool needsRecalculation;
......
......@@ -450,20 +450,20 @@ VisWinPlots::CheckPlot(avtActor_p &p)
// If the modes don't match then it is an error.
//
if (mediator.GetMode() == p->GetWindowMode())
return;
return;
if (p->AdaptsToAnyWindowMode())
return;
if (mediator.GetMode() == WINMODE_2D &&
p->GetWindowMode() == WINMODE_CURVE)
return;
p->GetWindowMode() == WINMODE_CURVE)
return;
if (mediator.GetMode() == WINMODE_CURVE &&
p->GetWindowMode() == WINMODE_2D)
p->GetWindowMode() == WINMODE_2D)
{
mediator.ChangeMode(WINMODE_2D);
return;
return;
}
EXCEPTION3(PlotDimensionalityException, mediator.GetMode(),
......
......@@ -402,9 +402,9 @@ NavigateAxisArray::ZoomCamera(const int x, const int y)
double dxf = MotionFactor * (double)(x - OldX) /
(double)(Center[0]);
//
// Perform zoom
//
//
// Perform zoom
//
if (shiftKeyDown || controlKeyDown)
{
if (axisOrientation == Vertical)
......@@ -436,9 +436,9 @@ NavigateAxisArray::ZoomCamera(const int x, const int y)
// Redraw
rwi->Render();
//
// Update old mouse position
//
//
// Update old mouse position
//
OldX = x;
OldY = y;
}
......
......@@ -991,45 +991,45 @@ VisitInteractor::ZoomCamera2D(double f)
//
if (fillViewportOnZoom && zoomFactor > 1. && !newView2D.fullFrame)
{
//
// Determine the y scale factor to account for the viewport
// and window size.
//
int size[2];
double yScale;
//
// Determine the y scale factor to account for the viewport
// and window size.
//
int size[2];
double yScale;
size[0] = rwi->GetRenderWindow()->GetSize()[0];
size[1] = rwi->GetRenderWindow()->GetSize()[1];
yScale = ((newView2D.viewport[3] - newView2D.viewport[2]) /
(newView2D.viewport[1] - newView2D.viewport[0])) *
((double) size[1] / (double) size[0]) ;
//
// We fill the viewport by only zooming one of the axes. In
// the case where we will overshoot, we zoom the second axis a
// small amount so that we will just fill the viewport.
//
if ((yDist / xDist) < yScale)
{
//
// Handle the case where the x direction should be zoomed.
//
if ((xDist + 2.0 * dX) > (yDist / yScale))
dY = 0.;
else
dY = ((xDist + 2.0 * dX) * yScale - yDist) / 2.0;
}
else
{
//
// Handle the case where the x direction should be zoomed.
//
if ((yDist + 2.0 * dY) > (xDist * yScale))
dX = 0.;
else
dX = ((yDist + 2.0 * dY) / yScale - xDist) / 2.0;
}
yScale = ((newView2D.viewport[3] - newView2D.viewport[2]) /
(newView2D.viewport[1] - newView2D.viewport[0])) *
((double) size[1] / (double) size[0]) ;
//
// We fill the viewport by only zooming one of the axes. In
// the case where we will overshoot, we zoom the second axis a
// small amount so that we will just fill the viewport.
//
if ((yDist / xDist) < yScale)
{
//
// Handle the case where the x direction should be zoomed.
//
if ((xDist + 2.0 * dX) > (yDist / yScale))
dY = 0.;
else
dY = ((xDist + 2.0 * dX) * yScale - yDist) / 2.0;
}
else
{
//
// Handle the case where the x direction should be zoomed.
//
if ((yDist + 2.0 * dY) > (xDist * yScale))
dX = 0.;
else
dX = ((yDist + 2.0 * dY) / yScale - xDist) / 2.0;
}
}
newView2D.window[0] -= dX;
......@@ -1070,14 +1070,14 @@ VisitInteractor::ZoomCamera2D(const int x, const int y)
double dyf = MotionFactor * (double)(y - OldY) /
(double)(Center[1]);
//
// Perform zoom
//
ZoomCamera2D(dyf);
//
// Perform zoom
//
ZoomCamera2D(dyf);
//
// Update old mouse position
//
//
// Update old mouse position
//
OldX = x;
OldY = y;
}
......
......@@ -277,9 +277,9 @@ VisItInit::Initialize(int &argc, char *argv[], int r, int n, bool strip, bool si
if (strncmp("-debug",argv[i],6) == 0)
{
if ((strlen(argv[i]) > 7 && IsComponent(&argv[i][7])) ||
strlen(argv[i]) == 6)
{
if ((strlen(argv[i]) > 7 && IsComponent(&argv[i][7])) ||
strlen(argv[i]) == 6)
{
debuglevel = 1;
if (i+1 < argc && isdigit(*(argv[i+1])))
debuglevel = atoi(argv[i+1]);
......@@ -308,7 +308,7 @@ VisItInit::Initialize(int &argc, char *argv[], int r, int n, bool strip, bool si
{
++i;
}
}
}
}
else if (strcmp("-debug-processor-stride", argv[i]) == 0)
{
......
......@@ -556,21 +556,21 @@ DatabasePluginManager::GetMatchingPluginIds(const char *filename, bool searchAll
//
// Check to see if there is an extension that matches.
// Look first using GeneralPluginInfo via PluginFileExtensions
// call (the newer way). If that yields nothing, then try the
// CommonPluginInfo via the GetDefaultExtensions (the old way).
// Look first using GeneralPluginInfo via PluginFileExtensions
// call (the newer way). If that yields nothing, then try the
// CommonPluginInfo via the GetDefaultExtensions (the old way).
//
int j;
int j;
vector<string> extensions = PluginFileExtensions(id);
int nextensions = extensions.size();
bool shouldIssueObsoletePluginWarning = false;
if (nextensions == 0)
{
if (info)
bool shouldIssueObsoletePluginWarning = false;
if (nextensions == 0)
{
if (info)
extensions = info->GetDefaultExtensions();
nextensions = extensions.size();
shouldIssueObsoletePluginWarning = nextensions > 0;
}
shouldIssueObsoletePluginWarning = nextensions > 0;
}
for (j=0; j<nextensions && !foundMatch; j++)
{
string ext = extensions[j];
......@@ -596,16 +596,16 @@ DatabasePluginManager::GetMatchingPluginIds(const char *filename, bool searchAll
//
// Check to see if there is an exact name that matches.
// Again, get filenames first from GeneralPluginInfo and,
// failing that, then the older way (from CommonPluginInfo).
//
// failing that, then the older way (from CommonPluginInfo).
//
vector<string> filenames = PluginFilenames(id);
int nfiles = filenames.size();
if (nfiles == 0)
{
if (info)
if (nfiles == 0)
{
if (info)
filenames = info->GetFilenames();
nfiles = filenames.size();
shouldIssueObsoletePluginWarning |= nfiles > 0;
shouldIssueObsoletePluginWarning |= nfiles > 0;
}
for (j=0; j<nfiles && !foundMatch; j++)
{
......@@ -619,9 +619,9 @@ DatabasePluginManager::GetMatchingPluginIds(const char *filename, bool searchAll
rv.push_back(id);
if (foundMatch && shouldIssueObsoletePluginWarning)
{
static bool issuedWarning = false;
if (!issuedWarning)
{
static bool issuedWarning = false;
if (!issuedWarning)
{
cerr << "Warning: For plugin id = \"" << id
<< "\", default file extensions/names found in" << endl;
......
......@@ -476,13 +476,13 @@ MeshManagementAttributes::SetFromNode(DataNode *parentNode)
DataNode *node;
if((node = searchNode->GetNode("discretizationTolerance")) != 0)
{
if (node->AsDoubleVector().size() == 3)
if (node->AsDoubleVector().size() == 3)
SetDiscretizationTolerance(node->AsDoubleVector());
else
{
MeshManagementAttributes tmp;
SetDiscretizationTolerance(tmp.GetDiscretizationTolerance());
}
{
MeshManagementAttributes tmp;
SetDiscretizationTolerance(tmp.GetDiscretizationTolerance());
}
}
if((node = searchNode->GetNode("discretizationToleranceX")) != 0)
SetDiscretizationToleranceX(node->AsDoubleVector());
......
......@@ -504,8 +504,8 @@ StringHelpers::ExtractRESubstr(const char *strToSearch, const char *re)
reToUse = string(re, 1, (last-re+1)-2); // -2 for '<' and '>' chars
errno = 0;
matchToExtract = strtol(last+3, 0, 10);
if (errno != 0)
return retval;
if (errno != 0)
return retval;
}
else
{
......@@ -525,12 +525,12 @@ StringHelpers::ExtractRESubstr(const char *strToSearch, const char *re)
for (int i = 0; i < 255; i++)
{
if (pm[i].rm_so == -1)
continue;
if (i == matchToExtract)
{
retval = std::string(strToSearch, pm[i].rm_so,
pm[i].rm_eo - pm[i].rm_so);
break;
continue;
if (i == matchToExtract)
{
retval = std::string(strToSearch, pm[i].rm_so,
pm[i].rm_eo - pm[i].rm_so);
break;
}
}
return retval;
......@@ -752,8 +752,8 @@ StringHelpers::ValidatePrintfFormatString(const char *fmtStr, const char *arg1Ty
// optional dot
if (fmtStr[n] == '.')
{
n++;
// walk over precision digits
n++;
// walk over precision digits
while (fmtStr[n] >= '0' && fmtStr[n] <= '9')
n++;
}
......@@ -783,7 +783,7 @@ StringHelpers::ValidatePrintfFormatString(const char *fmtStr, const char *arg1Ty
for (i = 0; i < n-1; i++)
{
if (fmtStr[i] == '%' && fmtStr[i+1] != '%')
ncspecs++;
ncspecs++;
}
if (ncspecs == 0)
return true;
......@@ -797,10 +797,10 @@ StringHelpers::ValidatePrintfFormatString(const char *fmtStr, const char *arg1Ty
// loop adding RE terms for each argument type
for (i = 0; i < ncspecs; i++)
{
if (typeNameToFmtREMap.find(string(currentArgTypeName)) == typeNameToFmtREMap.end())
break;
if (typeNameToFmtREMap.find(string(currentArgTypeName)) == typeNameToFmtREMap.end())
break;
re += typeNameToFmtREMap[string(currentArgTypeName)];
currentArgTypeName = va_arg(ap, const char *);
currentArgTypeName = va_arg(ap, const char *);
}
va_end(ap);
......
......@@ -143,11 +143,11 @@ int main(int argc, char **argv)
cerr << endl;
}
#define CHECK_PLURAL(noun,pnoun) \
if (Plural(#noun) != #pnoun) \
{ \
cerr << "Problem pluralizing " #pnoun << endl; \
return 1; \
#define CHECK_PLURAL(noun,pnoun) \
if (Plural(#noun) != #pnoun) \
{ \
cerr << "Problem pluralizing " #pnoun << endl; \
return 1; \
}
CHECK_PLURAL(matrix,matrices);
......
This diff is collapsed.
This diff is collapsed.
......@@ -189,26 +189,26 @@ class vtkCEAucdReader : public vtkUnstructuredGridAlgorithm
//BTX
enum
{
FILE_BIG_ENDIAN=0,
FILE_LITTLE_ENDIAN=1
FILE_BIG_ENDIAN=0,
FILE_LITTLE_ENDIAN=1
};
enum UCDCell_type
{
PT = 0,
LINE = 1,
TRI = 2,
QUAD = 3,
TET = 4,
PYR = 5,
PRISM = 6,
HEX = 7
PT = 0,
LINE = 1,
TRI = 2,
QUAD = 3,
TET = 4,
PYR = 5,
PRISM = 6,
HEX = 7
};
struct DataInfo {
long foffset; // offset in binary file
int veclen; // number of components in the node or cell variable
float min[3]; // pre-calculated data minima (max size 3 for vectors)
float max[3]; // pre-calculated data maxima (max size 3 for vectors)
long foffset; // offset in binary file
int veclen; // number of components in the node or cell variable
float min[3]; // pre-calculated data minima (max size 3 for vectors)
float max[3]; // pre-calculated data maxima (max size 3 for vectors)
};
//ETX
......
......@@ -989,7 +989,7 @@ avtChomboFileFormat::InitializeReader(void)
if (nMaterials != 0)
{
++nMaterials; // There is always one extra material
++nMaterials; // There is always one extra material
}
//
......@@ -2702,9 +2702,9 @@ avtChomboFileFormat::GetMaterial(const char *var, int patch,
int nCells = 0;
for (i = 0; i <= nMaterials - 2; ++i)
{
sprintf(str,"fraction-%d", i);
sprintf(str,"fraction-%d", i);
vtkDoubleArray *doubleArray = (vtkDoubleArray *)(GetVar(patch, str));
nCells = doubleArray->GetNumberOfTuples();
nCells = doubleArray->GetNumberOfTuples();
mats[i] = doubleArray->GetPointer(0);
deleteList.push_back(doubleArray);
}
......@@ -2714,10 +2714,10 @@ avtChomboFileFormat::GetMaterial(const char *var, int patch,
for(unsigned int cellNo = 0; cellNo < nCells; ++cellNo)
{
double frac = 1.0;
for (int matNo = 0; matNo < nMaterials - 1; ++matNo)
frac -= mats[matNo][cellNo];
addMatPtr[cellNo] = frac;
double frac = 1.0;
for (int matNo = 0; matNo < nMaterials - 1; ++matNo)
frac -= mats[matNo][cellNo];
addMatPtr[cellNo] = frac;
}
mats[nMaterials - 1] = addMatPtr;
......
......@@ -153,7 +153,7 @@ class avtChomboFileFormat : public avtSTMDFileFormat
void *GetMaterial(const char *var, int patch,
const char *type,
DestructorFunction &df);
DestructorFunction &df);
protected:
bool initializedReader;
......
This diff is collapsed.
......@@ -11,42 +11,42 @@
static char message[1024];
void error_action(const char *start, ...)
{
va_list ap;
enum ACTION action;
int line;
char *string;
strncpy(message, start, 1024);
va_start(ap, start);
string = va_arg(ap, char *);
while (string != NULL)
{
strncat(message, " ", 1024);
strncat(message, string, 1024);
string = va_arg(ap, char *);
}
printf("\nMessage:%s\n\n", message);
string = va_arg(ap, char *);
fprintf(stderr, "Error in routine %s\n", string);
string = va_arg(ap, char *);
fprintf(stderr, "in file %s ", string);
line = va_arg(ap, int);
fprintf(stderr, "at line %d\n", line);
va_list ap;
enum ACTION action;
int line;
char *string;
strncpy(message, start, 1024);
va_start(ap, start);
string = va_arg(ap, char *);
while (string != NULL)
{
strncat(message, " ", 1024);
strncat(message, string, 1024);
string = va_arg(ap, char *);
}
printf("\nMessage:%s\n\n", message);
string = va_arg(ap, char *);
fprintf(stderr, "Error in routine %s\n", string);
string = va_arg(ap, char *);
fprintf(stderr, "in file %s ", string);
line = va_arg(ap, int);