fixed epsilon calculation and default raster value assignment

Gui/VtkVis/VtkCompositeColorByHeightFilter.cpp

@@ -47,14 +47,16 @@ void VtkCompositeColorByHeightFilter::init()
 	unsigned char a[4] = { 0, 0, 255, 255 }; // blue
 	unsigned char b[4] = { 0, 255, 0, 255 }; // green
 	unsigned char c[4] = { 255, 255, 0, 255 }; // yellow
-	unsigned char d[4] = { 255, 0, 0, 255 }; // red
+	unsigned char d[4] = { 155, 100, 50, 255 }; // brown
+	unsigned char e[4] = { 255, 0, 0, 255 }; // red
 	VtkColorLookupTable* ColorLookupTable = heightFilter->GetColorLookupTable();
 	ColorLookupTable->setInterpolationType(VtkColorLookupTable::LUTType::LINEAR);
-	ColorLookupTable->setColor(-35, a);
-	ColorLookupTable->setColor(150, b); // green at about 150m
-	ColorLookupTable->setColor(450, c); // yellow at about 450m and changing to red from then on
-	ColorLookupTable->setColor(800, d);
-	ColorLookupTable->SetTableRange(-35, 800);
+	ColorLookupTable->setColor(-50, a);
+	ColorLookupTable->setColor(200, b); // green at about 20m
+	ColorLookupTable->setColor(500, c); // yellow at about 500m and changing to red from then on
+	ColorLookupTable->setColor(1000, d);
+	ColorLookupTable->setColor(2000, e);
+	ColorLookupTable->SetTableRange(-35, 2000);
 	ColorLookupTable->Build();
 
 	// This passes ownership of the ColorLookupTable to VtkVisPointSetItem

Gui/mainwindow.cpp

@@ -694,11 +694,10 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
 		}
 		else {
 			settings.setValue("lastOpenedTetgenFileDirectory", QFileInfo(fileName).absolutePath());
-			QString element_fname = QFileDialog::getOpenFileName(this, "Select TetGen element file",
-			                                                     settings.value("lastOpenedTetgenFileDirectory").toString(),
-			                                                     "TetGen element files (*.ele);;");
+			QString element_fname(fi.path() + "\\" + fi.completeBaseName() + ".ele");
 
-			if (!fileName.isEmpty() && !element_fname.isEmpty()) {
+			if (!fileName.isEmpty()) 
+			{
 				FileIO::TetGenInterface tetgen;
 				MeshLib::Mesh* mesh (tetgen.readTetGenMesh(fileName.toStdString(), element_fname.toStdString()));
 				if (mesh)

MeshLib/MeshGenerators/LayeredVolume.cpp

@@ -59,7 +59,9 @@ bool LayeredVolume::createGeoVolumes(const MeshLib::Mesh &mesh, const std::vecto
 	if (mesh.getDimension() != 2)
 		return false;
 
-	_elevation_epsilon = calcEpsilon(*rasters.back(), *rasters[0]);
+	_elevation_epsilon = calcEpsilon(*rasters[0], *rasters.back());
+	if (_elevation_epsilon <= 0)
+		return false;
 
 	// remove line elements, only tri + quad remain
 	MeshLib::ElementExtraction ex(mesh);
@@ -74,7 +76,7 @@ bool LayeredVolume::createGeoVolumes(const MeshLib::Mesh &mesh, const std::vecto
 	for (size_t i=0; i<nRasters; ++i)
 	{
 		const double replacement_value = (i==0) ? noDataReplacementValue : _invalid_value;
-		if (!MeshLayerMapper::LayerMapping(*mesh_layer, *rasters[i], 0, 0, _invalid_value))
+		if (!MeshLayerMapper::LayerMapping(*mesh_layer, *rasters[i], 0, 0, replacement_value))
 		{
 			this->cleanUpOnError();
 			return false;
@@ -207,7 +209,7 @@ bool LayeredVolume::exportToGeometry(GeoLib::GEOObjects &geo_objects) const
 double LayeredVolume::calcEpsilon(const GeoLib::Raster &high, const GeoLib::Raster &low)
 {
 	const double max (*std::max_element(high.begin(), high.end()));
-	const double min (*std::min_element(high.begin(), high.end()));
+	const double min (*std::min_element( low.begin(),  low.end()));
 	return ((max-min)*1e-07);
 }