Commit ddccc63f authored by Dmitry Yu. Naumov's avatar Dmitry Yu. Naumov
Browse files

Add long long and unsigned long long for prop. vec

parent c20b71f4
...@@ -211,11 +211,22 @@ void ElementTreeModel::setMesh(MeshLib::Mesh const& mesh) ...@@ -211,11 +211,22 @@ void ElementTreeModel::setMesh(MeshLib::Mesh const& mesh)
{ {
array_info.append(propertyBounds(*p)); array_info.append(propertyBounds(*p));
} }
else if (auto p = dynamic_cast<MeshLib::PropertyVector<long long>*>(
property))
{
array_info.append(propertyBounds(*p));
}
else if (auto p = dynamic_cast<MeshLib::PropertyVector<unsigned long>*>( else if (auto p = dynamic_cast<MeshLib::PropertyVector<unsigned long>*>(
property)) property))
{ {
array_info.append(propertyBounds(*p)); array_info.append(propertyBounds(*p));
} }
else if (auto p =
dynamic_cast<MeshLib::PropertyVector<unsigned long long>*>(
property))
{
array_info.append(propertyBounds(*p));
}
else if (auto p = dynamic_cast<MeshLib::PropertyVector<std::size_t>*>( else if (auto p = dynamic_cast<MeshLib::PropertyVector<std::size_t>*>(
property)) property))
{ {
......
...@@ -135,12 +135,25 @@ MeshLib::Properties constructProperties( ...@@ -135,12 +135,25 @@ MeshLib::Properties constructProperties(
fillPropVec(*p, new_properties, elems, node_map, n_nodes); fillPropVec(*p, new_properties, elems, node_map, n_nodes);
continue; continue;
} }
else if (auto const p =
dynamic_cast<PropertyVector<long long>*>(property))
{
fillPropVec(*p, new_properties, elems, node_map, n_nodes);
continue;
}
else if (auto const p = else if (auto const p =
dynamic_cast<PropertyVector<unsigned long>*>(property)) dynamic_cast<PropertyVector<unsigned long>*>(property))
{ {
fillPropVec(*p, new_properties, elems, node_map, n_nodes); fillPropVec(*p, new_properties, elems, node_map, n_nodes);
continue; continue;
} }
else if (auto const p =
dynamic_cast<PropertyVector<unsigned long long>*>(
property))
{
fillPropVec(*p, new_properties, elems, node_map, n_nodes);
continue;
}
else if (auto const p = else if (auto const p =
dynamic_cast<PropertyVector<std::size_t>*>(property)) dynamic_cast<PropertyVector<std::size_t>*>(property))
{ {
......
...@@ -97,11 +97,20 @@ void MeshInformation::writePropertyVectorInformation(const MeshLib::Mesh& mesh) ...@@ -97,11 +97,20 @@ void MeshInformation::writePropertyVectorInformation(const MeshLib::Mesh& mesh)
{ {
printBounds(*p); printBounds(*p);
} }
else if (auto p = dynamic_cast<PropertyVector<long long>*>(property))
{
printBounds(*p);
}
else if (auto p = else if (auto p =
dynamic_cast<PropertyVector<unsigned long>*>(property)) dynamic_cast<PropertyVector<unsigned long>*>(property))
{ {
printBounds(*p); printBounds(*p);
} }
else if (auto p = dynamic_cast<PropertyVector<unsigned long long>*>(
property))
{
printBounds(*p);
}
else if (auto p = dynamic_cast<PropertyVector<std::size_t>*>(property)) else if (auto p = dynamic_cast<PropertyVector<std::size_t>*>(property))
{ {
printBounds(*p); printBounds(*p);
......
...@@ -116,12 +116,23 @@ bool createSfcMeshProperties(MeshLib::Mesh& sfc_mesh, ...@@ -116,12 +116,23 @@ bool createSfcMeshProperties(MeshLib::Mesh& sfc_mesh,
processPropertyVector(*p, id_map, sfc_mesh); processPropertyVector(*p, id_map, sfc_mesh);
vectors_copied++; vectors_copied++;
} }
else if (auto p = dynamic_cast<PropertyVector<long long>*>(property))
{
processPropertyVector(*p, id_map, sfc_mesh);
vectors_copied++;
}
else if (auto p = else if (auto p =
dynamic_cast<PropertyVector<unsigned long>*>(property)) dynamic_cast<PropertyVector<unsigned long>*>(property))
{ {
processPropertyVector(*p, id_map, sfc_mesh); processPropertyVector(*p, id_map, sfc_mesh);
vectors_copied++; vectors_copied++;
} }
else if (auto p = dynamic_cast<PropertyVector<unsigned long long>*>(
property))
{
processPropertyVector(*p, id_map, sfc_mesh);
vectors_copied++;
}
else if (auto p = dynamic_cast<PropertyVector<std::size_t>*>(property)) else if (auto p = dynamic_cast<PropertyVector<std::size_t>*>(property))
{ {
processPropertyVector(*p, id_map, sfc_mesh); processPropertyVector(*p, id_map, sfc_mesh);
......
...@@ -162,11 +162,20 @@ int VtkMappedMeshSource::RequestData(vtkInformation* /*request*/, ...@@ -162,11 +162,20 @@ int VtkMappedMeshSource::RequestData(vtkInformation* /*request*/,
{ {
addProperty(*p); addProperty(*p);
} }
else if (auto p = dynamic_cast<PropertyVector<long long>*>(property))
{
addProperty(*p);
}
else if (auto p = else if (auto p =
dynamic_cast<PropertyVector<unsigned long>*>(property)) dynamic_cast<PropertyVector<unsigned long>*>(property))
{ {
addProperty(*p); addProperty(*p);
} }
else if (auto p =
dynamic_cast<PropertyVector<unsigned long long>*>(property))
{
addProperty(*p);
}
else if (auto p = dynamic_cast<PropertyVector<std::size_t>*>(property)) else if (auto p = dynamic_cast<PropertyVector<std::size_t>*>(property))
{ {
addProperty(*p); addProperty(*p);
...@@ -186,7 +195,8 @@ int VtkMappedMeshSource::RequestData(vtkInformation* /*request*/, ...@@ -186,7 +195,8 @@ int VtkMappedMeshSource::RequestData(vtkInformation* /*request*/,
"\n\t int," "\n\t int,"
"\n\t unsigned," "\n\t unsigned,"
"\n\t long," "\n\t long,"
"\n\t unsigned long," "\n\t long long,"
"\n\t unsigned long long,"
"\n\t char.", "\n\t char.",
property->getPropertyName(), property->getPropertyName(),
typeid(*property).name()); typeid(*property).name());
......
...@@ -236,11 +236,22 @@ PostProcessTool::PostProcessTool( ...@@ -236,11 +236,22 @@ PostProcessTool::PostProcessTool(
{ {
copyPropertyValues(*p, createProperty(*p)); copyPropertyValues(*p, createProperty(*p));
} }
else if (auto p =
dynamic_cast<MeshLib::PropertyVector<long long>*>(property))
{
copyPropertyValues(*p, createProperty(*p));
}
else if (auto p = dynamic_cast<MeshLib::PropertyVector<unsigned long>*>( else if (auto p = dynamic_cast<MeshLib::PropertyVector<unsigned long>*>(
property)) property))
{ {
copyPropertyValues(*p, createProperty(*p)); copyPropertyValues(*p, createProperty(*p));
} }
else if (auto p =
dynamic_cast<MeshLib::PropertyVector<unsigned long long>*>(
property))
{
copyPropertyValues(*p, createProperty(*p));
}
else if (auto p = dynamic_cast<MeshLib::PropertyVector<std::size_t>*>( else if (auto p = dynamic_cast<MeshLib::PropertyVector<std::size_t>*>(
property)) property))
{ {
...@@ -262,7 +273,9 @@ PostProcessTool::PostProcessTool( ...@@ -262,7 +273,9 @@ PostProcessTool::PostProcessTool(
"\n\t int," "\n\t int,"
"\n\t unsigned," "\n\t unsigned,"
"\n\t long," "\n\t long,"
"\n\t long long,"
"\n\t unsigned long," "\n\t unsigned long,"
"\n\t unsigned long long,"
"\n\t char.", "\n\t char.",
property->getPropertyName(), property->getPropertyName(),
typeid(*property).name()); typeid(*property).name());
......
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