Commit 2090abc1 authored by Rashad Kanavath's avatar Rashad Kanavath

WRG: fix overloaded virtual

parent 0c2138ff
......@@ -15,7 +15,6 @@
#include <ossimPluginConstants.h>
#include <ossim/projection/ossimSensorModel.h>
#include <ossim/projection/ossimCoarseGridModel.h>
#include <list>
#include <vector>
......@@ -23,7 +22,9 @@ namespace ossimplugins
{
class PlatformPosition;
class SensorParams;
class RefPoint;
class SarSensor;
class JSDDateTime;
......@@ -38,6 +39,8 @@ class OSSIM_PLUGINS_DLL ossimGeometricSarSensorModel : public ossimSensorModel
public:
static const char* CREATE_OCG_PREF_KW;
using ossimOptimizableProjection::operator=;
/** @brief default constructor */
ossimGeometricSarSensorModel();
......@@ -47,6 +50,24 @@ public:
/** @brief Destructor */
virtual ~ossimGeometricSarSensorModel();
// ossimRefPtr <PlatformPosition2> thePlatformPosition;
// SensorParams* theSensorParams;
// SensorParams2 theSensorParams;
void finalize(const ossimKeywordlist& /*kwl*/)
{
// ossimKeywordlist ppKwl;
// kwl.extractKeysThatMatch(ppKwl, "orbitList.*");
// size_t ppcount = atoi(ppKwl.find("orbitList.count"));
// thePlatformPosition = new PlatformPosition2(ppcount);
// thePlatformPosition->loadState(ppKwl, "orbitList.");
//
// ossimKeywordlist sensorKwl;
// kwl.extractKeysThatMatch(sensorKwl, "sensor_params.*");
// theSensorParams = new SensorParams();
// theSensorParams->loadState(sensorKwl, "sensor_params.");
}
/**
* @brief This function associates an image column number to a slant range when the image is georeferenced (ground projected)
* @param col Column coordinate of the image point
......@@ -64,7 +85,7 @@ public:
* @param line Line coordinate of the image point
*/
virtual JSDDateTime getTime(double line) const;
/**
* @brief This function associates an image line number to a platform position and speed
* @param line Line coordinate of the image point
......@@ -178,7 +199,7 @@ public:
protected:
/**
* @brief Creates replacement coarse grid model if user requested via ossim preferences
* @brief Creates replacement coarse grid model if user requested via ossim preferences
* keyword "geometric_sar_sensor_model.create_ocg: <bool>"
* @return true if load OK, false on error
*/
......
......@@ -37,10 +37,13 @@ public:
/*!
* CONSTRUCTORS:
*/
using ossimOptimizableProjection::operator=;
ossimTileMapModel();
ossimTileMapModel(const ossimKeywordlist& geom_kwl);
ossimTileMapModel(const ossimTileMapModel& rhs);
virtual ~ossimTileMapModel(){};
enum ProjectionType
......@@ -51,17 +54,18 @@ public:
SOM_MAP,
SOM_ORBIT
};
/*!
* Returns pointer to a new instance, copy of this.
*/
virtual ossimObject* dup() const { return 0; } // TBR
/*!
* Extends base-class implementation. Dumps contents of object to ostream.
*/
virtual std::ostream& print(std::ostream& out) const;
bool open(const ossimFilename& file);
......@@ -72,16 +76,16 @@ public:
*/
virtual bool saveState(ossimKeywordlist& kwl,
const char* prefix=0) const;
virtual bool loadState(const ossimKeywordlist& kwl,
const char* prefix=0);
/*!
* Writes a template of geom keywords processed by loadState and saveState
* to output stream.
*/
static void writeGeomTemplate(ostream& os);
//***
// Overrides base class pure virtual.
//***
......@@ -92,7 +96,7 @@ public:
ossimGpt& worldPoint) const;
virtual void lineSampleToWorld(const ossimDpt& image_point,
ossimGpt& worldPoint) const;
/*!
* Set/Get the depth of the quadtree decomposition
*
......@@ -104,18 +108,18 @@ public:
{
return qDepth;
}
/*!
* ossimOptimizableProjection
*/
inline virtual bool useForward()const {return true;} //!image to ground faster
protected:
//***
// Image constant parameters:
//***
......@@ -129,17 +133,17 @@ protected:
int theWrsRowNumber;
double theMeridianalAngle;
double thePositionError;
ProjectionType theProjectionType;
ossimRefPtr<ossimMapProjection> theMapProjection;
double theMapAzimAngle;
double theMapAzimCos;
double theMapAzimSin;
double theMap2IcRotAngle;
double theMap2IcRotCos;
double theMap2IcRotSin;
//
//
// //***
// // Adjustable parameters:
// //***
......@@ -151,15 +155,15 @@ protected:
double theYawOffset;
double theYawRate;
double theMapRotation;
//
//
// //***
// // Quantities derived from the adjustable parameters:
// //***
NEWMAT::Matrix theRollRotMat;
unsigned int qDepth;
unsigned int qDepth;
TYPE_DATA
};
} // End: namespace ossimplugins
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment