diff --git a/GeoLib/Raster.cpp b/GeoLib/Raster.cpp
index 2808b6c244b7db308e70a8e5775b8c88c715433f..56e6420b2aff214d693a0e93af10153b14e975eb 100644
--- a/GeoLib/Raster.cpp
+++ b/GeoLib/Raster.cpp
@@ -17,7 +17,6 @@
// BaseLib
#include "StringTools.h"
-namespace GeoLib {
Raster::Raster(std::size_t n_cols, std::size_t n_rows, double xllcorner, double yllcorner,
double cell_size, double no_data_val, double* raster_data) :
@@ -91,10 +90,10 @@ void Raster::writeRasterAsASC(std::ostream &os) const
}
}
-Raster* Raster::getRasterFromSurface(Surface const& sfc, double cell_size, double no_data_val)
+Raster* Raster::getRasterFromSurface(GeoLib::Surface const& sfc, double cell_size, double no_data_val)
{
- Point const& ll (sfc.getAABB().getMinPoint());
- Point const& ur (sfc.getAABB().getMaxPoint());
+ GeoLib::Point const& ll (sfc.getAABB().getMinPoint());
+ GeoLib::Point const& ur (sfc.getAABB().getMaxPoint());
std::size_t n_cols = static_cast<size_t>(fabs(ur[0]-ll[0]) / cell_size)+1;
std::size_t n_rows = static_cast<size_t>(fabs(ur[1]-ll[1]) / cell_size)+1;
@@ -111,7 +110,7 @@ Raster* Raster::getRasterFromSurface(Surface const& sfc, double cell_size, doubl
const double test_pnt[3] = { ll[0] + r*cell_size, ll[1] + c*cell_size, 0};
for (k=0; k<n_triangles; k++) {
if (sfc[k]->containsPoint2D(test_pnt)) {
- Triangle const * const tri (sfc[k]);
+ GeoLib::Triangle const * const tri (sfc[k]);
// compute coefficients c0, c1, c2 for the plane f(x,y) = c0 x + c1 y + c2
double coeff[3] = {0.0, 0.0, 0.0};
GeoLib::getPlaneCoefficients(*tri, coeff);
@@ -130,80 +129,213 @@ Raster* Raster::getRasterFromSurface(Surface const& sfc, double cell_size, doubl
Raster* Raster::getRasterFromASCFile(std::string const& fname)
{
- std::ifstream in(fname.c_str());
+ unsigned width(0), height(0);
+ double x0(0), y0(0), delta(1);
+ double no_data(-9999);
- if (!in.is_open()) {
- std::cout << "Raster::getRasterFromASCFile() - Could not open file..." << fname << std::endl;
- return NULL;
- }
-
- // header information
- std::size_t n_cols(0), n_rows(0);
- double xllcorner(0.0), yllcorner(0.0), cell_size(0.0), no_data_val(-9999);
-
- if (readASCHeader(in, n_cols, n_rows, xllcorner, yllcorner, cell_size, no_data_val)) {
- double* values = new double[n_cols*n_rows];
- std::string s;
- // read the data into the double-array
- for (size_t j(0); j < n_rows; ++j) {
- size_t idx ((n_rows - j - 1) * n_cols);
- for (size_t i(0); i < n_cols; ++i) {
- in >> s;
- values[idx+i] = strtod(BaseLib::replaceString(",", ".", s).c_str(),0);
+ double* data = loadDataFromASC(fname, x0, y0, height, width, delta, no_data);
- }
- }
- in.close();
- return new Raster(n_cols, n_rows, xllcorner, yllcorner,
- cell_size, no_data_val, values);
- } else {
- std::cout << "Raster::getRasterFromASCFile() - could not read header of file " << fname << std::endl;
- return NULL;
- }
+ if (data)
+ return new Raster(width, height, x0, y0, delta, no_data, data);
+ else
+ return nullptr;
}
-bool Raster::readASCHeader(std::ifstream &in, size_t &n_cols, std::size_t &n_rows,
- double &xllcorner, double &yllcorner, double &cell_size, double &no_data_val)
+bool Raster::readASCHeader(ascHeader &header, std::ifstream &in)
{
- std::string tag, value;
+ std::string line, tag, value;
in >> tag;
- if (tag.compare("ncols") == 0) {
+ if (tag.compare("ncols") == 0)
+ {
in >> value;
- n_cols = atoi(value.c_str());
- } else return false;
-
+ header.ncols = atoi(value.c_str());
+ }
+ else
+ return false;
in >> tag;
- if (tag.compare("nrows") == 0) {
+ if (tag.compare("nrows") == 0)
+ {
in >> value;
- n_rows = atoi(value.c_str());
- } else return false;
-
+ header.nrows = atoi(value.c_str());
+ }
+ else
+ return false;
in >> tag;
- if (tag.compare("xllcorner") == 0) {
+ if (tag.compare("xllcorner") == 0)
+ {
in >> value;
- xllcorner = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0);
- } else return false;
-
+ header.x = strtod(BaseLib::replaceString(",", ".", value).c_str(),0);
+ }
+ else
+ return false;
in >> tag;
- if (tag.compare("yllcorner") == 0) {
+ if (tag.compare("yllcorner") == 0)
+ {
in >> value;
- yllcorner = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0);
- } else return false;
-
+ header.y = strtod(BaseLib::replaceString(",", ".", value).c_str(),0);
+ }
+ else
+ return false;
in >> tag;
- if (tag.compare("cellsize") == 0) {
+ if (tag.compare("cellsize") == 0)
+ {
in >> value;
- cell_size = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0);
- } else return false;
-
+ header.cellsize = strtod(BaseLib::replaceString(",", ".", value).c_str(),0);
+ }
+ else
+ return false;
in >> tag;
- if (tag.compare("NODATA_value") == 0) {
+ if (tag.compare("NODATA_value") == 0)
+ {
in >> value;
- no_data_val = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0);
- } else return false;
+ header.noData = value.c_str();
+ }
+ else
+ return false;
+
+ // correct raster position by half a pixel for correct visualisation
+ // argh! wrong! correction has to happen in visualisation object, otherwise the actual data is wrong
+ //header.x = header.x + (header.cellsize / 2);
+ //header.y = header.y + (header.cellsize / 2);
+
+ return true;
+}
+
+double* Raster::loadDataFromASC(const std::string &fileName,
+ double &x0,
+ double &y0,
+ unsigned &width,
+ unsigned &height,
+ double &delta,
+ double &no_data)
+{
+ std::ifstream in( fileName.c_str() );
+
+ if (!in.is_open())
+ {
+ std::cout << "VtkRaster::loadImageFromASC() - Could not open file..." << std::endl;
+ return NULL;
+ }
+
+ ascHeader header;
+
+ if (readASCHeader(header, in))
+ {
+ x0 = header.x;
+ y0 = header.y;
+ width = header.ncols;
+ height = header.nrows;
+ delta = header.cellsize;
+
+ double* values = new double[header.ncols * header.nrows];
+
+ int col_index(0);
+ int noData = atoi(header.noData.c_str());
+ std::string s("");
+ // read the file into a double-array
+ for (int j = 0; j < header.nrows; ++j)
+ {
+ col_index = (header.nrows - j - 1) * header.ncols;
+ for (int i = 0; i < header.ncols; ++i)
+ {
+ in >> s;
+ unsigned index = col_index+i;
+ values[index] = strtod(BaseLib::replaceString(",", ".", s).c_str(),0);
+ }
+ }
+
+ in.close();
+ return values;
+ }
+ return nullptr;
+}
+
+bool Raster::readSurferHeader(ascHeader &header, std::ifstream &in)
+{
+ std::string line, tag, value;
+ double min, max;
+
+ in >> tag;
+
+ if (tag.compare("DSAA") != 0)
+ {
+ std::cout << "Error in readSurferHeader() - No Surfer file..." << std::endl;
+ return false;
+ }
+ else
+ {
+ in >> header.ncols >> header.nrows;
+ in >> min >> max;
+ header.x = min;
+ header.cellsize = (max-min)/(double)header.ncols;
+
+ in >> min >> max;
+ header.y = min;
+
+ if (ceil((max-min)/(double)header.nrows) == ceil(header.cellsize))
+ header.cellsize = ceil(header.cellsize);
+ else
+ {
+ std::cout << "Error in readSurferHeader() - Anisotropic cellsize detected..." << std::endl;
+ return 0;
+ }
+ in >> min >> max; // ignore min- and max-values
+
+ header.noData = "1.70141E+038";
+ }
return true;
}
-} // end namespace GeoLib
+double* Raster::loadDataFromSurfer(const std::string &fileName,
+ double &x0,
+ double &y0,
+ unsigned &width,
+ unsigned &height,
+ double &delta,
+ double &no_data)
+{
+ std::ifstream in( fileName.c_str() );
+
+ if (!in.is_open())
+ {
+ std::cout << "VtkRaster::loadImageFromSurfer() - Could not open file..." << std::endl;
+ return NULL;
+ }
+
+ ascHeader header;
+
+ if (readSurferHeader(header, in))
+ {
+ x0 = header.x;
+ y0 = header.y;
+ width = header.ncols;
+ height = header.nrows;
+ delta = header.cellsize;
+
+ double* values = new double[header.ncols * header.nrows];
+
+ int col_index(0);
+ int noData = -9999;
+ std::string s("");
+ // read the file into a double-array
+ for (int j = 0; j < header.nrows; ++j)
+ {
+ col_index = j * header.ncols;
+ for (int i = 0; i < header.ncols; ++i)
+ {
+ in >> s;
+ if (s.compare(header.noData) == 0)
+ s = "-9999";
+ unsigned index = col_index+i;
+ values[index] = strtod(BaseLib::replaceString(",", ".", s).c_str(),0);
+ }
+ }
+
+ in.close();
+ return values;
+ }
+ return nullptr;
+}
+
diff --git a/GeoLib/Raster.h b/GeoLib/Raster.h
index 95ec4e2c441f777aafd94cd341b12a3c13c90e1a..eb25cc2c6930bdfaba4cc9212d02f69b2024f01b 100644
--- a/GeoLib/Raster.h
+++ b/GeoLib/Raster.h
@@ -15,8 +15,6 @@
#include "Surface.h"
-namespace GeoLib {
-
class Raster {
public:
Raster(std::size_t n_cols, std::size_t n_rows, double xllcorner, double yllcorner,
@@ -43,15 +41,74 @@ public:
void writeRasterAsASC(std::ostream &os) const;
+ /**
+ * \brief Loads an ASC file into a double array.
+ * The array alternates between pixel values and their respective alpha-values, i.e.
+ * result = { pixel0-value; pixel0-alpha, pixel1-value; pixel1-alpha; ... }
+ *
+ * \param fileName Filename of the file that should be loaded.
+ * \param x0 The x-coordinate of the origin.
+ * \param y0 The y-coordinate of the origin.
+ * \param width The width of the image.
+ * \param height The height of the image
+ * \param delta The size of each pixel in the image which is needed for correctly displaying the data.
+ * \param no_data The value that signifies that no meaningful data is given at certain pixels
+ * \return A float-array of pixel values incl. opacity (noData values are transparent)
+ */
+ static double* loadDataFromASC(const std::string &fileName,
+ double &x0,
+ double &y0,
+ unsigned &width,
+ unsigned &height,
+ double &delta,
+ double &no_data);
+
+ /**
+ * \brief Loads a Surfer file into a double array.
+ * Works exactly like loadDataFromASC().
+ */
+ static double* loadDataFromSurfer(const std::string &fileName,
+ double &x0,
+ double &y0,
+ unsigned &width,
+ unsigned &height,
+ double &delta,
+ double &no_data);
+
static Raster* getRasterFromASCFile(std::string const& fname);
- static Raster* getRasterFromSurface(Surface const& sfc, double cell_size, double no_data_val = -9999);
+ static Raster* getRasterFromSurface(GeoLib::Surface const& sfc, double cell_size, double no_data_val = -9999);
private:
- static bool readASCHeader(std::ifstream &in, std::size_t &n_cols, std::size_t &n_rows,
- double &xllcorner, double &yllcorner, double &cell_size, double &no_data_val);
void setCellSize(double cell_size);
void setNoDataVal (double no_data_val);
+ /// Data structure for the asc-file header.
+ struct ascHeader
+ {
+ int ncols;
+ int nrows;
+ double x;
+ double y;
+ double cellsize;
+ std::string noData;
+ };
+
+ /**
+ * Reads the header of an ArcGIS asc-file.
+ * \param header The ascHeader-object into which all the information will be written.
+ * \param in FileInputStream used for reading the data.
+ * \return True if the header could be read correctly, false otherwise.
+ */
+ static bool readASCHeader(ascHeader &header, std::ifstream &in);
+
+ /**
+ * Reads the header of a Surfer grd-file.
+ * \param header The ascHeader-object into which all the information will be written.
+ * \param in FileInputStream used for reading the data.
+ * \return True if the header could be read correctly, false otherwise.
+ */
+ static bool readSurferHeader(ascHeader &header, std::ifstream &in);
+
std::size_t _n_cols;
std::size_t _n_rows;
GeoLib::Point _ll_pnt;
@@ -60,6 +117,5 @@ private:
double* _raster_data;
};
-}
#endif /* RASTER_H_ */
diff --git a/Gui/DataView/DirectConditionGenerator.cpp b/Gui/DataView/DirectConditionGenerator.cpp
index b7d8db059dcd2f092e9ed512f3ca8bf52274d02c..e9c8469ff4029abb92f44e5b01f9365924db2579 100644
--- a/Gui/DataView/DirectConditionGenerator.cpp
+++ b/Gui/DataView/DirectConditionGenerator.cpp
@@ -11,12 +11,13 @@
#include "DirectConditionGenerator.h"
-#include "VtkRaster.h"
+#include "Raster.h"
#include "MshEditor.h"
#include "PointWithID.h"
#include "Mesh.h"
#include <cmath>
+#include <fstream>
#include <limits>
const std::vector< std::pair<size_t,double> >& DirectConditionGenerator::directToSurfaceNodes(const MeshLib::Mesh &mesh, const std::string &filename)
@@ -26,7 +27,7 @@ const std::vector< std::pair<size_t,double> >& DirectConditionGenerator::directT
double origin_x(0), origin_y(0), delta(0), no_data(-9999);
unsigned imgwidth(0), imgheight(0);
- double* img = VtkRaster::loadDataFromASC(filename, origin_x, origin_y, imgwidth, imgheight, delta, no_data);
+ double* img = Raster::loadDataFromASC(filename, origin_x, origin_y, imgwidth, imgheight, delta, no_data);
if (img == 0)
{
std::cout << "Error in DirectConditionGenerator::directWithSurfaceIntegration() - could not load vtk raster." << std::endl;
diff --git a/Gui/DataView/GeoMapper.cpp b/Gui/DataView/GeoMapper.cpp
index b6f9ed989b577d7e2cfe7a1e9fe17f5524e6c829..22b87b43a98cee4e3a18c40574ab611d12fcd13a 100644
--- a/Gui/DataView/GeoMapper.cpp
+++ b/Gui/DataView/GeoMapper.cpp
@@ -15,7 +15,7 @@
#include "Node.h"
#include "MshEditor.h"
#include "PointWithID.h"
-#include "VtkRaster.h"
+#include "Raster.h"
#include "readMeshFromFile.h"
@@ -33,7 +33,7 @@ GeoMapper::~GeoMapper()
void GeoMapper::mapOnDEM(const std::string &file_name)
{
double no_data(-9999);
- _img_data = VtkRaster::loadDataFromASC(file_name, _origin_x, _origin_y, _width, _height, _cellsize, no_data);
+ _img_data = Raster::loadDataFromASC(file_name, _origin_x, _origin_y, _width, _height, _cellsize, no_data);
this->mapData();
}
diff --git a/Gui/DataView/MshLayerMapper.cpp b/Gui/DataView/MshLayerMapper.cpp
index 3da59079acce04dacadf205a48fef2c3f115508a..bcf403d9102db74ed804b460c4ce0acaaacaacb6 100644
--- a/Gui/DataView/MshLayerMapper.cpp
+++ b/Gui/DataView/MshLayerMapper.cpp
@@ -10,7 +10,7 @@
*/
#include "MshLayerMapper.h"
-#include "VtkRaster.h"
+#include "Raster.h"
#include "Mesh.h"
#include "Node.h"
@@ -112,7 +112,7 @@ int MshLayerMapper::LayerMapping(MeshLib::Mesh* new_mesh, const std::string &ras
{
double x0(0), y0(0), delta(1), no_data(-9999);
unsigned width(1), height(1);
- double* elevation = VtkRaster::loadDataFromASC(rasterfile, x0, y0, width,height, delta, no_data);
+ double* elevation = Raster::loadDataFromASC(rasterfile, x0, y0, width,height, delta, no_data);
if (elevation == NULL)
{
diff --git a/Gui/VtkVis/VtkRaster.cpp b/Gui/VtkVis/VtkRaster.cpp
index 71e52752b39071bc982c83fe55b0bb5dce99f241..8a0432e7ff38a2c97c9471f6a13ff70a1d298e48 100644
--- a/Gui/VtkVis/VtkRaster.cpp
+++ b/Gui/VtkVis/VtkRaster.cpp
@@ -10,19 +10,12 @@
*/
#include "VtkRaster.h"
-
-#include <cmath>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
+#include "Raster.h"
#include <QFileInfo>
-#include "StringTools.h"
-
#include <vtkFloatArray.h>
#include <vtkPointData.h>
-
#include <vtkImageAlgorithm.h>
#include <vtkImageData.h>
#include <vtkImageImport.h>
@@ -46,12 +39,12 @@ vtkImageAlgorithm* VtkRaster::loadImage(const std::string &fileName,
if (fileInfo.suffix().toLower() == "asc")
{
- data = loadDataFromASC(fileName, x0, y0, width, height, delta, no_data);
+ data = Raster::loadDataFromASC(fileName, x0, y0, width, height, delta, no_data);
return loadImageFromArray(data, x0, y0, width, height, delta);
}
else if (fileInfo.suffix().toLower() == "grd")
{
- data = loadDataFromSurfer(fileName, x0, y0, width, height, delta, no_data);
+ data = Raster::loadDataFromSurfer(fileName, x0, y0, width, height, delta, no_data);
return loadImageFromArray(data, x0, y0, width, height, delta);
}
#ifdef libgeotiff_FOUND
@@ -100,205 +93,6 @@ vtkImageImport* VtkRaster::loadImageFromArray(double* data_array, double &x0, do
return image;
}
-
-bool VtkRaster::readASCHeader(ascHeader &header, std::ifstream &in)
-{
- std::string line, tag, value;
-
- in >> tag;
- if (tag.compare("ncols") == 0)
- {
- in >> value;
- header.ncols = atoi(value.c_str());
- }
- else
- return false;
- in >> tag;
- if (tag.compare("nrows") == 0)
- {
- in >> value;
- header.nrows = atoi(value.c_str());
- }
- else
- return false;
- in >> tag;
- if (tag.compare("xllcorner") == 0)
- {
- in >> value;
- header.x = strtod(BaseLib::replaceString(",", ".", value).c_str(),0);
- }
- else
- return false;
- in >> tag;
- if (tag.compare("yllcorner") == 0)
- {
- in >> value;
- header.y = strtod(BaseLib::replaceString(",", ".", value).c_str(),0);
- }
- else
- return false;
- in >> tag;
- if (tag.compare("cellsize") == 0)
- {
- in >> value;
- header.cellsize = strtod(BaseLib::replaceString(",", ".", value).c_str(),0);
- }
- else
- return false;
- in >> tag;
- if (tag.compare("NODATA_value") == 0)
- {
- in >> value;
- header.noData = value.c_str();
- }
- else
- return false;
-
- // correct raster position by half a pixel for correct visualisation
- // argh! wrong! correction has to happen in visualisation object, otherwise the actual data is wrong
- //header.x = header.x + (header.cellsize / 2);
- //header.y = header.y + (header.cellsize / 2);
-
- return true;
-}
-
-double* VtkRaster::loadDataFromASC(const std::string &fileName,
- double &x0,
- double &y0,
- unsigned &width,
- unsigned &height,
- double &delta,
- double &no_data)
-{
- std::ifstream in( fileName.c_str() );
-
- if (!in.is_open())
- {
- std::cout << "VtkRaster::loadImageFromASC() - Could not open file..." << std::endl;
- return NULL;
- }
-
- ascHeader header;
-
- if (readASCHeader(header, in))
- {
- x0 = header.x;
- y0 = header.y;
- width = header.ncols;
- height = header.nrows;
- delta = header.cellsize;
-
- double* values = new double[header.ncols * header.nrows];
-
- int col_index(0);
- int noData = atoi(header.noData.c_str());
- std::string s("");
- // read the file into a double-array
- for (int j = 0; j < header.nrows; ++j)
- {
- col_index = (header.nrows - j - 1) * header.ncols;
- for (int i = 0; i < header.ncols; ++i)
- {
- in >> s;
- unsigned index = col_index+i;
- values[index] = strtod(BaseLib::replaceString(",", ".", s).c_str(),0);
- }
- }
-
- in.close();
- return values;
- }
- return NULL;
-}
-
-bool VtkRaster::readSurferHeader(ascHeader &header, std::ifstream &in)
-{
- std::string line, tag, value;
- double min, max;
-
- in >> tag;
-
- if (tag.compare("DSAA") != 0)
- {
- std::cout << "Error in readSurferHeader() - No Surfer file..." << std::endl;
- return false;
- }
- else
- {
- in >> header.ncols >> header.nrows;
- in >> min >> max;
- header.x = min;
- header.cellsize = (max-min)/(double)header.ncols;
-
- in >> min >> max;
- header.y = min;
-
- if (ceil((max-min)/(double)header.nrows) == ceil(header.cellsize))
- header.cellsize = ceil(header.cellsize);
- else
- {
- std::cout << "Error in readSurferHeader() - Anisotropic cellsize detected..." << std::endl;
- return 0;
- }
- in >> min >> max; // ignore min- and max-values
-
- header.noData = "1.70141E+038";
- }
-
- return true;
-}
-
-double* VtkRaster::loadDataFromSurfer(const std::string &fileName,
- double &x0,
- double &y0,
- unsigned &width,
- unsigned &height,
- double &delta,
- double &no_data)
-{
- std::ifstream in( fileName.c_str() );
-
- if (!in.is_open())
- {
- std::cout << "VtkRaster::loadImageFromSurfer() - Could not open file..." << std::endl;
- return NULL;
- }
-
- ascHeader header;
-
- if (readSurferHeader(header, in))
- {
- x0 = header.x;
- y0 = header.y;
- width = header.ncols;
- height = header.nrows;
- delta = header.cellsize;
-
- double* values = new double[header.ncols * header.nrows];
-
- int col_index(0);
- int noData = -9999;
- std::string s("");
- // read the file into a double-array
- for (int j = 0; j < header.nrows; ++j)
- {
- col_index = j * header.ncols;
- for (int i = 0; i < header.ncols; ++i)
- {
- in >> s;
- if (s.compare(header.noData) == 0)
- s = "-9999";
- unsigned index = col_index+i;
- values[index] = strtod(BaseLib::replaceString(",", ".", s).c_str(),0);
- }
- }
-
- in.close();
- return values;
- }
- return NULL;
-}
-
#ifdef libgeotiff_FOUND
vtkImageImport* VtkRaster::loadImageFromTIFF(const std::string &fileName,
double &x0, double &y0,
diff --git a/Gui/VtkVis/VtkRaster.h b/Gui/VtkVis/VtkRaster.h
index 22572be524fd7b5a256ccd56d946d12d3cd3e2ca..eab1f48ddb6201070d213ac3f60e6705b739a40b 100644
--- a/Gui/VtkVis/VtkRaster.h
+++ b/Gui/VtkVis/VtkRaster.h
@@ -11,7 +11,7 @@
#ifndef VTKRASTER_H
#define VTKRASTER_H
-#include <fstream>
+#include <string>
class vtkImageAlgorithm;
class vtkImageImport;
@@ -25,16 +25,6 @@ class vtkImageReader2;
*/
class VtkRaster
{
- /// Data structure for the asc-file header.
- struct ascHeader
- {
- int ncols;
- int nrows;
- double x;
- double y;
- double cellsize;
- std::string noData;
- };
public:
/**
@@ -53,39 +43,6 @@ public:
double& y0,
double& delta);
- /**
- * \brief Loads an ASC file into a double array.
- * The array alternates between pixel values and their respective alpha-values, i.e.
- * result = { pixel0-value; pixel0-alpha, pixel1-value; pixel1-alpha; ... }
- *
- * \param fileName Filename of the file that should be loaded.
- * \param x0 The x-coordinate of the origin.
- * \param y0 The y-coordinate of the origin.
- * \param width The width of the image.
- * \param height The height of the image
- * \param delta The size of each pixel in the image which is needed for correctly displaying the data.
- * \return A float-array of pixel values incl. opacity (noData values are transparent)
- */
- static double* loadDataFromASC(const std::string &fileName,
- double &x0,
- double &y0,
- unsigned &width,
- unsigned &height,
- double &delta,
- double &no_data);
-
- /**
- * \brief Loads a Surfer file into a double array.
- * Works exactly like loadDataFromASC().
- */
- static double* loadDataFromSurfer(const std::string &fileName,
- double &x0,
- double &y0,
- unsigned &width,
- unsigned &height,
- double &delta,
- double &no_data);
-
/**
* \brief Returns a VtkImageAlgorithm from an array of pixel values and some image meta data.
*/
@@ -118,22 +75,6 @@ private:
*/
static vtkImageReader2* loadImageFromFile(const std::string &fileName);
- /**
- * Reads the header of an ArcGIS asc-file.
- * \param header The ascHeader-object into which all the information will be written.
- * \param in FileInputStream used for reading the data.
- * \return True if the header could be read correctly, false otherwise.
- */
- static bool readASCHeader(ascHeader &header, std::ifstream &in);
-
- /**
- * Reads the header of a Surfer grd-file.
- * \param header The ascHeader-object into which all the information will be written.
- * \param in FileInputStream used for reading the data.
- * \return True if the header could be read correctly, false otherwise.
- */
- static bool readSurferHeader(ascHeader &header, std::ifstream &in);
-
/// Converts an uint32-number into a quadruple representing RGBA-colours for a pixel.
static void uint32toRGBA(const unsigned int s, int* p);
};
diff --git a/MeshLib/MshEditor.cpp b/MeshLib/MshEditor.cpp
index 179683e4c14f32b908dd306ab474e5277d8d8ba6..bde99888d3aaa6ff4c0eb8e2c2a7b7a33df594b7 100644
--- a/MeshLib/MshEditor.cpp
+++ b/MeshLib/MshEditor.cpp
@@ -213,7 +213,7 @@ void MshEditor::get2DSurfaceElements(const std::vector<MeshLib::Element*> &all_e
}
}
else
- ERROR ("Cannot handle meshes of dimension %i", mesh_dimension);
+ ERR ("Cannot handle meshes of dimension %i", mesh_dimension);
}
void MshEditor::get2DSurfaceNodes(const std::vector<MeshLib::Node*> &all_nodes, std::vector<MeshLib::Node*> &sfc_nodes, const std::vector<MeshLib::Element*> &sfc_elements, std::vector<unsigned> &node_id_map)