Commit 5d3ba960 authored by bonnell's avatar bonnell

Reduce warnings on windows.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@28207 18c085ea-50e0-402c-830e-de6fd14e8384
parent fde6fe43
......@@ -345,7 +345,7 @@ avtPolygonToTrianglesTesselator::AddContourVertex(double x,
// ****************************************************************************
void avtPolygonToTrianglesTesselator::EndContour()
{
int nverts = verts.size() / 3;
int nverts = (int)verts.size() / 3;
tessAddContour(tessObj,3,
&verts[0],
3*sizeof(double),
......
......@@ -188,7 +188,7 @@ avtPolyhedralSplit::ExpandDataArray(vtkDataArray *input, bool zoneCent,
{
const char *mName = "avtPolyhedralSplit::ExpandDataArray: ";
vtkDataArray *output = NULL;
int polyhedralCellCount = polyhedralSplit.size() / 2;
int polyhedralCellCount = (int)polyhedralSplit.size() / 2;
if(polyhedralCellCount == 0)
{
......@@ -338,7 +338,7 @@ avtPolyhedralSplit::CreateOriginalCells(int domain, int normalCellCount) const
vtkUnsignedIntArray *originalCells = vtkUnsignedIntArray::New();
originalCells->SetNumberOfComponents(2);
int bloat = 0;
int polyhedralCellCount = polyhedralSplit.size()/2;
int polyhedralCellCount = (int)polyhedralSplit.size()/2;
for(int i = 0; i < polyhedralCellCount; ++i)
bloat += polyhedralSplit[i*2+1];
originalCells->SetNumberOfTuples(normalCellCount + bloat);
......
......@@ -375,7 +375,7 @@ avtMTMDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
int tsGroup = GetTimestepGroupForTimestep(timeState);
int localTS = GetTimestepWithinGroup(timeState);
int offset = 0;
for (size_t i = 0 ; i < (size_t)nTimestepGroups ; i++)
for (int i = 0 ; i < nTimestepGroups ; i++)
{
chunks[i]->SetTimeSliceOffset(offset);
offset += tsPerGroup[i];
......@@ -385,8 +385,8 @@ avtMTMDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
else
chunks[tsGroup]->SetReadAllCyclesAndTimes(false);
chunks[tsGroup]->SetDatabaseMetaData(md, localTS);
for (size_t i = 0 ; i < (size_t)nTimestepGroups ; i++)
if (i != (size_t)tsGroup)
for (int i = 0 ; i < nTimestepGroups ; i++)
if (i != tsGroup)
chunks[i]->RegisterDatabaseMetaData(md);
//
......@@ -397,7 +397,7 @@ avtMTMDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
if (md->AreAllCyclesAccurateAndValid(nTotalTimesteps) != true)
{
vector<int> cycles;
for (size_t i=0; i < (size_t)nTimestepGroups; i++)
for (int i=0; i < nTimestepGroups; i++)
{
vector<int> tmp;
chunks[i]->FormatGetCycles(tmp);
......@@ -421,12 +421,12 @@ avtMTMDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
{
std::vector<int> cyclesFromMassCall = cycles;
cycles.clear();
for (size_t i = 0; i < (size_t)nTotalTimesteps; i++)
for (int i = 0; i < nTotalTimesteps; i++)
{
int tsg = GetTimestepGroupForTimestep(i);
int lts = GetTimestepWithinGroup(i);
int c = chunks[tsg]->FormatGetCycle(lts);
if (c == avtFileFormat::INVALID_CYCLE && cyclesFromMassCall.size() > i)
if (c == avtFileFormat::INVALID_CYCLE && (int)cyclesFromMassCall.size() > i)
c = cyclesFromMassCall[i];
if (c != avtFileFormat::INVALID_CYCLE)
......@@ -454,7 +454,7 @@ avtMTMDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
{
// Set the times in the metadata.
vector<double> times;
for (size_t i=0; i<(size_t)nTimestepGroups; i++)
for (int i=0; i< nTimestepGroups; i++)
{
vector<double> tmp;
chunks[i]->FormatGetTimes(tmp);
......@@ -478,12 +478,12 @@ avtMTMDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
{
vector<double> timesFromMassCall = times;
times.clear();
for (size_t i = 0; i < (size_t)nTotalTimesteps; i++)
for (int i = 0; i < nTotalTimesteps; i++)
{
int tsg = GetTimestepGroupForTimestep(i);
int lts = GetTimestepWithinGroup(i);
double t = chunks[tsg]->FormatGetTime(lts);
if (t == avtFileFormat::INVALID_TIME && timesFromMassCall.size() > i)
if (t == avtFileFormat::INVALID_TIME && (int)timesFromMassCall.size() > i)
t = timesFromMassCall[i];
if (t != avtFileFormat::INVALID_TIME)
......
......@@ -525,7 +525,7 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
int tsGroup = GetTimestepGroupForTimestep(timeState);
int localTS = GetTimestepWithinGroup(timeState);
int offset = 0;
for (size_t i = 0 ; i < (size_t)nTimestepGroups ; i++)
for (int i = 0 ; i < nTimestepGroups ; i++)
{
chunks[i][0]->SetTimeSliceOffset(offset);
offset += tsPerGroup[i];
......@@ -535,8 +535,8 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
else
chunks[tsGroup][0]->SetReadAllCyclesAndTimes(false);
chunks[tsGroup][0]->SetDatabaseMetaData(md, localTS);
for (size_t i = 0 ; i < (size_t)nTimestepGroups ; i++)
if (i != (size_t)tsGroup)
for (int i = 0 ; i < nTimestepGroups ; i++)
if (i != tsGroup)
chunks[i][0]->RegisterDatabaseMetaData(md);
//
......@@ -571,7 +571,7 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
{
std::vector<int> cyclesFromMassCall = cycles;
cycles.clear();
for (size_t i = 0; i < (size_t)nTotalTimesteps; i++)
for (int i = 0; i < nTotalTimesteps; i++)
{
int tsg = GetTimestepGroupForTimestep(i);
int lts = GetTimestepWithinGroup(i);
......@@ -604,7 +604,7 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
{
// Set the times in the metadata.
vector<double> times;
for (size_t i=0; i<(size_t)nTimestepGroups; i++)
for (int i=0; i<nTimestepGroups; i++)
{
vector<double> tmp;
chunks[i][0]->FormatGetTimes(tmp);
......@@ -630,7 +630,7 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
vector<double> timesFromMassCall = times;
times.clear();
for (size_t i = 0; i < (size_t)nTotalTimesteps; i++)
for (int i = 0; i < nTotalTimesteps; i++)
{
int tsg = GetTimestepGroupForTimestep(i);
int lts = GetTimestepWithinGroup(i);
......@@ -666,8 +666,8 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
// Each one of these domains thinks that it only has one domain. Overwrite
// that with the true number of domains.
//
size_t nm = md->GetNumMeshes();
for (size_t i = 0 ; i < nm ; i++)
int nm = md->GetNumMeshes();
for (int i = 0 ; i < nm ; i++)
{
md->SetBlocksForMesh(i, nBlocks);
}
......
......@@ -356,7 +356,7 @@ avtNekDomainBoundaries::CreateNeighborList(const vector<int> &domainNum,
if (multipleBlocks && meshes.size() == 1)
nLocalDomains = meshes[0]->GetNumberOfPoints()/ptsPerDomain;
else
nLocalDomains = meshes.size();
nLocalDomains = (int) meshes.size();
int ii, ff, pp, cc;
const int f[6][4] = { {0, 2, 4, 6},
{1, 3, 5, 7},
......@@ -800,7 +800,7 @@ avtNekDomainBoundaries::CreateGhostNodes(vector<int> domainNum,
}
else
{
numToIterate = meshes.size();
numToIterate = (int)meshes.size();
partOfLargerArray = false;
gn = NULL;
}
......@@ -841,7 +841,7 @@ avtNekDomainBoundaries::CreateGhostNodes(vector<int> domainNum,
}
else if (bAllDomainsSorted)
{
int min = 0, max = allDomains.size()-1, mid;
int min = 0, max = (int)allDomains.size()-1, mid;
while (min <= max)
{
mid = (max+min)/2;
......
......@@ -725,8 +725,6 @@ avtLineScanFilter::ExecuteData(avtDataRepresentation *in_dr)
vtkDataSet *
avtLineScanFilter::CartesianExecute(vtkDataSet *ds)
{
size_t i, j;
vtkVisItCellLocator *locator = vtkVisItCellLocator::New();
locator->SetDataSet(ds);
locator->SetIgnoreGhosts(true);
......@@ -746,7 +744,7 @@ avtLineScanFilter::CartesianExecute(vtkDataSet *ds)
UpdateProgress(extraMsg*currentNode, totalProg);
int lastMilestone = 0;
for (i = 0 ; i < (size_t)nLines ; i++)
for (int i = 0 ; i < nLines ; i++)
{
double pt1[3];
pt1[0] = lines[6*i];
......@@ -759,8 +757,8 @@ avtLineScanFilter::CartesianExecute(vtkDataSet *ds)
int success = locator->IntersectWithLine(pt1, pt2, ipts, cpts, cells);
if (success == 0)
continue; // No intersection
size_t nCells = cells->GetNumberOfIds();
for (j = 0 ; j < nCells ; j++)
vtkIdType nCells = cells->GetNumberOfIds();
for (vtkIdType j = 0 ; j < nCells ; j++)
{
vtkIdType id = cells->GetId(j);
vtkCell *cell = ds->GetCell(id);
......@@ -868,7 +866,7 @@ avtLineScanFilter::CartesianExecute(vtkDataSet *ds)
vtkPolyData *output = vtkPolyData::New();
vtkPoints *pts = vtkPoints::New();
pts->SetNumberOfPoints(dist.size());
for (i = 0 ; i < dist.size() ; i++)
for (size_t i = 0 ; i < dist.size() ; i++)
{
float pt[3];
int line = line_id[i/2];
......@@ -950,19 +948,17 @@ avtLineScanFilter::CartesianExecute(vtkDataSet *ds)
vtkDataSet *
avtLineScanFilter::CylindricalExecute(vtkDataSet *ds)
{
size_t i, j;
//
// Set up an interval tree over the cells, which well help us locate
// the cells when we cast the lines over the axially-symmetric mesh.
//
size_t nCells = ds->GetNumberOfCells();
vtkIdType nCells = ds->GetNumberOfCells();
int dims = 2;
avtIntervalTree tree(nCells, dims);
double bounds[6];
vtkDataArray *ghosts = ds->GetCellData()->GetArray("avtGhostZones");
bool hasGhost = (ghosts != NULL);
for (i = 0 ; i < nCells ; i++)
for (vtkIdType i = 0 ; i < nCells ; i++)
{
vtkCell *cell = ds->GetCell(i);
cell->GetBounds(bounds);
......@@ -981,7 +977,7 @@ avtLineScanFilter::CylindricalExecute(vtkDataSet *ds)
int lastMilestone = 0;
vector<int> list;
for (i = 0 ; i < (size_t)nLines ; i++)
for (int i = 0 ; i < nLines ; i++)
{
double pt1[3];
pt1[0] = lines[6*i];
......@@ -1000,7 +996,7 @@ avtLineScanFilter::CylindricalExecute(vtkDataSet *ds)
if (nCells == 0)
continue; // No intersection
for (j = 0 ; j < nCells ; j++)
for (size_t j = 0 ; j < nCells ; j++)
{
int id = list[j];
if (hasGhost && ghosts->GetTuple1(id) != 0.)
......@@ -1071,7 +1067,7 @@ avtLineScanFilter::CylindricalExecute(vtkDataSet *ds)
vtkPolyData *output = vtkPolyData::New();
vtkPoints *pts = vtkPoints::New();
pts->SetNumberOfPoints(dist.size());
for (i = 0 ; i < dist.size() ; i++)
for (size_t i = 0 ; i < dist.size() ; i++)
{
float pt[3];
int line = line_id[i/2];
......
......@@ -279,7 +279,7 @@ avtLineToPolylineFilter::ExecuteData(avtDataRepresentation *inDR)
if(shape.size() > (size_t)ptsBufSize)
{
delete [] pts;
ptsBufSize = shape.size();
ptsBufSize = (int)shape.size();
pts = new vtkIdType[ptsBufSize];
}
for(size_t i = 0; i < shape.size(); ++i)
......
......@@ -1015,7 +1015,7 @@ avtLineoutFilter::CreateRGridFromOrigCells(vtkDataSet *ds, double *pt1,
for (size_t i = 0; i < cellInfoList.size(); i++)
{
cellInfo = cellInfoList[i];
int nDups = cellInfo.currCell.size();
size_t nDups = cellInfo.currCell.size();
if (nDups == 1)
{
......@@ -1024,7 +1024,7 @@ avtLineoutFilter::CreateRGridFromOrigCells(vtkDataSet *ds, double *pt1,
else
{
sum = 0.;
for (size_t j = 0; j < (size_t)nDups; j++)
for (size_t j = 0; j < nDups; j++)
{
sum += vtkMath::Distance2BetweenPoints(pt1, cellInfo.isect[j].x);
}
......@@ -1041,8 +1041,8 @@ avtLineoutFilter::CreateRGridFromOrigCells(vtkDataSet *ds, double *pt1,
{
sum = 0;
ds->GetCellPoints(cellInfoList[i].currCell[0], ptIds);
int numCellPts = ptIds->GetNumberOfIds();
for (size_t j = 0; j < (size_t)numCellPts; j++)
vtkIdType numCellPts = ptIds->GetNumberOfIds();
for (vtkIdType j = 0; j < numCellPts; j++)
sum += scalars->GetTuple1(ptIds->GetId(j));
if (numCellPts > 0)
sum /= (double) numCellPts;
......@@ -1052,11 +1052,11 @@ avtLineoutFilter::CreateRGridFromOrigCells(vtkDataSet *ds, double *pt1,
{
sum = 0;
std::set<int> uniquePts;
for (size_t j = 0; j < (size_t)nDups; j++)
for (size_t j = 0; j < nDups; j++)
{
ds->GetCellPoints(cellInfoList[i].currCell[j], ptIds);
int numCellPts = ptIds->GetNumberOfIds();
for (size_t k = 0; k < (size_t)numCellPts; k++)
vtkIdType numCellPts = ptIds->GetNumberOfIds();
for (vtkIdType k = 0; k < numCellPts; k++)
{
if (uniquePts.count(ptIds->GetId(k)) == 0)
{
......@@ -1079,7 +1079,7 @@ avtLineoutFilter::CreateRGridFromOrigCells(vtkDataSet *ds, double *pt1,
else
{
newVal = 0.;
for (size_t j = 0; j < (size_t)nDups; j++)
for (size_t j = 0; j < nDups; j++)
newVal += scalars->GetTuple1(cellInfoList[i].currCell[j]);
newVal /= (double) cellInfoList[i].currCell.size();
}
......@@ -1096,7 +1096,7 @@ avtLineoutFilter::CreateRGridFromOrigCells(vtkDataSet *ds, double *pt1,
vtkDataArray *sortedVal = outVal->NewInstance();
DoubleIntMap sortedIds;
double x;
for (size_t i = 0; i < (size_t)outXC->GetNumberOfTuples(); i++)
for (int i = 0; i < outXC->GetNumberOfTuples(); i++)
{
x = outXC->GetTuple1(i);
sortedIds.insert(DoubleIntMap::value_type(x, i));
......
......@@ -832,7 +832,7 @@ avtMassVoxelExtractor::RegisterGrid(vtkRectilinearGrid *rgrid,
ghosts = NULL;
ncell_arrays = 0;
for (size_t i = 0 ; i < (size_t)rgrid->GetCellData()->GetNumberOfArrays() ; i++)
for (int i = 0 ; i < rgrid->GetCellData()->GetNumberOfArrays() ; i++)
{
vtkDataArray *arr = rgrid->GetCellData()->GetArray(i);
const char *name = arr->GetName();
......@@ -856,7 +856,7 @@ avtMassVoxelExtractor::RegisterGrid(vtkRectilinearGrid *rgrid,
}
npt_arrays = 0;
for (size_t i = 0 ; i < (size_t)rgrid->GetPointData()->GetNumberOfArrays() ; i++)
for (int i = 0 ; i < rgrid->GetPointData()->GetNumberOfArrays() ; i++)
{
vtkDataArray *arr = rgrid->GetPointData()->GetArray(i);
const char *name = arr->GetName();
......
......@@ -470,7 +470,7 @@ avtMultiResolutionPartitionStrategy::AddBox(int *extents)
if (box_size < minimumSize)
return;
int s = tmpBox.size();
size_t s = tmpBox.size();
tmpBox.resize(s+6);
tmpBox[s] = extents[0];
tmpBox[s+1] = extents[1]-1;
......
......@@ -1232,11 +1232,11 @@ avtLocationsNamedSelection::GetMatchingIds(vtkDataSet *ds, std::vector<vtkIdType
vtkIdType cellId;
vtkGenericCell *cell = vtkGenericCell::New();
int nLocs = locations.size();
size_t nLocs = locations.size();
std::map<vtkIdType, int> idMap;
//Use a map to ensure we don't get duplicate cells.
for (int i = 0; i < nLocs; i++)
for (size_t i = 0; i < nLocs; i++)
{
p[0] = locations[i].x;
p[1] = locations[i].y;
......
......@@ -185,7 +185,7 @@ avtNamedSelectionManager::CreateNamedSelection(avtDataObject_p dob,
ns = dob->GetSource()->CreateNamedSelection(contract, selName);
if (ns != NULL)
{
int curSize = selList.size();
size_t curSize = selList.size();
selList.resize(curSize+1);
selList[curSize] = ns;
......@@ -211,7 +211,7 @@ avtNamedSelectionManager::CreateNamedSelection(avtDataObject_p dob,
DeleteNamedSelection(selName, false); // Remove sel if it already exists.
if(ns != NULL)
{
int curSize = selList.size();
size_t curSize = selList.size();
selList.resize(curSize+1);
selList[curSize] = ns;
......@@ -250,7 +250,7 @@ avtNamedSelectionManager::DeleteNamedSelection(const std::string &name,
{
if (selList[i]->GetName() == name)
{
numToRemove = i;
numToRemove = (int)i;
break;
}
}
......@@ -266,9 +266,9 @@ avtNamedSelectionManager::DeleteNamedSelection(const std::string &name,
delete selList[numToRemove];
std::vector<avtNamedSelection *> newList(selList.size()-1);
for (size_t i = 0 ; i < (size_t)numToRemove ; i++)
for (int i = 0 ; i < numToRemove ; i++)
newList[i] = selList[i];
for (size_t i = numToRemove+1 ; i < selList.size() ; i++)
for (int i = numToRemove+1 ; i < (int)selList.size() ; i++)
newList[i-1] = selList[i];
selList = newList;
......@@ -336,7 +336,7 @@ avtNamedSelectionManager::LoadNamedSelection(const std::string &name,
EXCEPTION1(VisItException, msg.str().c_str());
}
int curSize = selList.size();
size_t curSize = selList.size();
selList.resize(curSize+1);
selList[curSize] = ns;
......
......@@ -628,7 +628,7 @@ avtLevelsMapper::GetLevelColor(const string &name, double col[4])
{
if (name == levelNames[i])
{
index = i;
index = (int)i;
break;
}
}
......
......@@ -1664,11 +1664,11 @@ avtPickQuery::GetCurrentZoneForOriginal(vtkDataSet *ds,
int comp = nComp -1;
unsigned int *oc = origCells->GetPointer(0);
size_t nFound = 0;
int nFound = 0;
bool *zoneFound = new bool[origZones.size()];
for (size_t i = 0; i < origZones.size(); i++)
zoneFound[i] = false;
for (size_t i = 0; i < (size_t)nTuples && nFound < origZones.size(); i++)
for (int i = 0; i < nTuples && nFound < (int)origZones.size(); i++)
{
for (size_t j = 0; j < currentZones.size(); j++)
{
......@@ -1829,8 +1829,8 @@ avtPickQuery::SetRealIds(vtkDataSet *ds)
}
// need to change the zone/node names stored in all PickVarInfo
size_t numVars = pickAtts.GetNumVarInfos();
for (size_t i = 0; i < numVars; i++)
int numVars = pickAtts.GetNumVarInfos();
for (int i = 0; i < numVars; i++)
{
if (pickAtts.GetVarInfo(i).GetVariableType() == "material")
continue;
......
......@@ -128,7 +128,7 @@ avtL2NormBetweenCurvesQuery::CompareCurves(int n1, const float *x1,
PutOnSameXIntervals(n1, x1, y1, n2, x2, y2, usedX, newCurve1Vals,
newCurve2Vals);
int total_n_pts = usedX.size();
int total_n_pts = (int)usedX.size();
double integral = 0;
for (int i = 0 ; i < total_n_pts-1 ; i++)
{
......
......@@ -210,7 +210,7 @@ avtLineSamplerInfoQuery::PostExecute()
std::string msg;
char str[128];
int i = 0, sz = lsData.size();
size_t i = 0, sz = lsData.size();
int lsIdx = 0;
while (i < sz)
......
......@@ -298,7 +298,7 @@ avtLineScanTransformQuery::ExecuteLineScan(vtkPolyData *pd)
// After this loop completes, a set of line endpoints and ids will fill
// the hash tables.
for (size_t i = 0 ; i < (size_t)npts ; i++)
for (int i = 0 ; i < npts ; i++)
{
// glue segments into one long line
if (usedPoint[i])
......
......@@ -174,7 +174,7 @@ avtMemoryUsageQuery::GetResultMessage()
std::string float_format = queryAtts.GetFloatFormat();
int nproc = memSizeVals.size();
size_t nproc = memSizeVals.size();
if ( nproc == 1 )
{
std::string format = "Engine Memory Usage = "
......
......@@ -353,9 +353,9 @@ avtPythonQuery::GetSecondaryVariables(std::vector<std::string> &res)
{
// varNames contains all vars, fill res w/ varNames[1:]
res.clear();
int nvars = varNames.size();
size_t nvars = varNames.size();
if(nvars >= 1)
for(int i =1; i < nvars; i++)
for(size_t i =1; i < nvars; i++)
res.push_back(varNames[i]);
}
......
......@@ -209,7 +209,7 @@ avtStreamlineInfoQuery::PostExecute()
std::string msg;
char str[128];
int i = 0, sz = slData.size();
size_t i = 0, sz = slData.size();
int slIdx = 0;
MapNode result_node;
......
......@@ -326,7 +326,7 @@ avtSummationQuery::PreExecute(void)
void
avtSummationQuery::PostExecute(void)
{
int ncomps = sums.size();
int ncomps = (int)sums.size();
// for procs with no data, broadcast the # of comps so they can
// still particpate in the global sum.
ncomps = UnifyMaximumValue(ncomps);
......
......@@ -123,8 +123,7 @@ VisWinAxesArray::VisWinAxesArray(VisWindowColleagueProxy &p) : VisWinColleague(p
VisWinAxesArray::~VisWinAxesArray()
{
int axisCount = axes.size();
for (int i=0; i < axisCount; i++)
for (size_t i=0; i < axes.size(); i++)
{
axes[i].axis->Delete();
}
......@@ -226,8 +225,7 @@ VisWinAxesArray::AddAxesToWindow(void)
}
vtkRenderer *foreground = mediator.GetForeground();
int axisCount = axes.size();
for (int i=0; i < axisCount; i++)
for (size_t i=0; i < axes.size(); i++)
{
foreground->AddActor2D(axes[i].axis);
}
......@@ -258,8 +256,7 @@ VisWinAxesArray::RemoveAxesFromWindow(void)
}
vtkRenderer *foreground = mediator.GetForeground();
int axisCount = axes.size();
for (int i=0; i < axisCount; i++)
for (size_t i=0; i < axes.size(); i++)
{
foreground->RemoveActor2D(axes[i].axis);
}
......@@ -382,7 +379,7 @@ VisWinAxesArray::UpdateView(void)
}
bool titlechange = false;
int axisCount = axes.size();
int axisCount = (int)axes.size();
for (int i=0; i < axisCount; i++)
{
double dx = vx / rx;
......@@ -443,7 +440,7 @@ VisWinAxesArray::UpdateView(void)
void
VisWinAxesArray::UpdatePlotList(vector<avtActor_p> &list)
{
int nActors = list.size();
int nActors = (int)list.size();
int arrayActor = -1;
int arrayIndex = -1;
......@@ -725,8 +722,7 @@ VisWinAxesArray::SetForegroundColor(double fr_, double fg_, double fb_)
fr = fr_;
fg = fg_;
fb = fb_;
int axisCount = axes.size();
for (int i=0; i < axisCount; i++)
for (size_t i=0; i < axes.size(); i++)
{
axes[i].axis->GetProperty()->SetColor(fr, fg, fb);
}
......@@ -753,8 +749,7 @@ void
VisWinAxesArray::SetVisibility(int vis)
{
axisVisibility = vis;
int axisCount = axes.size();
for (int i=0; i < axisCount; i++)
for (size_t i=0; i < axes.size(); i++)
{
axes[i].axis->SetVisibility(axisVisibility);
}
......@@ -784,8 +779,7 @@ void
VisWinAxesArray::SetLabelVisibility(int vis)
{
labelVisibility = vis;
int axisCount = axes.size();
for (int i=0; i < axisCount; i++)
for (size_t i=0; i < axes.size(); i++)
{
axes[i].axis->SetLabelVisibility(labelVisibility);
}
......@@ -810,8 +804,7 @@ void
VisWinAxesArray::SetTitleVisibility(int vis)
{
titleVisibility = vis;
int axisCount = axes.size();
for (int i=0; i < axisCount; i++)
for (size_t i=0; i < axes.size(); i++)
{
axes[i].axis->SetTitleVisibility(titleVisibility);
}
......@@ -836,8 +829,7 @@ void
VisWinAxesArray::SetTickLocation(int loc)
{
tickLocation = loc;
int axisCount = axes.size();
for (int i=0; i < axisCount; i++)
for (size_t i=0; i < axes.size(); i++)
{
axes[i].axis->SetTickLocation(tickLocation);
}
......@@ -863,8 +855,7 @@ VisWinAxesArray::SetTickVisibility(bool vis, bool labelvis)
{
tickVisibility = vis;
tickLabelVisibility = labelvis;
int axisCount = axes.size();
for (int i=0; i < axisCount; i++)
for (size_t i=0; i < axes.size(); i++)
{
axes[i].axis->SetMinorTicksVisible(tickVisibility);
axes[i].axis->SetTickVisibility(tickVisibility || tickLabelVisibility);
......@@ -892,8 +883,7 @@ void
VisWinAxesArray::SetAutoSetTicks(int autoset)
{
autoSetTicks = autoset;
int axisCount = axes.size();
for (int i=0; i < axisCount; i++)
for (size_t i=0; i < axes.size(); i++)
{
axes[i].axis->SetAdjustLabels(autoSetTicks);
}
......@@ -918,8 +908,7 @@ void
VisWinAxesArray::SetMajorTickMinimum(double majorMinimum)
{
majorTickMinimum = majorMinimum;
int axisCount = axes.size();
for (int i=0; i < axisCount; i++)
for (size_t i=0; i < axes.size(); i++)
{
axes[i].axis->SetMajorTickMinimum(majorTickMinimum);
}
......@@ -945,8 +934,7 @@ void
VisWinAxesArray::SetMajorTickMaximum(double majorMaximum)
{