Commit 8bc7fa15 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell

COMP: Fixed compiler warnings with MSVC.

parent 1d8306e3
......@@ -59,7 +59,7 @@ public:
};
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkChartParallelCoordinates, "1.2");
vtkCxxRevisionMacro(vtkChartParallelCoordinates, "1.3");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkChartParallelCoordinates);
......@@ -237,7 +237,7 @@ void vtkChartParallelCoordinates::UpdateGeometry()
// Iterate through the axes and set them up to span the chart area.
int xStep = (this->Point2[0] - this->Point1[0]) /
(this->Storage->Axes.size()-1);
(static_cast<int>(this->Storage->Axes.size())-1);
int x = this->Point1[0];
for (size_t i = 0; i < this->Storage->Axes.size(); ++i)
......@@ -366,7 +366,7 @@ bool vtkChartParallelCoordinates::MouseButtonPressEvent(const vtkContextMouseEve
if (axis->GetPoint1()[0]-10 < mouse.ScenePos[0] &&
axis->GetPoint1()[0]+10 > mouse.ScenePos[0])
{
this->Storage->CurrentAxis = i;
this->Storage->CurrentAxis = static_cast<int>(i);
this->Scene->SetDirty(true);
this->Storage->AxesSelections[i].Set(axis->GetPoint1()[0]-5,
mouse.ScenePos[1],
......@@ -446,7 +446,8 @@ bool vtkChartParallelCoordinates::MouseButtonReleaseEvent(const vtkContextMouseE
high /= this->Storage->Transform->GetMatrix()->GetElement(1, 1);
// Process the selected range and display this
this->Storage->Plot->SetSelectionRange(i, low, high);
this->Storage->Plot->SetSelectionRange(static_cast<int>(i),
low, high);
}
}
}
......
......@@ -49,7 +49,7 @@ public:
bool SelectionInitialized;
};
vtkCxxRevisionMacro(vtkPlotParallelCoordinates, "1.2");
vtkCxxRevisionMacro(vtkPlotParallelCoordinates, "1.3");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPlotParallelCoordinates);
......@@ -124,8 +124,9 @@ bool vtkPlotParallelCoordinates::Paint(vtkContext2D *painter)
// Update the axis positions
for (size_t i = 0; i < cols; ++i)
{
this->Storage->AxisPos[i] = this->Parent->GetAxis(i) ?
this->Parent->GetAxis(i)->GetPoint1()[0] : 0;
this->Storage->AxisPos[i] = this->Parent->GetAxis(int(i)) ?
this->Parent->GetAxis(int(i))->GetPoint1()[0] :
0;
}
vtkIdType selection = 0;
......@@ -148,7 +149,7 @@ bool vtkPlotParallelCoordinates::Paint(vtkContext2D *painter)
{
line[j].Set(this->Storage->AxisPos[j], (*this->Storage)[j][i]);
}
painter->DrawPoly(line[0].GetData(), cols);
painter->DrawPoly(line[0].GetData(), static_cast<int>(cols));
}
// Now draw the selected lines
......@@ -162,7 +163,7 @@ bool vtkPlotParallelCoordinates::Paint(vtkContext2D *painter)
this->Selection->GetTupleValue(i, &id);
line[j].Set(this->Storage->AxisPos[j], (*this->Storage)[j][id]);
}
painter->DrawPoly(line[0].GetData(), cols);
painter->DrawPoly(line[0].GetData(), static_cast<int>(cols));
}
}
......
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