diff --git a/Gui/DataView/ElementTreeModel.cpp b/Gui/DataView/ElementTreeModel.cpp index e5c3d1ecf72d4c4a3f10d404279604b5c9bbcd2c..d5e084774a561350ec489f4ac11881e6946f97e9 100644 --- a/Gui/DataView/ElementTreeModel.cpp +++ b/Gui/DataView/ElementTreeModel.cpp @@ -121,7 +121,7 @@ void ElementTreeModel::setMesh(MeshLib::Mesh const*const mesh) TreeItem* elements_item = new TreeItem(elements_number, _rootItem); _rootItem->appendChild(elements_item); - const std::array<QString, 7> n_element_names = { "Lines:", "Triangles:", "Quads:", "Tetrahedra:", "Hexahedra:", "Pyramids:", "Prisms:" }; + const std::array<QString, 7> n_element_names = {{ "Lines:", "Triangles:", "Quads:", "Tetrahedra:", "Hexahedra:", "Pyramids:", "Prisms:" }}; const std::array<unsigned, 7>& n_element_types (MeshInformation::getNumberOfElementTypes(*mesh)); for (std::size_t i=0; i<n_element_types.size(); ++i) { diff --git a/Gui/VtkVis/VtkRaster.cpp b/Gui/VtkVis/VtkRaster.cpp index b40f763546ec0290e6ec1ddc38572df385134bed..b31902955fd54762de786319aa30ed66a21683b4 100644 --- a/Gui/VtkVis/VtkRaster.cpp +++ b/Gui/VtkVis/VtkRaster.cpp @@ -62,9 +62,10 @@ vtkImageAlgorithm* VtkRaster::loadImage(const std::string &fileName, if (raster) { x0 = raster->getOrigin()[0]; y0 = raster->getOrigin()[1]; + delta = raster->getRasterPixelDistance(); double const*const data (raster->begin()); return VtkRaster::loadImageFromArray(data, x0, y0, - raster->getNCols(), raster->getNRows(), raster->getRasterPixelDistance(), + raster->getNCols(), raster->getNRows(), delta, raster->getNoDataValue()); } else if ((fileInfo.suffix().toLower() == "tif") || (fileInfo.suffix().toLower() == "tiff"))