An update will be applied December 9th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit 36d32561 authored by Sreekanth Arikatla's avatar Sreekanth Arikatla
Browse files

Merge branch 'ScalarFix' into 'master'

BUG: Scalar fix

See merge request iMSTK/iMSTK!646
parents ed212e8f 9c635cd3
...@@ -300,7 +300,7 @@ VTKLineMeshRenderDelegate::setVertexScalarBuffer(std::shared_ptr<AbstractDataArr ...@@ -300,7 +300,7 @@ VTKLineMeshRenderDelegate::setVertexScalarBuffer(std::shared_ptr<AbstractDataArr
} }
m_mappedVertexScalarArray->SetNumberOfComponents(m_vertexScalars->getNumberOfComponents()); m_mappedVertexScalarArray->SetNumberOfComponents(m_vertexScalars->getNumberOfComponents());
m_mappedVertexScalarArray->SetVoidArray(m_vertexScalars->getVoidPointer(), m_mappedVertexScalarArray->SetVoidArray(m_vertexScalars->getVoidPointer(),
static_cast<vtkIdType>(m_vertexScalars->size() * m_vertexScalars->getNumberOfComponents()), 1); static_cast<vtkIdType>(m_vertexScalars->size()), 1);
m_mappedVertexScalarArray->Modified(); m_mappedVertexScalarArray->Modified();
} }
...@@ -325,7 +325,7 @@ VTKLineMeshRenderDelegate::setCellScalarBuffer(std::shared_ptr<AbstractDataArray ...@@ -325,7 +325,7 @@ VTKLineMeshRenderDelegate::setCellScalarBuffer(std::shared_ptr<AbstractDataArray
m_mappedCellScalarArray->SetNumberOfComponents(m_cellScalars->getNumberOfComponents()); m_mappedCellScalarArray->SetNumberOfComponents(m_cellScalars->getNumberOfComponents());
m_mappedCellScalarArray->SetVoidArray(m_cellScalars->getVoidPointer(), m_mappedCellScalarArray->SetVoidArray(m_cellScalars->getVoidPointer(),
static_cast<vtkIdType>(m_cellScalars->size() * m_cellScalars->getNumberOfComponents()), 1); static_cast<vtkIdType>(m_cellScalars->size()), 1);
m_mappedCellScalarArray->Modified(); m_mappedCellScalarArray->Modified();
} }
} // imstk } // imstk
...@@ -213,7 +213,7 @@ VTKPointSetRenderDelegate::setVertexScalarBuffer(std::shared_ptr<AbstractDataArr ...@@ -213,7 +213,7 @@ VTKPointSetRenderDelegate::setVertexScalarBuffer(std::shared_ptr<AbstractDataArr
} }
m_mappedVertexScalarArray->SetNumberOfComponents(m_vertexScalars->getNumberOfComponents()); m_mappedVertexScalarArray->SetNumberOfComponents(m_vertexScalars->getNumberOfComponents());
m_mappedVertexScalarArray->SetVoidArray(m_vertexScalars->getVoidPointer(), m_mappedVertexScalarArray->SetVoidArray(m_vertexScalars->getVoidPointer(),
static_cast<vtkIdType>(m_vertexScalars->size() * m_vertexScalars->getNumberOfComponents()), 1); static_cast<vtkIdType>(m_vertexScalars->size()), 1);
m_mappedVertexScalarArray->Modified(); m_mappedVertexScalarArray->Modified();
} }
} // imstk } // imstk
...@@ -398,7 +398,7 @@ VTKSurfaceMeshRenderDelegate::setVertexScalarBuffer(std::shared_ptr<AbstractData ...@@ -398,7 +398,7 @@ VTKSurfaceMeshRenderDelegate::setVertexScalarBuffer(std::shared_ptr<AbstractData
} }
m_mappedVertexScalarArray->SetNumberOfComponents(m_vertexScalars->getNumberOfComponents()); m_mappedVertexScalarArray->SetNumberOfComponents(m_vertexScalars->getNumberOfComponents());
m_mappedVertexScalarArray->SetVoidArray(m_vertexScalars->getVoidPointer(), m_mappedVertexScalarArray->SetVoidArray(m_vertexScalars->getVoidPointer(),
static_cast<vtkIdType>(m_vertexScalars->size() * m_vertexScalars->getNumberOfComponents()), 1); static_cast<vtkIdType>(m_vertexScalars->size()), 1);
m_mappedVertexScalarArray->Modified(); m_mappedVertexScalarArray->Modified();
} }
...@@ -422,7 +422,7 @@ VTKSurfaceMeshRenderDelegate::setCellScalarBuffer(std::shared_ptr<AbstractDataAr ...@@ -422,7 +422,7 @@ VTKSurfaceMeshRenderDelegate::setCellScalarBuffer(std::shared_ptr<AbstractDataAr
} }
m_mappedCellScalarArray->SetNumberOfComponents(m_cellScalars->getNumberOfComponents()); m_mappedCellScalarArray->SetNumberOfComponents(m_cellScalars->getNumberOfComponents());
m_mappedCellScalarArray->SetVoidArray(m_cellScalars->getVoidPointer(), m_mappedCellScalarArray->SetVoidArray(m_cellScalars->getVoidPointer(),
static_cast<vtkIdType>(m_cellScalars->size() * m_cellScalars->getNumberOfComponents()), 1); static_cast<vtkIdType>(m_cellScalars->size()), 1);
m_mappedCellScalarArray->Modified(); m_mappedCellScalarArray->Modified();
} }
......
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