added functions to save Mask and Depth, and refactored

Author: ErikaPistolesi1

depthmap/depthmap.cpp

@@ -65,7 +65,7 @@ bool Camera::loadXml(const QString &pathXml){
 		return false;
 	}
 	QString internePath = fileInterneNode.text();
-	QFileInfo fileInfo(fileInterneNode.text());
+	QFileInfo fileInfo(pathXml);
 	QString dirPath = fileInfo.path();
 	QDir dir(dirPath);
 	dir.cd("..");
@@ -255,12 +255,6 @@ bool Depthmap::loadTiff(const char *tiff, vector<float> &values, uint32_t &w, ui
 	} else {
 		return loadTiledTiff(inTiff, values, w, h, tileWidth, tileLength, bitsPerSample);
 	}
-	tsize_t tileSize = TIFFTileSize(inTiff);
-	if (tileSize == 0) {
-		cerr << "Error computing tile size." << endl;
-		TIFFClose(inTiff);
-		return 1;
-	}
 
 	return true;
 
@@ -351,6 +345,7 @@ bool Depthmap::loadTiledTiff(TIFF* inTiff, vector<float> &values, uint32_t w, ui
 		}
 		delete[] tileData;
 	}
+	TIFFClose(inTiff);
 	return true;
 }
 
@@ -404,6 +399,7 @@ bool Depthmap::loadStripedTiff(TIFF* inTiff, std::vector<float> &values, uint32_
 		}
 		delete[] stripData;
 	}
+	TIFFClose(inTiff);
 	return true;
 }
 
@@ -412,7 +408,7 @@ bool Depthmap::loadDepth(const char *tiff) {
 		cerr << "Failed to load TIFF file: " << tiff << endl;
 		return false;
 	}
-
+	return true;
 }
 
 bool Depthmap::loadMask(const char *tifPath){
@@ -464,7 +460,7 @@ bool Depthmap::loadNormals(const char *normals_path){
 
 	return true;
 }
-void Depthmap::saveMask(const char *mask_path, vector<float> &values, uint32_t &w, uint32_t &h, uint32_t bitsPerSample){
+void Depthmap::saveTiff(const char *mask_path, vector<float> &values, uint32_t &w, uint32_t &h, uint32_t bitsPerSample){
 	//save e scrive la maschera
 
 	TIFF* maskTiff = TIFFOpen(mask_path, "w");
@@ -521,6 +517,12 @@ void Depthmap::saveMask(const char *mask_path, vector<float> &values, uint32_t &
 	}
 	TIFFClose(maskTiff);
 }
+void Depthmap::saveDepth(const char *depth_path){
+	saveTiff(depth_path, elevation, width, height, 32);
+}
+void Depthmap::saveMask(const char *depth_path){
+	saveTiff(depth_path, mask, width, height, 1);
+}
 void Depthmap::saveNormals(const char *filename) {
 
 	QImage img(width, height, QImage::Format::Format_ARGB32);
@@ -727,11 +729,21 @@ bool OrthoDepthmap::loadXml(const char *xmlPath){
 
 }
 
-bool OrthoDepthmap::load(const char *filepath){
+bool OrthoDepthmap::load(const char *depth_path, const char *mask_path){
 
-	QString tiffPath = QString(filepath);
-	QString xmlPath = tiffPath.left(tiffPath.lastIndexOf('.')) + ".xml";
+	QString qdepth_path = QString(depth_path);
+	if(!loadDepth(qdepth_path.toStdString().c_str())){
+		cerr << "Failed to load tiff file: " << qdepth_path.toStdString() << endl;
+		return false;
+	}
+
+	QString qmask_path = QString(mask_path);
+	if(!loadMask(qmask_path.toStdString().c_str())){
+		cerr << "Failed to load tiff file: " << qmask_path.toStdString() << endl;
+		return false;
+	}
 
+	QString xmlPath = qdepth_path.left(qdepth_path.lastIndexOf('.')) + ".xml";
 	if (!loadXml(xmlPath.toStdString().c_str())) {
 		cerr << "Failed to load XML file: " << xmlPath.toStdString() << endl;
 		return false;

depthmap/depthmap.h

@@ -42,7 +42,7 @@ class Depthmap {
 	bool loadMask(const char *mask_path);
 	bool loadNormals(const char *normals_path);
 	void saveDepth(const char *depth_path);
-	void saveMask(const char *mask_path, std::vector<float> &values, uint32_t &w, uint32_t &h, uint32_t bitsPerSample);
+	void saveMask(const char *depth_path);
 	void saveNormals(const char *normals_path);
 
 	float calculateMeanDepth(const std::vector<float>& values);
@@ -56,6 +56,7 @@ class Depthmap {
 	bool loadTiledTiff(TIFF* inTiff, std::vector<float> &elevation, uint32_t w, uint32_t h,
 					   uint32_t tileWidth, uint32_t tileLength, uint32_t bitsPerSample);
 	bool loadStripedTiff(TIFF* inTiff, std::vector<float> &elevation, uint32_t& w, uint32_t& h, uint32_t bitsPerSample);
+	void saveTiff(const char *mask_path, std::vector<float> &values, uint32_t &w, uint32_t &h, uint32_t bitsPerSample);
 
 };
 class CameraDepthmap:
@@ -74,7 +75,7 @@ class OrthoDepthmap:
 	Eigen::Vector3f origin;
 
 	Eigen::Vector3f pixelToRealCoordinates(int pixelX, int pixelY, float pixelZ);
-	bool load(const char *filepath);
+	bool load(const char *depth_path, const char *mask_path);
 	bool loadXml(const char *xmlPath);
 	void saveObj(const char *filename);
 	void projectToCameraDepthMap(const Camera& camera, const QString& outputPath);

depthmap/depthmap.pro

@@ -13,8 +13,8 @@ SOURCES += \
         ../src/bni_normal_integration.cpp \
         depthmap.cpp \
         main.cpp
-INCLUDEPATH += /opt/homebrew/include \
-    /opt/homebrew/Cellar/eigen/3.4.0_1/include/eigen3
+mac:INCLUDEPATH += /opt/homebrew/include
+unix:INCLUDEPATH += ../external/eigen-3.3.9
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

depthmap/main.cpp

@@ -14,30 +14,54 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}*/
 	//input
-	QString depthmapPath = "/Users/erika/Desktop/testcenterRel_copia/photogrammetry/Malt/Z_Num7_DeZoom4_STD-MALT.tif";
-	QString orientationXmlPath = "/Users/erika/Desktop/testcenterRel_copia/photogrammetry/Ori-Relative/Orientation-L05C12.tif.xml";
-	QString maskPath = "/Users/erika/Desktop/testcenterRel_copia/photogrammetry/Malt/Masq_STD-MALT_DeZoom4.tif";
+//#define MACOS 1
+#ifdef MACOS
+	QString base = "/User/erika/Desktop/";
+#else
+	QString base = "/home/erika/";
+#endif
+
+	QString depthmapPath = base + "testcenterRel_copia/photogrammetry/Malt/Z_Num7_DeZoom4_STD-MALT.tif";
+	QString orientationXmlPath = base + "testcenterRel_copia/photogrammetry/Ori-Relative/Orientation-L05C12.tif.xml";
+	QString maskPath = base + "testcenterRel_copia/photogrammetry/Malt/Masq_STD-MALT_DeZoom4.tif";
+
 
 	//output
-	QString outputPath = "/Users/erika/Desktop/testcenterRel_copia/photogrammetry/depthmap_projectL05C13.png";
+	QString outputPath = base + "testcenterRel_copia/photogrammetry/depthmap_projectL05C13.png";
+	QString output_mask = base + "testcenterRel_copia/photogrammetry/mask_test.png";
+	QString output_depth = base + "testcenterRel_copia/photogrammetry/depth_test.png";
 	Depthmap depth;
 	OrthoDepthmap ortho;
 
-	depth.loadDepth(qPrintable(depthmapPath));
-	depth.computeNormals();
-	depth.loadNormals("/Users/erika/Desktop/testcenterRel_copia/rti/L05C12/means.png");
-	depth.saveNormals("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/original.obj");
-	ortho.saveObj("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/original.obj");
+	if(!ortho.load(qPrintable(depthmapPath), qPrintable(maskPath))){
+		cout <<"accidenti" << endl;
+		return -1;
+	}
+	//ortho.computeNormals();
+	//ortho.saveNormals(qPrintable(base + "testcenterRel_copia/photogrammetry/original.png"));
+	//ortho.saveObj(qPrintable(base + "testcenterRel_copia/photogrammetry/original.obj"));
+	ortho.saveDepth(qPrintable(output_depth));
+	ortho.saveMask(qPrintable(output_mask));
+
+	Camera camera;
+	camera.loadXml(orientationXmlPath);
+	//int pixelX = 165;
+	//int pixelY = 144;
+	//float pixelZ = 4.5;
+	ortho.projectToCameraDepthMap(camera, outputPath);
+
+	Eigen::Matrix3f rotationMatrix;
+	Eigen::Vector3f center;
 
-	depth.loadMask(qPrintable(maskPath));
-	depth.saveDepth(qPrintable(depthmapPath));
+//	depth.loadMask(qPrintable(maskPath));
+//	depth.saveDepth(qPrintable(depthmapPath));
 //	depth.saveMask(qPrintable(maskPath));
-	//QString maskObjPath = "/Users/erika/Desktop/testcenterRel_copia/photogrammetry/mask.obj";
-	ortho.saveObj("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/depthmap_projectL05C13.obj");
+	//QString maskObjPath = base + "testcenterRel_copia/photogrammetry/mask.obj";
+//	ortho.saveObj(qPrintable(base + "testcenterRel_copia/photogrammetry/depthmap_projectL05C13.obj"));
 
 
-	depth.depthIntegrateNormals();
-	ortho.saveObj("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/integrated.obj");
+	//depth.depthIntegrateNormals();
+//	ortho.saveObj(qPrintable(base + "testcenterRel_copia/photogrammetry/integrated.obj"));
 
 
 
@@ -78,21 +102,11 @@ fai la formula inversa, inverti la matrice. interpola bilinarmente dati 4 valori
 	/*int factorPowerOfTwo = 1;
 	depth.resizeNormals(factorPowerOfTwo, 2);
 	depth.depthIntegrateNormals();
-	depth.saveNormals("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/resized_integrated2.jpg");
-	depth.saveObj("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/resized_integrated2.obj");*/
-
+	depth.saveNormals(base + "testcenterRel_copia/photogrammetry/resized_integrated2.jpg");
+	depth.saveObj(base + "testcenterRel_copia/photogrammetry/resized_integrated2.obj");*/
 
 
 
-	Camera camera;
-	camera.loadXml(orientationXmlPath);
-	//int pixelX = 165;
-	//int pixelY = 144;
-	//float pixelZ = 4.5;
-	ortho.projectToCameraDepthMap(camera, outputPath);
-
-	Eigen::Matrix3f rotationMatrix;
-	Eigen::Vector3f center;
 
 	//depth.getOrientationVector(orientationXmlPath, rotationMatrix, center);
 	//Eigen::Vector3f realCoordinates = depth.pixelToRealCoordinates(pixelX, pixelY, pixelZ);

relight-pano/exiftransplant.cpp

@@ -1,8 +1,8 @@
 #include "exiftransplant.h"
-#include <iostream>
 #include <stdio.h>
 #include <unistd.h>
 #include <string>
+#include <stdint.h>
 using namespace std;
 
 static void swap16(uint16_t &us) {
@@ -17,6 +17,7 @@ bool ExifTransplant::transplant(const char *src_path, const char *dst_path) {
 		return false;
 	}
 
+
 	unsigned int exif_size;
 	unsigned char *exif = getExif(src, exif_size);
 	fclose(src);

relight-pano/relight-pano.pro

@@ -22,7 +22,7 @@ HEADERS += \
     panobuilder.h
 
 mac:INCLUDEPATH += /opt/homebrew/include/eigen3
-
+unix:INCLUDEPATH += ../external/eigen-3.3.9
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin