Commit 6f818998 authored by Cyrille Valladeau's avatar Cyrille Valladeau
Browse files

ERR : wrong commit

parent f57728b6
......@@ -365,10 +365,9 @@ ImageFileReader<TOutputImage>
}
// Free memory
delete handler;
std::cout<<geom_kwl<<std::endl;
if (!hasMetaData)
{
std::cout<<"TU PASSES ICI?????????????????????????"<<std::endl;
// Add the plugins factory
ossimProjectionFactoryRegistry::instance()->registerFactory(ossimplugins::ossimPluginProjectionFactory::instance());
ossimProjection * projection = ossimProjectionFactoryRegistry::instance()
......
......@@ -69,9 +69,8 @@ int otbImageKeywordlist( int argc, char* argv[] )
otb_kwl.SetKeywordlist( geom_kwl );
otb_kwl.convertToOSSIMKeywordlist( geom_kwl2 );
//projection->print(std::cout);
hasMetaData = projection->loadState(geom_kwl2);
//projection->print(std::cout);
hasMetaData = projection->saveState(geom_kwl3);
otb::ImageKeywordlist otb_kwl2;
otb_kwl2.SetKeywordlist( geom_kwl3 );
......
......@@ -64,8 +64,8 @@ int otbSensorModel( int argc, char* argv[] )
itk::Point<double,2> imagePoint;
imagePoint[0]=10;
imagePoint[1]=10;
//imagePoint[0]=16271;
// imagePoint[1]=15647;
// imagePoint[0]=3069;
// imagePoint[1]=1218;
itk::Point<double,2> geoPoint;
geoPoint = forwardSensorModel->TransformPoint(imagePoint);
......
......@@ -430,7 +430,6 @@ void ossimSensorModel::worldToLineSample(const ossimGpt& worldPoint,
//*****************************************************************************
std::ostream& ossimSensorModel::print(std::ostream& out) const
{
std::cout<<"..............................................................................."<<std::endl;
out << setprecision(15) << setiosflags(ios::fixed)
<< "\n ossimSensorModel base-class data members:\n"
<< "\n theImageID: " << theImageID
......@@ -490,12 +489,9 @@ void ossimSensorModel::setGroundRect(const ossimGpt& ul,
bool ossimSensorModel::saveState(ossimKeywordlist& kwl,
const char* prefix) const
{
print(std::cout);
if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimSensorModel::saveState: entering..." << std::endl;
kwl.add(prefix, IMAGE_ID_KW, theImageID.chars());
//std::cout<<"====================saveStatee::theImageID : "<<theImageID<<std::endl;
//std::cout<<"====================saveState::theImageID : "<<kwl.find(prefix, IMAGE_ID_KW)<<std::endl;
kwl.add(prefix, SENSOR_ID_KW, theSensorID.chars());
kwl.add(prefix,
......@@ -553,9 +549,6 @@ bool ossimSensorModel::saveState(ossimKeywordlist& kwl,
corner.lat,
true);
std::cout<<"====================saveStatee::UL_LAT_KW : "<< corner.lat<<std::endl;
std::cout<<"====================saveState::UL_LAT_KW : "<<kwl.find(prefix, ossimKeywordNames::UL_LAT_KW)<<std::endl;
kwl.add(prefix,
ossimKeywordNames::UL_LON_KW,
corner.lon,
......@@ -655,8 +648,6 @@ bool ossimSensorModel::loadState(const ossimKeywordlist& kwl,
else
theImageID = NULL_STRING;
//std::cout<<"****************loadState::theImageID : "<<theImageID<<" "<<value<<std::endl;
keyword = SENSOR_ID_KW;
value = kwl.find(prefix, keyword);
if (value)
......@@ -752,7 +743,6 @@ bool ossimSensorModel::loadState(const ossimKeywordlist& kwl,
{
v[1].lat = ossimString(value).toDouble();
}
std::cout<<"****************loadState::v[1].lat : "<<value<<" , "<<v[1].lat<<" "<<value<<std::endl;
keyword = ossimKeywordNames::UR_LON_KW;
value = kwl.find(prefix, keyword);
......@@ -826,18 +816,10 @@ bool ossimSensorModel::loadState(const ossimKeywordlist& kwl,
{
tmpStr = prefix;
}
std::cout<<"++++++++++++++++--++++++++++++ : "<<kwl.find(prefix, IMAGE_ID_KW)<<std::endl;
loadAdjustments(kwl, tmpStr);
std::cout<<"++++++++++++++++--++++++++++++ : "<<kwl.find(prefix, IMAGE_ID_KW)<<std::endl;
if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimSensorModel::loadState: returning..." << std::endl;
bool res = ossimProjection::loadState(kwl, prefix);
//std::cout<<"++++++++++++++++--++++++++++++ : "<<kwl.find(prefix, IMAGE_ID_KW)<<std::endl;
print(std::cout);
return res;//ossimProjection::loadState(kwl, prefix);
return ossimProjection::loadState(kwl, prefix);;
}
//*****************************************************************************
......
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