Skip to content
Snippets Groups Projects
Commit 8e27f988 authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

BUG: remove unused lines

parent 8f957e5d
Branches
Tags
No related merge requests found
...@@ -19,12 +19,6 @@ ...@@ -19,12 +19,6 @@
#pragma warning ( disable : 4786 ) #pragma warning ( disable : 4786 )
#endif #endif
// iostream is used for general output
// #include <iostream>
// #include <iterator>
// #include <stdlib.h>
#include "otbImage.h" #include "otbImage.h"
#include "otbVectorImage.h" #include "otbVectorImage.h"
#include "otbImageFileReader.h" #include "otbImageFileReader.h"
......
...@@ -16,17 +16,11 @@ ...@@ -16,17 +16,11 @@
#include <ossim/projection/ossimSensorModel.h> #include <ossim/projection/ossimSensorModel.h>
#include <ossim/projection/ossimMapProjection.h> #include <ossim/projection/ossimMapProjection.h>
#include <ossim/base/ossimIpt.h>
#include <ossim/base/ossimFilename.h>
#include <ossim/base/ossimGpt.h> #include <ossim/base/ossimGpt.h>
#include <ossim/base/ossimDpt.h> #include <ossim/base/ossimDpt.h>
#include <ossim/base/ossimEcefRay.h>
#include <ossim/base/ossimEcefPoint.h>
#include <ossim/base/ossimMatrix3x3.h> #include <ossim/base/ossimMatrix3x3.h>
#include <iostream> #include <iostream>
class ossimFfL7;
class ossimString;
class ossimMapProjection; class ossimMapProjection;
//****************************************************************************** //******************************************************************************
...@@ -41,12 +35,10 @@ public: ...@@ -41,12 +35,10 @@ public:
* CONSTRUCTORS: * CONSTRUCTORS:
*/ */
ossimTileMapModel(); ossimTileMapModel();
ossimTileMapModel(const ossimFfL7& head);
ossimTileMapModel(const ossimFilename& init_file);
ossimTileMapModel(const ossimKeywordlist& geom_kwl); ossimTileMapModel(const ossimKeywordlist& geom_kwl);
ossimTileMapModel(const ossimTileMapModel& rhs); ossimTileMapModel(const ossimTileMapModel& rhs);
virtual ~ossimTileMapModel(); virtual ~ossimTileMapModel(){};
enum ProjectionType enum ProjectionType
{ {
...@@ -57,19 +49,6 @@ public: ...@@ -57,19 +49,6 @@ public:
SOM_ORBIT SOM_ORBIT
}; };
enum AdjustParamIndex
{
INTRACK_OFFSET = 0,
CRTRACK_OFFSET,
LINE_GSD_CORR,
SAMP_GSD_CORR,
ROLL_OFFSET,
YAW_OFFSET,
YAW_RATE,
MAP_ROTATION,
NUM_ADJUSTABLE_PARAMS // not an index
};
/*! /*!
* Returns pointer to a new instance, copy of this. * Returns pointer to a new instance, copy of this.
*/ */
...@@ -119,38 +98,17 @@ public: ...@@ -119,38 +98,17 @@ public:
return qDepth; return qDepth;
} }
/*!
* Given an image point, returns a ray originating at some arbitrarily high
* point (ideally at the sensor position) and pointing towards the target.
*/
virtual void imagingRay(const ossimDpt& image_point,
ossimEcefRay& image_ray) const;
/*!
* Following a change to the adjustable parameter set, this virtual
* is called to permit instances to compute derived quantities after
* parameter change.
*/
virtual void updateModel();
/*! /*!
* ossimOptimizableProjection * ossimOptimizableProjection
*/ */
inline virtual bool useForward()const {return false;} //!image to ground faster inline virtual bool useForward()const {return true;} //!image to ground faster
virtual bool setupOptimizer(const ossimString& init_file); //!uses file path to init model
protected: protected:
/*!
* Initializes the model given a fast format header.
*/
void initFromHeader(const ossimFfL7& head);
virtual void initAdjustableParameters();
void initMapProjection();
//*** //***
// Image constant parameters: // Image constant parameters:
//*** //***
...@@ -164,20 +122,20 @@ protected: ...@@ -164,20 +122,20 @@ protected:
int theWrsRowNumber; int theWrsRowNumber;
double theMeridianalAngle; double theMeridianalAngle;
double thePositionError; double thePositionError;
ProjectionType theProjectionType; ProjectionType theProjectionType;
ossimRefPtr<ossimMapProjection> theMapProjection; ossimRefPtr<ossimMapProjection> theMapProjection;
double theMapAzimAngle; double theMapAzimAngle;
double theMapAzimCos; double theMapAzimCos;
double theMapAzimSin; double theMapAzimSin;
double theMap2IcRotAngle; double theMap2IcRotAngle;
double theMap2IcRotCos; double theMap2IcRotCos;
double theMap2IcRotSin; double theMap2IcRotSin;
//
//*** // //***
// Adjustable parameters: // // Adjustable parameters:
//*** // //***
double theIntrackOffset; double theIntrackOffset;
double theCrtrackOffset; double theCrtrackOffset;
double theLineGsdCorr; double theLineGsdCorr;
...@@ -186,15 +144,16 @@ protected: ...@@ -186,15 +144,16 @@ protected:
double theYawOffset; double theYawOffset;
double theYawRate; double theYawRate;
double theMapRotation; double theMapRotation;
//
//*** // //***
// Quantities derived from the adjustable parameters: // // Quantities derived from the adjustable parameters:
//*** // //***
NEWMAT::Matrix theRollRotMat; NEWMAT::Matrix theRollRotMat;
unsigned int qDepth;
TYPE_DATA TYPE_DATA
unsigned int qDepth;
}; };
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment