lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-13 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed import raster

Browse Source 
When a new raster is imported, the extrinsics of the shot are now
assigned to a trackball reset
This commit is contained in:
Matteo Dellepiane 2016-11-08 14:29:24 +01:00
parent f6889ca073
commit 47e0ea8008
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/meshlab/mainwindow_RunTime.cpp
View File

@ -2545,9 +2545,10 @@ bool MainWindow::importRaster(const QString& fileImg)
meshDoc()->setBusy(false);
showLayerDlg(true);
/// Intrinsics extraction from EXIF
/// Intrinsics extraction from EXIF
/// If no CCD Width value is provided, the intrinsics are extracted using the Equivalent 35mm focal
/// If no or invalid EXIF info is found, the Intrinsics are initialized as a "plausible" 35mm sensor, with 50mm focal
::ResetJpgfile();
FILE * pFile = fopen(qPrintable(fileName), "rb");
@ -2585,7 +2586,13 @@ bool MainWindow::importRaster(const QString& fileImg)
rm->shot.Intrinsics.FocalMm = ImageInfo.FocalLength;
}
// End of EXIF reading
// End of EXIF reading
//// Since no extrinsic are available, the current trackball is reset (except for the FOV) and assigned to the raster
GLA()->resetTrackBall();
GLA()->fov = rm->shot.GetFovFromFocal();
rm->shot = GLA()->shotFromTrackball().first;
// if(mdiarea->isVisible()) GLA()->mvc->showMaximized();
updateMenus();