From 16e27d0c95e046fcd3f2be80ccd5b1f2228830e3 Mon Sep 17 00:00:00 2001
From: Chia Aik Song <crscas@nus.edu.sg>
Date: Fri, 25 Sep 2009 17:45:24 +0800
Subject: [PATCH] TMP interim save before complete fix of ALOS parameter
reading from leader and data files
---
.../ossim/AlosPalsar/AlosSarData.cpp | 37 +++++++------------
.../AlosPalsar/AlosSarDataFileDescriptor.cpp | 4 --
.../ossim/AlosPalsar/AlosSarLeader.cpp | 2 +-
.../ossim/AlosPalsar/AlosSarRecordFactory.h | 2 +-
.../ossim/ossimAlosPalsarModel.cpp | 3 +-
5 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarData.cpp b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarData.cpp
index e8032ea011..662844be30 100644
--- a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarData.cpp
+++ b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarData.cpp
@@ -55,30 +55,20 @@ std::istream& operator>>(std::istream& is, AlosSarData& data)
data.ClearRecords();
AlosSarRecordHeader header;
- bool eof = false;
- while(!eof)
+
+ is>>header;
+
+ AlosSarRecord* record = new AlosSarDataFileDescriptor;
+ if (record != NULL)
+ {
+ record->Read(is);
+ data._records[header.get_rec_seq()] = record;
+ }
+ else
{
- is>>header;
- if(is.eof())
- {
- eof = true;
- }
- else
- {
- AlosSarRecord* record = new AlosSarDataFileDescriptor;
- if (record != NULL)
- {
- record->Read(is);
- data._records[header.get_rec_seq()] = record;
- eof = true;
- }
- else
- {
- char* buff = new char[header.get_length()-12];
- is.read(buff, header.get_length()-12);
- delete buff;
- }
- }
+ char* buff = new char[header.get_length()-12];
+ is.read(buff, header.get_length()-12);
+ delete buff;
}
return is;
}
@@ -133,7 +123,6 @@ bool AlosSarData::saveState(ossimKeywordlist& kwl,
char name[64];
- kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimAlosSarModel", true);
/*
* Adding metadata necessary to the sensor model in the keywordlist
*/
diff --git a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarDataFileDescriptor.cpp b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarDataFileDescriptor.cpp
index ea310045b5..e6242d7003 100644
--- a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarDataFileDescriptor.cpp
+++ b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarDataFileDescriptor.cpp
@@ -49,8 +49,6 @@ std::istream& operator>>(std::istream& is, AlosSarDataFileDescriptor& data)
is.read(buf6,6);
data._num_lines = atoi(buf6);
- // FIXME debug
- std::cout << std::endl << "buf6: {" << buf6 << "}" << std::endl;
is.read(buf94,94);
@@ -58,8 +56,6 @@ std::istream& operator>>(std::istream& is, AlosSarDataFileDescriptor& data)
is.read(buf8,8);
tmpval = atoi(buf8);
data._num_pix_in_line = tmpval/8; // Assume data always in 8-byte complex format
- // FIXME debug
- std::cout << std::endl << "buf8: {" << buf8 << "}" << std::endl;
char buf432[433];
buf432[432] = '\0';
diff --git a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp
index b137076704..853c45b08c 100644
--- a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp
+++ b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp
@@ -140,7 +140,7 @@ bool AlosSarLeader::saveState(ossimKeywordlist& kwl,
char name[64];
- kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimAlosSarModel", true);
+ //kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimAlosPalsarModel", true);
/*
* Adding metadata necessary to the sensor model in the keywordlist
*/
diff --git a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarRecordFactory.h b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarRecordFactory.h
index 4a772ad6d7..8647cc5aad 100644
--- a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarRecordFactory.h
+++ b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarRecordFactory.h
@@ -59,4 +59,4 @@ protected:
private:
};
}
-#endif
\ No newline at end of file
+#endif
diff --git a/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp b/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp
index 9fa65b8973..ce8c08d81a 100644
--- a/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp
@@ -255,7 +255,7 @@ bool ossimAlosPalsarModel::saveState(ossimKeywordlist& kwl,
char name[64];
- //kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimAlosPalsarModel", true);
+ kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimAlosPalsarModel", true);
if (theAlosSarLeader == NULL)
{
@@ -761,7 +761,6 @@ bool ossimAlosPalsarModel::isAlosPalsarData(const ossimFilename& file) const
ossimFilename ossimAlosPalsarModel::findAlosPalsarData(const ossimFilename& file) const
{
- //FIXME
ossimFilename dataFile = file;
ossimString imgPrefix("IMG-HH"); // Assume the ALOS data always has at least the HH
ossimString trlPrefix("TRL");
--
GitLab