kopia lustrzana https://github.com/OpenDroneMap/ODM
ODM 0.3.1 2018-02-17: fix Georef pixelX_,pixelY_ from integer to double and formating log_.
Former-commit-id: 1001f480f4
pull/1161/head
rodzic
35c19c1890
commit
7549af1f69
|
@ -1,3 +1,7 @@
|
|||
// to format log_ output
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
using namespace std;
|
||||
// PCL
|
||||
#include <pcl/io/obj_io.h>
|
||||
#include <pcl/common/transforms.h>
|
||||
|
@ -15,7 +19,7 @@ std::ostream& operator<<(std::ostream &os, const GeorefSystem &geo)
|
|||
}
|
||||
|
||||
GeorefGCP::GeorefGCP()
|
||||
:x_(0.0), y_(0.0), z_(0.0), use_(false), localX_(0.0), localY_(0.0), localZ_(0.0),cameraIndex_(0), pixelX_(0), pixelY_(0.0), image_("")
|
||||
:x_(0.0), y_(0.0), z_(0.0), use_(false), localX_(0.0), localY_(0.0), localZ_(0.0),cameraIndex_(0), pixelX_(0.0), pixelY_(0.0), image_("")
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -682,7 +686,8 @@ void Georef::readGCPs()
|
|||
gcps_.push_back(gcp);
|
||||
++nrGCPs;
|
||||
|
||||
log_<<"x_: "<<gcp.x_<<" y_: "<<gcp.y_<<" z_: "<<gcp.z_<<" pixelX_: "<<gcp.pixelX_<<" pixelY_: "<<gcp.pixelY_<<" image: "<<gcp.image_<<"\n";
|
||||
// log_<<"x_: "<<gcp.x_<<" y_: "<<gcp.y_<<" z_: "<<gcp.z_<<" pixelX_: "<<gcp.pixelX_<<" pixelY_: "<<gcp.pixelY_<<" image: "<<gcp.image_<<"\n";
|
||||
log_<< setiosflags(ios::fixed) << setprecision(3) <<"x_: "<< gcp.x_ <<" y_: "<< gcp.y_<<" z_: "<< gcp.z_ <<" pixelX_: "<<gcp.pixelX_<<" pixelY_: "<<gcp.pixelY_<<" image: "<<gcp.image_<<"\n"; // more readeable
|
||||
}
|
||||
|
||||
// Check if the GCPs have corresponding images in the bundle files and if they don't, remove them from the GCP-list
|
||||
|
|
|
@ -46,8 +46,8 @@ struct GeorefGCP
|
|||
|
||||
size_t cameraIndex_; /**< The index to the corresponding camera for the image. **/
|
||||
|
||||
int pixelX_; /**< The pixels x-position for the GCP in the corresponding image **/
|
||||
int pixelY_; /**< The pixels y-position for the GCP in the corresponding image **/
|
||||
double pixelX_; /**< The pixels x-position for the GCP in the corresponding image **/
|
||||
double pixelY_; /**< The pixels y-position for the GCP in the corresponding image **/
|
||||
|
||||
std::string image_; /**< The corresponding image for the GCP **/
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue