Commit 51763588 authored by Jordi Inglada's avatar Jordi Inglada

Radarsat instance twice

parent 9349b050
......@@ -9,7 +9,7 @@
// Contains implementation of class ossimSensorModelFactory
//
//*****************************************************************************
// $Id: ossimSensorModelFactory.cpp 12082 2007-11-26 21:46:44Z dburken $
// $Id: ossimSensorModelFactory.cpp 10430 2007-02-07 01:05:22Z dburken $
#include <fstream>
#include <algorithm>
#include <ossim/projection/ossimSensorModelFactory.h>
......@@ -39,7 +39,6 @@ static ossimTrace traceDebug = ossimTrace("ossimSensorModelFactory:debug");
#include <ossim/projection/ossimLandSatModel.h>
#include <ossim/projection/ossimSpot5Model.h>
#include <ossim/projection/ossimSarModel.h>
#include <ossim/projection/ossimNetworkedQuadTreeModel.h>
#include <ossim/projection/ossimRadarSatModel.h>
#include <ossim/support_data/ossimSpotDimapSupportData.h>
#include <ossim/projection/ossimNitfMapModel.h>
......@@ -48,7 +47,7 @@ static ossimTrace traceDebug = ossimTrace("ossimSensorModelFactory:debug");
#include <ossim/projection/ossimApplanixEcefModel.h>
#include <ossim/support_data/ossimFfL7.h>
#include <ossim/support_data/ossimFfL5.h>
#include <ossim/projection/ossimRadarSatModel.h>
//***
// ADD_MODEL: List names of all sensor models produced by this factory:
//***
......@@ -184,17 +183,12 @@ ossimSensorModelFactory::createProjection(const ossimString &name) const
return new ossimSarModel;
}
if(name == STATIC_TYPE_NAME(ossimNetworkedQuadTreeModel))
{
return new ossimNetworkedQuadTreeModel;
}
if(name == STATIC_TYPE_NAME(ossimRadarSatModel))
if (name == STATIC_TYPE_NAME(ossimRadarSatModel))
{
return new ossimRadarSatModel;
return new ossimRadarSatModel;
}
//***
// ADD_MODEL: (Please leave this comment for the next programmer)
......@@ -205,6 +199,39 @@ ossimSensorModelFactory::createProjection(const ossimString &name) const
return NULL;
}
//*****************************************************************************
// METHOD: ossimSensorModelFactory::getList()
//
//*****************************************************************************
list<ossimString> ossimSensorModelFactory::getList() const
{
list<ossimString> result;
//***
// Place the name of each model produced in the list:
//***
result.push_back(STATIC_TYPE_NAME(ossimCoarseGridModel));
result.push_back(STATIC_TYPE_NAME(ossimRpcModel));
result.push_back(STATIC_TYPE_NAME(ossimIkonosRpcModel));
result.push_back(STATIC_TYPE_NAME(ossimNitfRpcModel));
result.push_back(STATIC_TYPE_NAME(ossimQuickbirdRpcModel));
result.push_back(STATIC_TYPE_NAME(ossimLandSatModel));
result.push_back(STATIC_TYPE_NAME(ossimNitfMapModel));
result.push_back(STATIC_TYPE_NAME(ossimFcsiModel));
result.push_back(STATIC_TYPE_NAME(ossimApplanixUtmModel));
result.push_back(STATIC_TYPE_NAME(ossimApplanixEcefModel));
result.push_back(STATIC_TYPE_NAME(ossimSpot5Model));
result.push_back(STATIC_TYPE_NAME(ossimSarModel));
//***
// ADD_MODEL: Please leave this comment for the next programmer. Add above.
//***
//result.push_back(ossimString(MY_NEW_MODEL));
return result;
}
//*****************************************************************************
// METHOD
//*****************************************************************************
......@@ -243,7 +270,6 @@ ossimSensorModelFactory::getTypeNameList(std::vector<ossimString>& typeList)
typeList.push_back(STATIC_TYPE_NAME(ossimFcsiModel));
typeList.push_back(STATIC_TYPE_NAME(ossimSpot5Model));
typeList.push_back(STATIC_TYPE_NAME(ossimSarModel));
typeList.push_back(STATIC_TYPE_NAME(ossimNetworkedQuadTreeModel));
//***
// ADD_MODEL: Please leave this comment for the next programmer. Add above.
......@@ -431,15 +457,6 @@ ossimProjection* ossimSensorModelFactory::createProjection(const ossimFilename&
delete model;
model = 0;
}
else if(isNetworkedQuadTree(filename))
{
model = new ossimNetworkedQuadTreeModel(filename);
if(!model->getErrorStatus())
return model;
delete model;
model = 0;
}
ossimFilename spot5Test = geomFile;
......@@ -518,21 +535,6 @@ bool ossimSensorModelFactory::isLandsat(const ossimFilename& filename)const
return r;
}
bool ossimSensorModelFactory::isNetworkedQuadTree(const ossimFilename& filename)const
{
ossimFilename temp(filename);
temp.downcase();
if(temp.ext() == "otb")
{
std::cout << "NetworkedQuadTree format " << std::endl;
return true;
}
return false;
}
void ossimSensorModelFactory::findCoarseGrid(ossimFilename& result,
const ossimFilename& geomFile)const
{
......
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