Commit 596e5e3f authored by bonnell's avatar bonnell

Reduce warnings on windows.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23697 18c085ea-50e0-402c-830e-de6fd14e8384
parent 32482fde
......@@ -368,7 +368,7 @@ BoundaryViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
if(ct->IsDiscrete(ct->GetDefaultDiscreteColorTable()))
{
// The CT is discrete, get its color color control points.
for(size_t i = 0; i < sv.size(); ++i)
for(int i = 0; i < (int)sv.size(); ++i)
{
unsigned char rgb[3] = {0,0,0};
ct->GetControlPointColor(ct->GetDefaultDiscreteColorTable(), i, rgb);
......@@ -382,7 +382,7 @@ BoundaryViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
// The CT is continuous, sample the CT so we have a unique color
// for each element in sv.
unsigned char *rgb = ct->GetSampledColors(
ct->GetDefaultDiscreteColorTable(), sv.size());
ct->GetDefaultDiscreteColorTable(), (int)sv.size());
if(rgb)
{
for(size_t i = 0; i < sv.size(); ++i)
......
......@@ -511,7 +511,7 @@ BoundaryViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
if(ct->IsDiscrete(ct->GetDefaultDiscreteColorTable()))
{
// The CT is discrete, get its color color control points.
for(size_t i = 0; i < sv.size(); ++i)
for(int i = 0; i < (int)sv.size(); ++i)
{
unsigned char rgb[3] = {0,0,0};
ct->GetControlPointColor(ct->GetDefaultDiscreteColorTable(), i, rgb);
......@@ -525,7 +525,7 @@ BoundaryViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
// The CT is continuous, sample the CT so we have a unique color
// for each element in sv.
unsigned char *rgb = ct->GetSampledColors(
ct->GetDefaultDiscreteColorTable(), sv.size());
ct->GetDefaultDiscreteColorTable(), (int)sv.size());
if(rgb)
{
for(size_t i = 0; i < sv.size(); ++i)
......
......@@ -560,7 +560,6 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
const stringVector &matNames = boundaryAtts->GetBoundaryNames();
intVector selectedBoundaries;
bool update = true;
size_t i;
QListWidgetItem *item;
multipleColorList->blockSignals(true);
......@@ -568,7 +567,7 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
//
// Make a pass through the widget to see how many boundaries are selected.
//
for(i = 0; i < (size_t)multipleColorList->count(); ++i)
for(int i = 0; i < multipleColorList->count(); ++i)
{
if(multipleColorList->item(i)->isSelected())
selectedBoundaries.push_back(i);
......@@ -581,7 +580,7 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
{
// See if the strings are the same..
bool same = true;
for(i = 0; i < matNames.size() && same; ++i)
for(int i = 0; i < (int)matNames.size() && same; ++i)
{
ColorAttribute c(boundaryAtts->GetMultiColor()[i]);
......@@ -592,7 +591,7 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
// If the strings are not the same then modifiy the widgets.
if(!same)
{
for(i = 0; i < matNames.size(); ++i)
for(int i = 0; i < (int)matNames.size(); ++i)
UpdateItem(i);
}
else
......@@ -601,11 +600,11 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
else if(matNames.size() > (size_t)multipleColorList->count())
{
// Set all of the existing names.
for(i = 0; i < (size_t)multipleColorList->count(); ++i)
for(int i = 0; i < multipleColorList->count(); ++i)
UpdateItem(i);
// Add new entries
for(i = multipleColorList->count(); i < matNames.size(); ++i)
for(int i = multipleColorList->count(); i < (int)matNames.size(); ++i)
{
QString itemText(matNames[i].c_str());
ColorAttribute c(boundaryAtts->GetMultiColor()[i]);
......@@ -616,12 +615,12 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
else // if(matNames.size() < multipleColorList->count())
{
// Set all of the existing names.
for(i = 0; i < matNames.size(); ++i)
for(int i = 0; i < (int)matNames.size(); ++i)
UpdateItem(i);
// Remove excess entries
size_t numEntries = multipleColorList->count();
for(i = matNames.size(); i < numEntries; ++i)
int numEntries = multipleColorList->count();
for(int i = (int)matNames.size(); i < numEntries; ++i)
{
QListWidgetItem *item = multipleColorList->takeItem(multipleColorList->count() - 1);
if(item != 0)
......@@ -636,7 +635,7 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
{
multipleColorList->clearSelection();
bool noneSelected = true, first = true;
for(i = 0; i < selectedBoundaries.size(); ++i)
for(size_t i = 0; i < selectedBoundaries.size(); ++i)
{
if(selectedBoundaries[i] < multipleColorList->count())
{
......@@ -669,10 +668,10 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
//
if(matNames.size() > 0)
{
size_t selectedIndex = (selectedBoundaries.size() > 0) ?
int selectedIndex = (selectedBoundaries.size() > 0) ?
selectedBoundaries[0] : 0;
// Make sure that the selected index is in the range of visible colors.
if(selectedIndex >= matNames.size())
if(selectedIndex >= (int)matNames.size())
selectedIndex = 0;
SetMultipleColorWidgets(selectedIndex);
......
......@@ -826,7 +826,7 @@ avtBoundaryPlot::SortLabels()
vector < pair < string, int > > originalLabelPairs;
for (i = 0 ; i < originalLabels.size() ; i++)
{
originalLabelPairs.push_back(pair<string, int>(originalLabels[i], i));
originalLabelPairs.push_back(pair<string, int>(originalLabels[i], (int)i));
}
sort(originalLabelPairs.begin(), originalLabelPairs.end());
......
......@@ -874,9 +874,9 @@ ContourAttributes::SetDefaultPalette(const ColorControlPointList &defaultPalette
if(contourMethod == Level)
EnlargeMultiColor(contourNLevels);
else if(contourMethod == Value)
EnlargeMultiColor(contourValue.size());
EnlargeMultiColor((int)contourValue.size());
else
EnlargeMultiColor(contourPercent.size());
EnlargeMultiColor((int)contourPercent.size());
}
......@@ -964,7 +964,7 @@ ContourAttributes::SetContourValue(const doubleVector &contourValue_)
contourValue = contourValue_;
Select(ID_contourValue, (void *)&contourValue);
// Grow the color vector.
EnlargeMultiColor(contourValue.size());
EnlargeMultiColor((int)contourValue.size());
}
......@@ -974,7 +974,7 @@ ContourAttributes::SetContourPercent(const doubleVector &contourPercent_)
contourPercent = contourPercent_;
Select(ID_contourPercent, (void *)&contourPercent);
// Grow the color vector.
EnlargeMultiColor(contourPercent.size());
EnlargeMultiColor((int)contourPercent.size());
}
......
......@@ -12,13 +12,13 @@ Code: SetContourPercent
Prefix:
Postfix:
// Grow the color vector.
EnlargeMultiColor(contourPercent.size());
EnlargeMultiColor((int)contourPercent.size());
Code: SetContourValue
Prefix:
Postfix:
// Grow the color vector.
EnlargeMultiColor(contourValue.size());
EnlargeMultiColor((int)contourValue.size());
Code: SetDefaultPalette
Prefix:
......@@ -27,9 +27,9 @@ Postfix:
if(contourMethod == Level)
EnlargeMultiColor(contourNLevels);
else if(contourMethod == Value)
EnlargeMultiColor(contourValue.size());
EnlargeMultiColor((int)contourValue.size());
else
EnlargeMultiColor(contourPercent.size());
EnlargeMultiColor((int)contourPercent.size());
Constant: MAX_CONTOURS
Declaration: static const int MAX_CONTOURS;
......
......@@ -626,9 +626,9 @@ QvisContourPlotWindow::UpdateMultipleAreaColors()
if(cm == ContourAttributes::Level)
nEntries = contourAtts->GetContourNLevels();
else if(cm == ContourAttributes::Value)
nEntries = contourAtts->GetContourValue().size();
nEntries = (int)contourAtts->GetContourValue().size();
else
nEntries = contourAtts->GetContourPercent().size();
nEntries = (int)contourAtts->GetContourPercent().size();
// Block the signals from the multipleColors widget.
multipleColors->blockSignals(true);
......@@ -756,9 +756,9 @@ QvisContourPlotWindow::UpdateMultipleAreaNames()
if(cm == ContourAttributes::Level)
vecSize = contourAtts->GetContourNLevels();
else if(cm == ContourAttributes::Value)
vecSize = contourAtts->GetContourValue().size();
vecSize = (int)contourAtts->GetContourValue().size();
else
vecSize = contourAtts->GetContourPercent().size();
vecSize = (int)contourAtts->GetContourPercent().size();
if(vecSize == multipleColors->numEntries())
{
......
......@@ -897,7 +897,7 @@ FilledBoundaryAttributes::SetFromNode(DataNode *parentNode)
}
if (!done)
{
multiColor.RemoveColors(index);
multiColor.RemoveColors((int)index);
for (size_t i=index+1; i<boundaryNames.size(); i++)
boundaryNames[i-1] = boundaryNames[i];
boundaryNames.resize(boundaryNames.size() - 1);
......
......@@ -24,7 +24,7 @@ Postfix:
}
if (!done)
{
multiColor.RemoveColors(index);
multiColor.RemoveColors((int)index);
for (size_t i=index+1; i<boundaryNames.size(); i++)
boundaryNames[i-1] = boundaryNames[i];
boundaryNames.resize(boundaryNames.size() - 1);
......@@ -395,7 +395,7 @@ FilledBoundaryViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
else
{
unsigned char rgb[3] = {0,0,0};
ct->GetControlPointColor(ct->GetDefaultDiscreteColorTable(), i, rgb);
ct->GetControlPointColor(ct->GetDefaultDiscreteColorTable(), (int)i, rgb);
ca[i].SetRed(int(rgb[0]));
ca[i].SetGreen(int(rgb[1]));
ca[i].SetBlue(int(rgb[2]));
......@@ -407,7 +407,7 @@ FilledBoundaryViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
// The CT is continuous, sample the CT so we have a unique color
// for each element in sv.
unsigned char *rgb = ct->GetSampledColors(
ct->GetDefaultDiscreteColorTable(), sv.size());
ct->GetDefaultDiscreteColorTable(), (int)sv.size());
if(rgb)
{
for(size_t i = 0; i < sv.size(); ++i)
......
......@@ -535,7 +535,7 @@ FilledBoundaryViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
else
{
unsigned char rgb[3] = {0,0,0};
ct->GetControlPointColor(ct->GetDefaultDiscreteColorTable(), i, rgb);
ct->GetControlPointColor(ct->GetDefaultDiscreteColorTable(), (int)i, rgb);
ca[i].SetRed(int(rgb[0]));
ca[i].SetGreen(int(rgb[1]));
ca[i].SetBlue(int(rgb[2]));
......@@ -547,7 +547,7 @@ FilledBoundaryViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
// The CT is continuous, sample the CT so we have a unique color
// for each element in sv.
unsigned char *rgb = ct->GetSampledColors(
ct->GetDefaultDiscreteColorTable(), sv.size());
ct->GetDefaultDiscreteColorTable(), (int)sv.size());
if(rgb)
{
for(size_t i = 0; i < sv.size(); ++i)
......
......@@ -604,7 +604,7 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
const stringVector &matNames = boundaryAtts->GetBoundaryNames();
intVector selectedBoundaries;
bool update = true;
size_t i;
int i;
QListWidgetItem *item;
multipleColorList->blockSignals(true);
......@@ -612,7 +612,7 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
//
// Make a pass through the widget to see how many boundaries are selected.
//
for(i = 0; i < (size_t)multipleColorList->count(); ++i)
for(i = 0; i < multipleColorList->count(); ++i)
{
if(multipleColorList->item(i)->isSelected())
selectedBoundaries.push_back(i);
......@@ -625,7 +625,7 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
{
// See if the strings are the same..
bool same = true;
for(i = 0; i < matNames.size() && same; ++i)
for(i = 0; i < (int)matNames.size() && same; ++i)
{
ColorAttribute c(boundaryAtts->GetMultiColor()[i]);
......@@ -636,7 +636,7 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
// If the strings are not the same then modifiy the widgets.
if(!same)
{
for(i = 0; i < matNames.size(); ++i)
for(i = 0; i < (int)matNames.size(); ++i)
UpdateItem(i);
}
else
......@@ -645,11 +645,11 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
else if(matNames.size() > (size_t)multipleColorList->count())
{
// Set all of the existing names.
for(i = 0; i < (size_t)multipleColorList->count(); ++i)
for(i = 0; i < multipleColorList->count(); ++i)
UpdateItem(i);
// Add new entries
for(i = multipleColorList->count(); i < matNames.size(); ++i)
for(i = multipleColorList->count(); i < (int)matNames.size(); ++i)
{
QString itemText(matNames[i].c_str());
ColorAttribute c(boundaryAtts->GetMultiColor()[i]);
......@@ -660,12 +660,12 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
else // if(matNames.size() < multipleColorList->count())
{
// Set all of the existing names.
for(i = 0; i < matNames.size(); ++i)
for(i = 0; i < (int)matNames.size(); ++i)
UpdateItem(i);
// Remove excess entries
int numEntries = multipleColorList->count();
for(i = (int)matNames.size(); i < (size_t)numEntries; ++i)
for(i = (int)matNames.size(); i < numEntries; ++i)
{
QListWidgetItem *item = multipleColorList->takeItem(multipleColorList->count() - 1);
if(item != 0)
......@@ -680,7 +680,7 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
{
multipleColorList->clearSelection();
bool noneSelected = true, first = true;
for(i = 0; i < selectedBoundaries.size(); ++i)
for(i = 0; i < (int)selectedBoundaries.size(); ++i)
{
if(selectedBoundaries[i] < multipleColorList->count())
{
......
......@@ -959,7 +959,7 @@ avtFilledBoundaryPlot::SortLabels()
vector < pair < string, int > > originalLabelPairs;
for (i = 0 ; i < originalLabels.size() ; i++)
{
originalLabelPairs.push_back(pair<string, int>(originalLabels[i], i));
originalLabelPairs.push_back(pair<string, int>(originalLabels[i], (int)i));
}
sort(originalLabelPairs.begin(), originalLabelPairs.end());
......
......@@ -700,7 +700,7 @@ avtMoleculePlot::SetLegendRange()
// Set attributes for levels legend
vector <string> usedLabels;
behavior->GetInfo().GetAttributes().GetLabels(usedLabels);
int nlabels = usedLabels.size();
size_t nlabels = usedLabels.size();
if (nlabels == 0)
{
......@@ -740,7 +740,7 @@ avtMoleculePlot::SetLegendRange()
// renderer for drawing resseq.
numcolors = int(max);
residueColorMap.clear();
for (int i=0; i<nlabels; i++)
for (size_t i=0; i<nlabels; i++)
{
int val;
sscanf(usedLabels[i].c_str(), "%d", &val);
......@@ -763,7 +763,7 @@ avtMoleculePlot::SetLegendRange()
// Make sure that all of the labels that we're using are learned
// so we get the right items.
vector<string> uLabels;
for(int k = 0; k < nlabels; k += 3)
for(size_t k = 0; k < nlabels; k += 3)
{
if(usedLabels[k] == "on")
uLabels.push_back(usedLabels[k+1]);
......@@ -780,7 +780,7 @@ avtMoleculePlot::SetLegendRange()
}
usedLabels = uLabels;
nlabels = (int)usedLabels.size();
nlabels = usedLabels.size();
// Redo the colormap in case there are new restypes that we've
// learned about.
......@@ -796,7 +796,7 @@ avtMoleculePlot::SetLegendRange()
if (colortablename == "Default")
colortablename = string(ct->GetDefaultContinuousColorTable());
numcolors = nlabels;//256;
numcolors = (int)nlabels;//256;
levelsLegend->SetLabelColorMap(blankColorMap);
}
......
......@@ -1472,7 +1472,7 @@ avtOpenGLMoleculeRenderer::DrawRectangleBetweenTwoPoints(double *p0,
double *p1,
float r)
{
float v[3] = {p0[1]-p1[1], p1[0]-p0[0], 0};
float v[3] = {(float)(p0[1]-p1[1]), (float)(p1[0]-p0[0]), 0.f};
float v_len = vtkMath::Normalize(v);
if (v_len == 0)
return;
......
......@@ -163,7 +163,7 @@ avtMultiCurveFilter::PostExecute(void)
//
std::vector<std::string> labels;
outAtts.GetLabels(labels);
int nCurves = labels.size();
int nCurves = (int)labels.size();
outAtts.GetOriginalSpatialExtents()->Clear();
outAtts.GetThisProcsOriginalSpatialExtents()->Clear();
......
......@@ -65,7 +65,7 @@ ParallelCoordinatesAttributes::InsertAxis(const std::string &axisName_)
saveExtentMax = +1e+37;
}
int insertOrdinal = scalarAxisNames.size();
size_t insertOrdinal = scalarAxisNames.size();
saxisNamesIt = scalarAxisNames.begin() + insertOrdinal;
vaxisNamesIt = visualAxisNames.begin() + insertOrdinal;
......
......@@ -1315,7 +1315,7 @@ ParallelCoordinatesAttributes::InsertAxis(const std::string &axisName_)
saveExtentMax = +1e+37;
}
int insertOrdinal = scalarAxisNames.size();
size_t insertOrdinal = scalarAxisNames.size();
saxisNamesIt = scalarAxisNames.begin() + insertOrdinal;
vaxisNamesIt = visualAxisNames.begin() + insertOrdinal;
......
......@@ -1006,7 +1006,7 @@ QvisParallelCoordinatesPlotWindow::resetAxisExtents()
void
QvisParallelCoordinatesPlotWindow::axisSelected(QTreeWidgetItem*)
{
int nitems = atts->GetScalarAxisNames().size();
int nitems = (int)atts->GetScalarAxisNames().size();
QTreeWidgetItem *ci = axisTree->currentItem();
axisDelButton->setEnabled(nitems > 2 &&
ci != NULL);
......@@ -1127,7 +1127,7 @@ QvisParallelCoordinatesPlotWindow::moveAxisUp()
// must make a local copy
stringVector axes = atts->GetScalarAxisNames();
int naxes = axes.size();
int naxes = (int)axes.size();
// InsertAxis() will reorder axes already in the list, so we
// just insert all the changed ones in the new desired order
......@@ -1175,10 +1175,10 @@ QvisParallelCoordinatesPlotWindow::moveAxisDown()
// must make a local copy
stringVector axes = atts->GetScalarAxisNames();
int naxes = axes.size();
int naxes = (int)axes.size();
// can't move last axis down in list
if (index >= (int)axes.size()-1)
if (index >= naxes-1)
return;
// InsertAxis() will reorder axes already in the list, so we
......
......@@ -190,10 +190,10 @@ QvisParallelCoordinatesPlotWizard::SetParallelCoordinatesAttributes()
mainPage->GetAxisNames(saxisNames);
int nvars = saxisNames.size();
size_t nvars = saxisNames.size();
vaxisNames = saxisNames;
for(int i=0;i < nvars;i++)
for(size_t i=0;i < nvars;i++)
{
extMins.push_back(-1e+37);
extMaxs.push_back(+1e+37);
......
......@@ -315,9 +315,9 @@ avtParallelCoordinatesFilter::ModifyContract(avtContract_p in_contract)
if (!success)
break; // out of iterating over time
int numVars = parCoordsAtts.GetExtentMinima().size();
size_t numVars = parCoordsAtts.GetExtentMinima().size();
bool haveSelection = false;
for (int i = 0 ; i < numVars ; i++)
for (size_t i = 0 ; i < numVars ; i++)
{
if (parCoordsAtts.GetExtentMinima()[i] > -1e+36)
{
......@@ -647,12 +647,12 @@ avtParallelCoordinatesFilter::PostExecute(void)
outAtts.SetYUnits("");
}
for (size_t t=0; t<histograms.size(); t++)
for (int t=0; t<(int)histograms.size(); t++)
DrawContext(t);
if (parCoordsAtts.GetDrawFocusAs()!=ParallelCoordinatesAttributes::IndividualLines)
{
for (size_t t=0; t<histogramsForSelectedRegion.size(); t++)
for (int t=0; t<(int)histogramsForSelectedRegion.size(); t++)
if (histogramsForSelectedRegion[t] != NULL)
DrawFocusHistograms(t);
}
......@@ -1680,8 +1680,8 @@ avtParallelCoordinatesFilter::DrawHistogram(int ts, bool focus)
bounds = &(hist[ts][axisNum].GetBounds()[0]);
else
bounds = &(hist[ts][axisNum-1].GetBounds()[1]);
int nparts = bounds->size() - 1;
for (int part = 0 ; part <= nparts ; part++)
size_t nparts = bounds->size() - 1;
for (size_t part = 0 ; part <= nparts ; part++)
{
double val = (*bounds)[part];
float pt[3];
......@@ -2489,7 +2489,7 @@ UpdateLimitsWithAllHSTimeSteps(int axis,
if ((*bounds)[0] < varmin)
varmin = (*bounds)[0];
int nparts = bounds->size() - 1;
size_t nparts = bounds->size() - 1;
if ((*bounds)[nparts] > varmax)
varmax = (*bounds)[nparts];
}
......
......@@ -704,8 +704,8 @@ SpreadsheetViewer::PickPointsChanged() const
{
changed = true;
}
int nvals = cachedAtts.GetPastPicks().size();
for (int i = 0 ; i < nvals ; i++)
size_t nvals = cachedAtts.GetPastPicks().size();
for (size_t i = 0 ; i < nvals ; i++)
{
if (cachedAtts.GetPastPicks()[i] != plotAtts->GetPastPicks()[i])
{
......@@ -2110,9 +2110,9 @@ SpreadsheetViewer::selectPickPoints()
// Now, go through the old picks
const std::vector<double>& pastPicks = plotAtts->GetPastPicks();
const std::vector<std::string>& pastPickLetters = plotAtts->GetPastPickLetters();
int numOldPicks = pastPicks.size() / 2;
size_t numOldPicks = pastPicks.size() / 2;
int old_ijk[3];
for (int i = 0 ; i < numOldPicks ; i++)
for (size_t i = 0 ; i < numOldPicks ; i++)
{
GetPickIJK((int)pastPicks[2*i], (int)pastPicks[2*i+1], old_ijk);
......
......@@ -576,7 +576,7 @@ QvisSubsetPlotWindow::UpdateMultipleArea()
const stringVector &matNames = subsetAtts->GetSubsetNames();
intVector selectedsubsets;
bool update = true;
size_t i;
int i;
QListWidgetItem *item;
multipleColorList->blockSignals(true);
......@@ -584,7 +584,7 @@ QvisSubsetPlotWindow::UpdateMultipleArea()
//
// Make a pass through the widget to see how many subsets are selected.
//
for(i = 0; i < (size_t)multipleColorList->count(); ++i)
for(i = 0; i < multipleColorList->count(); ++i)
{
if(multipleColorList->item(i)->isSelected())
selectedsubsets.push_back(i);
......@@ -597,7 +597,7 @@ QvisSubsetPlotWindow::UpdateMultipleArea()
{
// See if the strings are the same..
bool same = true;
for(i = 0; i < matNames.size() && same; ++i)
for(i = 0; i < (int)matNames.size() && same; ++i)
{
ColorAttribute c(subsetAtts->GetMultiColor()[i]);
......@@ -608,7 +608,7 @@ QvisSubsetPlotWindow::UpdateMultipleArea()
// If the strings are not the same then modifiy the widgets.
if(!same)
{
for(i = 0; i < matNames.size(); ++i)
for(i = 0; i < (int)matNames.size(); ++i)
UpdateItem(i);
}
else
......@@ -617,11 +617,11 @@ QvisSubsetPlotWindow::UpdateMultipleArea()
else if(matNames.size() > (size_t)multipleColorList->count())
{
// Set all of the existing names.
for(i = 0; i < (size_t)multipleColorList->count(); ++i)
for(i = 0; i < multipleColorList->count(); ++i)
UpdateItem(i);
// Add new entries
for(i = multipleColorList->count(); i < matNames.size(); ++i)
for(i = multipleColorList->count(); i < (int)matNames.size(); ++i)
{
QString itemText(matNames[i].c_str());
ColorAttribute c(subsetAtts->GetMultiColor()[i]);
......@@ -632,12 +632,12 @@ QvisSubsetPlotWindow::UpdateMultipleArea()
else // if(matNames.size() < multipleColorList->count())
{
// Set all of the existing names.
for(i = 0; i < matNames.size(); ++i)
for(i = 0; i < (int)matNames.size(); ++i)
UpdateItem(i);
// Remove excess entries
size_t numEntries = multipleColorList->count();
for(i = matNames.size(); i < numEntries; ++i)
int numEntries = multipleColorList->count();
for(i = (int)matNames.size(); i < numEntries; ++i)
{
QListWidgetItem *item = multipleColorList->takeItem(multipleColorList->count() - 1);
if(item != 0)
......@@ -652,7 +652,7 @@ QvisSubsetPlotWindow::UpdateMultipleArea()
{
multipleColorList->clearSelection();
bool noneSelected = true, first = true;
for(i = 0; i < selectedsubsets.size(); ++i)
for(i = 0; i < (int)selectedsubsets.size(); ++i)
{
if(selectedsubsets[i] < multipleColorList->count())
{
......
......@@ -402,7 +402,7 @@ SubsetViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
for(size_t i = 0; i < sv.size(); ++i)
{
unsigned char rgb[3] = {0,0,0};
ct->GetControlPointColor(ct->GetDefaultDiscreteColorTable(), i, rgb);
ct->GetControlPointColor(ct->GetDefaultDiscreteColorTable(), (int)i, rgb);
ca[i].SetRed(int(rgb[0]));
ca[i].SetGreen(int(rgb[1]));
ca[i].SetBlue(int(rgb[2]));
......@@ -413,7 +413,7 @@ SubsetViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
// The CT is continuous, sample the CT so we have a unique color
// for each element in sv.
unsigned char *rgb = ct->GetSampledColors(
ct->GetDefaultDiscreteColorTable(), sv.size());
ct->GetDefaultDiscreteColorTable(), (int)sv.size());
if(rgb)
{
for(size_t i = 0; i < sv.size(); ++i)
......
......@@ -580,7 +580,7 @@ SubsetViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
for(size_t i = 0; i < sv.size(); ++i)
{
unsigned char rgb[3] = {0,0,0};
ct->GetControlPointColor(ct->GetDefaultDiscreteColorTable(), i, rgb);
ct->GetControlPointColor(ct->GetDefaultDiscreteColorTable(), (int)i, rgb);
ca[i].SetRed(int(rgb[0]));
ca[i].SetGreen(int(rgb[1]));
ca[i].SetBlue(int(rgb[2]));
......@@ -591,7 +591,7 @@ SubsetViewerPluginInfo::PrivateSetPlotAtts(AttributeSubject *atts,
// The CT is continuous, sample the CT so we have a unique color
// for each element in sv.
unsigned char *rgb = ct->GetSampledColors(
ct->GetDefaultDiscreteColorTable(), sv.size());
ct->GetDefaultDiscreteColorTable(), (int)sv.size());
if(rgb)
{
for(size_t i = 0; i < sv.size(); ++i)
......
......@@ -1067,7 +1067,7 @@ avtSubsetPlot::SortLabels()
vector < pair < string, int > > originalLabelPairs;
for (i = 0 ; i < originalLabels.size() ; i++)
{
originalLabelPairs.push_back(pair<string, int>(originalLabels[i], i));
originalLabelPairs.push_back(pair<string, int>(originalLabels[i], (int)i));
}
sort(originalLabelPairs.begin(), originalLabelPairs.end());
......
......@@ -347,7 +347,7 @@ avtTopologyFilter::ExecuteDataTree(vtkDataSet *in_ds, int domain, string)
vector<vtkPolyData *> contours;
vector<string> labels;
int cl;
size_t cl;
for (cl = 0; cl < 4; ++cl)
{
contourInput->GetPointData()->SetScalars(rv[cl]);
......@@ -373,7 +373,7 @@ avtTopologyFilter::ExecuteDataTree(vtkDataSet *in_ds, int domain, string)
data->Delete();
int ccount = contours.size();
size_t ccount = contours.size();
if (ccount == 0)
return NULL;
......@@ -381,7 +381,7 @@ avtTopologyFilter::ExecuteDataTree(vtkDataSet *in_ds, int domain, string)
for (cl = 0; cl < ccount; ++cl)
out_ds[cl] = contours[cl];
avtDataTree_p returnDT = new avtDataTree(ccount, out_ds, domain, labels);
avtDataTree_p returnDT = new avtDataTree((int)ccount, out_ds, domain, labels);
return returnDT;
}
......