Permalink
Browse files

Make bundlevis work with new bundleadjustment mod

  • Loading branch information...
1 parent 9265bd2 commit e7ed5b79f43be797051093bca9cc2823aedf467e Zack Moratto committed Apr 4, 2010
Showing with 8 additions and 8 deletions.
  1. +1 −1 configure.ac
  2. +4 −4 src/asp/Tools/bundlevis.cc
  3. +3 −3 src/asp/Tools/bundlevis.h
View
@@ -316,7 +316,7 @@ AX_APP(POINT2MESH, [src/asp/Tools], yes, [OPENSCENEGRAPH VW])
AX_APP(POINT2DEM, [src/asp/Tools], yes, [CORE])
AX_APP(RMAX2CAHVOR, [src/asp/Tools], no, [SESSIONS])
AX_APP(RMAXADJUST, [src/asp/Tools], no, [VW_BUNDLEADJUSTMENT SESSIONS])
-AX_APP(BUNDLEVIS, [src/asp/Tools], no, [OPENSCENEGRAPH VW_CAMERA])
+AX_APP(BUNDLEVIS, [src/asp/Tools], no, [OPENSCENEGRAPH VW_BUNDLEADJUSTMENT])
AX_APP(ISISADJUST, [src/asp/Tools], yes, [VW_BUNDLEADJUSTMENT ISISIO CORE])
AX_APP(RESULTS, [src/asp/Tools], yes, [ISISIO])
AX_APP(RECONSTRUCT, [src/asp/Tools], no, [VW_PHOTOMETRY VW_CARTOGRAPHY VW])
@@ -427,11 +427,11 @@ std::vector<CameraIter*> loadCameraData( std::string camFile,
std::vector<ConnLineIter*> loadControlNet( std::string cnetFile,
std::vector<PointIter*>& points,
std::vector<CameraIter*>& cameras,
- vw::camera::ControlNetwork* cnet,
+ vw::ba::ControlNetwork* cnet,
int* step ) {
std::cout << "Loading Control Network : " << cnetFile << std::endl;
- cnet = new vw::camera::ControlNetwork("Bundlevis");
+ cnet = new vw::ba::ControlNetwork("Bundlevis");
cnet->read_binary( cnetFile );
if ( cnet->size() != points.size() ) {
@@ -447,7 +447,7 @@ std::vector<ConnLineIter*> loadControlNet( std::string cnetFile,
std::vector<ConnLineIter*> connLineData;
// For every point
for ( unsigned p = 0; p < cnet->size(); ++p ) {
- points[p]->setGCP( (*cnet)[p].type() == vw::camera::ControlPoint::GroundControlPoint );
+ points[p]->setGCP( (*cnet)[p].type() == vw::ba::ControlPoint::GroundControlPoint );
if (cameras.size()) {
// For every measure
@@ -963,7 +963,7 @@ int main(int argc, char* argv[]){
std::string pixel_iter_file;
std::string control_net_file;
std::vector<std::string> additional_pnt_files;
- vw::camera::ControlNetwork* cnet = NULL;
+ vw::ba::ControlNetwork* cnet = NULL;
std::vector<PointIter*> pointData;
std::vector<CameraIter*> cameraData;
std::vector<ConnLineIter*> connLineData;
@@ -45,7 +45,7 @@ namespace po = boost::program_options;
#include <vector>
//VisionWorkbench
-#include <vw/Camera/ControlNetwork.h>
+#include <vw/BundleAdjustment/ControlNetwork.h>
#include <vw/Math.h>
// PointIter, the lowest quantum of points
@@ -96,7 +96,7 @@ class PointIter : public osg::Referenced {
std::string _description;
std::vector<osg::Vec3f> _position;
std::vector<float> _error;
- vw::camera::ControlPoint* _controlPoint;
+ vw::ba::ControlPoint* _controlPoint;
};
// CameraIter, the lowest quantum of cameras
@@ -223,7 +223,7 @@ std::vector<CameraIter*> loadCameraData( std::string camFile,
std::vector<ConnLineIter*> loadControlNet( std::string cnetFile ,
std::vector<PointIter*>& points,
std::vector<CameraIter*>& cameras,
- vw::camera::ControlNetwork* cnet,
+ vw::ba::ControlNetwork* cnet,
int* step );
// This builds the entire scene

0 comments on commit e7ed5b7

Please sign in to comment.