Unverified Commit 47316b7b authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

2.5D Occlusion and Testing Update (#3757) 



* Adds occlusion handling to cam2map

* Added conditional check for occlusion, updated xml

* Updated documentation

* Converted cam2map to a function style application

* Converted map2cam to cpp / functions

* Added new cam2map file and test file

* Moved cam2map gui helpers into the main.cpp

* Added baseline cam2map gtest

* Added a projected version of the default cube with a mapping for mars

* Updated map2cam for testability

* Added a gtest for map2cam

* Mocked rubbersheet and added initial cam2map test with mocked process

* Added initial mock file.

* Added cam2map transform tests, new line scanner fixture, and a mocked camera

* Fixed a few things in the cam2map tests

* Updated ISD and fixed paths

* Added more tests

* Updated fromisd with necessary camera load for some data sources

* Added cam2map mock tests, added bodies for transform pure virtual funcs

* Updated gtest to latest version

* Fixed a few things after the rebase

* Removed a cout

Co-authored-by: default avatarAustin Sanders <arsanders@usgs.gov>
parent e1e29034

gtest @ e588eb1f

Compare 529c2c6f to e588eb1f
Original line number Diff line number Diff line 
Subproject commit 529c2c6f4af29dadb8ee5cddf6a7919caa5ca5f6
 
Subproject commit e588eb1ff9ff6598666279b737b27f983156ad85

isis/src/base/apps/cam2map/cam2map.cpp

0 → 100644
+565 −0

File added.

Preview size limit exceeded, changes collapsed.

isis/src/base/apps/cam2map/cam2map.h

+72 −62
Original line number Diff line number Diff line 
#ifndef cam2map_h

#define cam2map_h



#include "Application.h"

#include "TProjection.h"

#include "Transform.h"

#include "UserInterface.h"

#include "Pvl.h"

#include "ProcessRubberSheet.h"



using namespace Isis;

namespace Isis {

  extern void cam2map(UserInterface &ui, Pvl *log=nullptr);

  extern void cam2map(Cube *icube, Pvl &userMap, PvlGroup &userGrp, ProcessRubberSheet &rs,

                      UserInterface &ui, Pvl *log);

  extern void cam2map(Cube *icube, Pvl &userMap, PvlGroup &userGrp, UserInterface &ui, Pvl *log);



  /**

   * @author ????-??-?? Unknown
@@ -20,6 +28,7 @@ class cam2mapReverse : public Transform { 
      int p_inputSamples;

      int p_inputLines;

      bool p_trim;

      bool p_occlusion;

      int p_outputSamples;

      int p_outputLines;
@@ -29,7 +38,8 @@ class cam2mapReverse : public Transform { 
                     Camera *incam,

                     const int outputSamples, const int outputLines,

                     TProjection *outmap,

                   bool trim);

                     bool trim,

                     bool occlusion=false);



      // destructor

      ~cam2mapReverse() {};
@@ -73,6 +83,6 @@ class cam2mapForward : public Transform { 
      int OutputSamples() const;

      int OutputLines() const;

  };



}



#endif

isis/src/base/apps/cam2map/cam2map.xml

+161 −130

File changed.

Preview size limit exceeded, changes collapsed.

isis/src/base/apps/cam2map/main.cpp

+10 −521

File changed.

Preview size limit exceeded, changes collapsed.