manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vcg/wrap/import_out.h uses easyexif lib, small typo corrected in alnParser

This commit is contained in:
alemuntoni 2020-09-23 13:07:03 +02:00
parent f38172157a
commit dd8c26474d
2 changed files with 190 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wrap/io_trimesh/alnParser.h
View File

@ -30,14 +30,14 @@
struct RangeMap struct RangeMap
{ {
RangeMap() RangeMap()
{ {
quality = 1.0f; quality = 1.0f;
} }
std::string filename; std::string filename;
Matrix44m trasformation; Matrix44m transformation;
float quality; float quality;
}; };
class ALNParser class ALNParser
@ -66,7 +66,7 @@ public:
{ {
(*rm).filename = (*it); (*rm).filename = (*it);
(*rm).quality = 1.0f; (*rm).quality = 1.0f;
(*rm).trasformation.SetIdentity(); (*rm).transformation.SetIdentity();
} }
files.clear(); files.clear();
return NoError; return NoError;
@ -106,10 +106,10 @@ public:
rm.quality = (float) atof(occurrence+2); rm.quality = (float) atof(occurrence+2);
assert(rm.quality>0); assert(rm.quality>0);
fscanf(stream,"%f %f %f %f \n",&(rm.trasformation[0][0]),&(rm.trasformation[0][1]),&(rm.trasformation[0][2]),&(rm.trasformation[0][3])); fscanf(stream,"%f %f %f %f \n",&(rm.transformation[0][0]),&(rm.transformation[0][1]),&(rm.transformation[0][2]),&(rm.transformation[0][3]));
fscanf(stream,"%f %f %f %f \n",&(rm.trasformation[1][0]),&(rm.trasformation[1][1]),&(rm.trasformation[1][2]),&(rm.trasformation[1][3])); fscanf(stream,"%f %f %f %f \n",&(rm.transformation[1][0]),&(rm.transformation[1][1]),&(rm.transformation[1][2]),&(rm.transformation[1][3]));
fscanf(stream,"%f %f %f %f \n",&(rm.trasformation[2][0]),&(rm.trasformation[2][1]),&(rm.trasformation[2][2]),&(rm.trasformation[2][3])); fscanf(stream,"%f %f %f %f \n",&(rm.transformation[2][0]),&(rm.transformation[2][1]),&(rm.transformation[2][2]),&(rm.transformation[2][3]));
fscanf(stream,"%f %f %f %f \n",&(rm.trasformation[3][0]),&(rm.trasformation[3][1]),&(rm.trasformation[3][2]),&(rm.trasformation[3][3])); fscanf(stream,"%f %f %f %f \n",&(rm.transformation[3][0]),&(rm.transformation[3][1]),&(rm.transformation[3][2]),&(rm.transformation[3][3]));
rangemaps.push_back(rm); rangemaps.push_back(rm);
} }

293
wrap/io_trimesh/import_out.h
View File

@ -31,26 +31,21 @@
#include <wrap/callback.h> #include <wrap/callback.h>
#include <wrap/io_trimesh/io_mask.h> #include <wrap/io_trimesh/io_mask.h>
#include <QImageReader> #include <QImageReader>
#include <QFileInfo>
extern "C" #include <exif.h> //external easyexif lib
{
#include <jhead.h>
int ReadJpegSections (FILE * infile, ReadMode_t ReadMode);
void ResetJpgfile(void);
}
namespace vcg { namespace vcg {
namespace tri { namespace tri {
namespace io { namespace io {
struct Correspondence{ struct Correspondence{
Correspondence(unsigned int id_img_,unsigned int key_,float x_,float y_):id_img(id_img_),key(key_),x(x_),y(y_){} Correspondence(unsigned int id_img_,unsigned int key_,float x_,float y_):id_img(id_img_),key(key_),x(x_),y(y_){}
unsigned int id_img,key; unsigned int id_img,key;
float x; float x;
float y; float y;
}; };
typedef std::vector<Correspondence> CorrVec; typedef std::vector<Correspondence> CorrVec;
/** /**
This class encapsulate a filter for opening bundler file This class encapsulate a filter for opening bundler file
@ -60,147 +55,173 @@ class ImporterOUT
{ {
public: public:
typedef typename OpenMeshType::VertexPointer VertexPointer; typedef typename OpenMeshType::VertexPointer VertexPointer;
typedef typename OpenMeshType::ScalarType ScalarType; typedef typename OpenMeshType::ScalarType ScalarType;
typedef typename OpenMeshType::CoordType CoordType; typedef typename OpenMeshType::CoordType CoordType;
typedef typename OpenMeshType::VertexType VertexType; typedef typename OpenMeshType::VertexType VertexType;
typedef typename OpenMeshType::FaceType FaceType; typedef typename OpenMeshType::FaceType FaceType;
typedef typename OpenMeshType::VertexIterator VertexIterator; typedef typename OpenMeshType::VertexIterator VertexIterator;
typedef typename OpenMeshType::FaceIterator FaceIterator; typedef typename OpenMeshType::FaceIterator FaceIterator;
typedef typename OpenMeshType::EdgeIterator EdgeIterator; typedef typename OpenMeshType::EdgeIterator EdgeIterator;
static void readline(FILE *fp, char *line, int max=100){ static void readline(FILE *fp, char *line, int max=100){
fgets ( line, max, fp); fgets ( line, max, fp);
} }
static bool ReadHeader(FILE *fp,unsigned int &num_cams, unsigned int &num_points){ static bool ReadHeader(FILE *fp,unsigned int &num_cams, unsigned int &num_points){
char line[100]; char line[100];
readline(fp, line); readline(fp, line);
if( line[0]=='\0' ) return false; if( line[0]=='\0' ) return false;
line[18]='\0'; line[18]='\0';
if(0!=strcmp("# Bundle file v0.3", line)) return false; if(0!=strcmp("# Bundle file v0.3", line)) return false;
readline(fp, line); readline(fp, line);
if(line[0]=='\0') return false; if(line[0]=='\0') return false;
if (sscanf(line, "%d %d", &num_cams, &num_points) != 2) return false; if (sscanf(line, "%d %d", &num_cams, &num_points) != 2) return false;
return true; return true;
} }
static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots, static int Open(
std::vector<std::string > & image_filenames, OpenMeshType &m,
const char * filename,const char * filename_images, CallBackPos *cb=0) std::vector<Shot<ScalarType> > & shots,
{ std::vector<std::string > & image_filenames,
unsigned int num_cams,num_points; const char * filename,
typedef typename vcg::Matrix44<ScalarType> Matrix44x; const char * filename_images,
typedef typename vcg::Matrix33<ScalarType> Matrix33x; CallBackPos *cb=0)
FILE *fp = fopen(filename,"r"); {
if(!fp) return false; unsigned int num_cams,num_points;
ReadHeader(fp, num_cams, num_points); typedef typename vcg::Matrix44<ScalarType> Matrix44x;
char line[100]; typedef typename vcg::Matrix33<ScalarType> Matrix33x;
if(cb) cb(0,"Reading images"); FILE *fp = fopen(filename,"r");
ReadImagesFilenames(filename_images, image_filenames); if(!fp) return false;
const QString path_im = QFileInfo(filename_images).absolutePath()+QString("/"); ReadHeader(fp, num_cams, num_points);
char line[100];
if(cb) cb(0,"Reading images");
ReadImagesFilenames(filename_images, image_filenames);
const QString path_im = QFileInfo(filename_images).absolutePath()+QString("/");
if(cb) cb(50,"Reading cameras"); if(cb) cb(50,"Reading cameras");
shots.resize(num_cams); shots.resize(num_cams);
for(uint i = 0; i < num_cams;++i) for(uint i = 0; i < num_cams;++i)
{ {
float f, k1, k2; float f, k1, k2;
float R[16]={0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1}; float R[16]={0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1};
vcg::Point3f t; vcg::Point3f t;
readline(fp, line); if(line[0]=='\0') return false; if (sscanf(line, "%f %f %f", &f, &k1, &k2) != 3) return false; readline(fp, line); if(line[0]=='\0') return false; if (sscanf(line, "%f %f %f", &f, &k1, &k2) != 3) return false;
readline(fp, line); if(line[0]=='\0') return false; if (sscanf(line, "%f %f %f", &(R[0]), &(R[1]), &(R[2])) != 3) return false; R[3] = 0; readline(fp, line); if(line[0]=='\0') return false; if (sscanf(line, "%f %f %f", &(R[0]), &(R[1]), &(R[2])) != 3) return false; R[3] = 0;
readline(fp, line); if(line[0]=='\0') return false; if (sscanf(line, "%f %f %f", &(R[4]), &(R[5]), &(R[6])) != 3) return false; R[7] = 0; readline(fp, line); if(line[0]=='\0') return false; if (sscanf(line, "%f %f %f", &(R[4]), &(R[5]), &(R[6])) != 3) return false; R[7] = 0;
readline(fp, line); if(line[0]=='\0') return false; if (sscanf(line, "%f %f %f", &(R[8]), &(R[9]), &(R[10])) != 3) return false; R[11] = 0; readline(fp, line); if(line[0]=='\0') return false; if (sscanf(line, "%f %f %f", &(R[8]), &(R[9]), &(R[10])) != 3) return false; R[11] = 0;
readline(fp, line); if(line[0]=='\0') return false; if (sscanf(line, "%f %f %f", &(t[0]), &(t[1]), &(t[2])) != 3) return false; readline(fp, line); if(line[0]=='\0') return false; if (sscanf(line, "%f %f %f", &(t[0]), &(t[1]), &(t[2])) != 3) return false;
Matrix44x mat = Matrix44x::Construct(Matrix44f(R)); Matrix44x mat = Matrix44x::Construct(Matrix44f(R));
Matrix33x Rt = Matrix33x( Matrix44x(mat), 3); Matrix33x Rt = Matrix33x( Matrix44x(mat), 3);
Rt.Transpose(); Rt.Transpose();
CoordType pos = Rt * CoordType(t[0], t[1], t[2]); CoordType pos = Rt * CoordType(t[0], t[1], t[2]);
shots[i].Extrinsics.SetTra(CoordType(-pos[0],-pos[1],-pos[2])); shots[i].Extrinsics.SetTra(CoordType(-pos[0],-pos[1],-pos[2]));
shots[i].Extrinsics.SetRot(mat); shots[i].Extrinsics.SetRot(mat);
shots[i].Intrinsics.FocalMm = f; shots[i].Intrinsics.FocalMm = f;
shots[i].Intrinsics.k[0] = 0.0;//k1; To be uncommented when distortion is taken into account reliably shots[i].Intrinsics.k[0] = 0.0;//k1; To be uncommented when distortion is taken into account reliably
shots[i].Intrinsics.k[1] = 0.0;//k2; shots[i].Intrinsics.k[1] = 0.0;//k2;
shots[i].Intrinsics.PixelSizeMm = vcg::Point2<ScalarType>(1,1); shots[i].Intrinsics.PixelSizeMm = vcg::Point2<ScalarType>(1,1);
QSize size; QSize size;
QImageReader sizeImg(QString::fromStdString(image_filenames[i])); QImageReader sizeImg(QString::fromStdString(image_filenames[i]));
if(sizeImg.size()==QSize(-1,-1)) if(sizeImg.size()==QSize(-1,-1))
{ {
QImageReader sizeImg(QString::fromStdString(qPrintable(path_im)+image_filenames[i])); QImageReader sizeImg(QString::fromStdString(qPrintable(path_im)+image_filenames[i]));
size=sizeImg.size(); size=sizeImg.size();
} }
else else
size=sizeImg.size(); size=sizeImg.size();
shots[i].Intrinsics.ViewportPx = vcg::Point2i(size.width(),size.height()); shots[i].Intrinsics.ViewportPx = vcg::Point2i(size.width(),size.height());
shots[i].Intrinsics.CenterPx[0] = (int)((double)shots[i].Intrinsics.ViewportPx[0]/2.0f); shots[i].Intrinsics.CenterPx[0] = (int)((double)shots[i].Intrinsics.ViewportPx[0]/2.0f);
shots[i].Intrinsics.CenterPx[1] = (int)((double)shots[i].Intrinsics.ViewportPx[1]/2.0f); shots[i].Intrinsics.CenterPx[1] = (int)((double)shots[i].Intrinsics.ViewportPx[1]/2.0f);
//AddIntrinsics(shots[i], std::string(filename_images_path).append(image_filenames[i]).c_str()); //AddIntrinsics(shots[i], std::string(filename_images_path).append(image_filenames[i]).c_str());
} }
// load all correspondences // load all correspondences
typename OpenMeshType::template PerVertexAttributeHandle<CorrVec> ch = vcg::tri::Allocator<OpenMeshType>::template GetPerVertexAttribute<CorrVec>(m,"correspondences"); typename OpenMeshType::template PerVertexAttributeHandle<CorrVec> ch = vcg::tri::Allocator<OpenMeshType>::template GetPerVertexAttribute<CorrVec>(m,"correspondences");
typename OpenMeshType::VertexIterator vi = vcg::tri::Allocator<OpenMeshType>::AddVertices(m,num_points); typename OpenMeshType::VertexIterator vi = vcg::tri::Allocator<OpenMeshType>::AddVertices(m,num_points);
for(uint i = 0; i < num_points;++i,++vi){ for(uint i = 0; i < num_points;++i,++vi){
double x,y,z; double x,y,z;
unsigned int r,g,b,i_cam, key_sift,n_corr; unsigned int r,g,b,i_cam, key_sift,n_corr;
if (fscanf(fp,"%lf %lf %lf ",&x,&y,&z) != 3) return false; if (fscanf(fp,"%lf %lf %lf ",&x,&y,&z) != 3) return false;
(*vi).P() = vcg::Point3<typename OpenMeshType::ScalarType>(x,y,z); (*vi).P() = vcg::Point3<typename OpenMeshType::ScalarType>(x,y,z);
if (fscanf(fp,"%d %d %d ",&r,&g,&b) != 3) return false; if (fscanf(fp,"%d %d %d ",&r,&g,&b) != 3) return false;
(*vi).C() = vcg::Color4b(r,g,b,255); (*vi).C() = vcg::Color4b(r,g,b,255);
if (fscanf(fp,"%d ",&n_corr) != 1) return false; if (fscanf(fp,"%d ",&n_corr) != 1) return false;
for(uint j = 0; j < n_corr; ++j){ for(uint j = 0; j < n_corr; ++j){
if (fscanf(fp,"%d %d %lf %lf ",&i_cam,&key_sift,&x,&y) != 4) return false; if (fscanf(fp,"%d %d %lf %lf ",&i_cam,&key_sift,&x,&y) != 4) return false;
Correspondence corr(i_cam,key_sift,x,y); Correspondence corr(i_cam,key_sift,x,y);
ch[i].push_back(corr); ch[i].push_back(corr);
} }
} }
vcg::tri::UpdateBounding<OpenMeshType>::Box(m); vcg::tri::UpdateBounding<OpenMeshType>::Box(m);
fclose(fp); fclose(fp);
return (shots.size() == 0); return (shots.size() == 0);
} }
static bool ReadImagesFilenames(const char * filename,std::vector<std::string> &image_filenames) static bool ReadImagesFilenames(const char * filename,std::vector<std::string> &image_filenames)
{ {
FILE * fp = fopen(filename,"r"); FILE * fp = fopen(filename,"r");
if (!fp) return false; if (!fp) return false;
else else
{ {
char line[1000], name[1000]; char line[1000], name[1000];
while(!feof(fp)){ while(!feof(fp)){
readline(fp, line, 1000); readline(fp, line, 1000);
if(line[0] == '\0') continue; //ignore empty lines (in theory, might happen only at end of file) if(line[0] == '\0') continue; //ignore empty lines (in theory, might happen only at end of file)
if (sscanf(line, "%s", name) != 1) return false; if (sscanf(line, "%s", name) != 1) return false;
std::string n(name); std::string n(name);
image_filenames.push_back(n); image_filenames.push_back(n);
} }
} }
fclose(fp); fclose(fp);
return true; return true;
} }
static bool AddIntrinsics(vcg::Shotf &shot, const char * image_file) static bool AddIntrinsics(vcg::Shotf &shot, const char * image_file)
{ {
::ResetJpgfile(); // Read the JPEG file into a buffer
FILE * pFile = fopen(image_file, "rb"); FILE *fp = fopen(qUtf8Printable(image_file), "rb");
int ret = ::ReadJpegSections (pFile, READ_METADATA); if (!fp) {
fclose(pFile); std::cerr << "Exif Parsing: Unable to open file:\n\"%1\"\n\nError details: file %1 is not readable.";
if(ret==0) return false; return false;
shot.Intrinsics.ViewportPx = vcg::Point2i(ImageInfo.Width, ImageInfo.Height); }
shot.Intrinsics.CenterPx = vcg::Point2f(float(ImageInfo.Width/2.0), float(ImageInfo.Height/2.0)); fseek(fp, 0, SEEK_END);
unsigned long fsize = ftell(fp);
rewind(fp);
unsigned char *buf = new unsigned char[fsize];
if (fread(buf, 1, fsize, fp) != fsize) {
std::cerr << "Exif Parsing: Unable to read the content of the opened file:\n\"%1\"\n\nError details: file %1 is not readable.";
delete[] buf;
fclose(fp);
return false;
}
fclose(fp);
return true; // Parse EXIF
} easyexif::EXIFInfo ImageInfo;
int ret = ImageInfo.parseFrom(buf, fsize);
delete[] buf;
if (ret == 0) {
std::cerr << "Warning unable to parse exif for file %s" << qPrintable(image_file);
return false;
}
shot.Intrinsics.ViewportPx = vcg::Point2i(ImageInfo.ImageWidth, ImageInfo.ImageHeight);
shot.Intrinsics.CenterPx = vcg::Point2f(float(ImageInfo.ImageWidth/2.0), float(ImageInfo.ImageHeight/2.0));
return true;
}
}; // end class }; // end class