work in progress

Code/IO/otbImageIOFactory.cxx

@@ -28,6 +28,7 @@
 #include "otbGDALImageIOFactory.h"
 #include "otbLUMImageIOFactory.h"
 #include "otbBSQImageIOFactory.h"
+#include "otbNetworkedQuadTreeImageIOFactory.h"
 
 namespace otb
 {
@@ -66,6 +67,9 @@ ImageIOFactory::RegisterBuiltInFactories()
 			// GDAL : New format for OTB
                         itk::ObjectFactoryBase::RegisterFactory( GDALImageIOFactory::New() );
                         
+                        // NetworkedQuadTree : New format for OTB
+                        itk::ObjectFactoryBase::RegisterFactory( NetworkedQuadTreeImageIOFactory::New() );
+                        
                         firstTime = false;
                 }
         }

Code/IO/otbNetworkedQuadTreeImageIO.h

+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+#ifndef __otbNetworkedQuadTreeImageIO_h
+#define __otbNetworkedQuadTreeImageIO_h
+
+#ifdef _MSC_VER
+#pragma warning ( disable : 4786 )
+#endif
+
+/* C++ Libraries */
+#include <string>
+#include "stdlib.h"
+
+/* ITK Libraries */
+#include "itkImageIOBase.h"
+
+#include "otbMetaDataKey.h"
+
+
+/* GDAL Libraries */
+#include "gdal.h"
+#include "gdal_priv.h"
+#include "cpl_string.h"
+#include "cpl_conv.h"
+#include "ogr_spatialref.h"
+#include "ogr_srs_api.h"
+
+/* Curl Library*/
+#include <curl/curl.h>
+
+namespace otb
+{
+
+/** \class NetworkedQuadTreeImageIO
+ *
+ * \brief ImageIO object for reading (not writing) NetworkedQuadTree images
+ *
+ * The streaming read is implemented.
+ *
+ * \ingroup IOFilters
+ *
+ */
+class ITK_EXPORT NetworkedQuadTreeImageIO : public itk::ImageIOBase,
+			       public MetaDataKey
+{
+public:
+
+  typedef unsigned char InputPixelType;
+  
+  /** Standard class typedefs. */
+  typedef NetworkedQuadTreeImageIO            Self;
+  typedef itk::ImageIOBase  Superclass;
+  typedef itk::SmartPointer<Self>  Pointer;
+  
+  /** Method for creation through the object factory. */
+  itkNewMacro(Self);
+
+  /** Run-time type information (and related methods). */
+  itkTypeMacro(NetworkedQuadTreeImageIO, itk::ImageIOBase);
+
+  /** Set/Get the level of compression for the output images.
+   *  0-9; 0 = none, 9 = maximum. */
+  itkSetMacro(CompressionLevel, int);
+  itkGetMacro(CompressionLevel, int);
+  
+  virtual void SetCacheDirectory (const char* _arg)
+  {
+    if ( _arg && (_arg == this->m_CacheDirectory) ) { return;} 
+    if (_arg)
+    { 
+      this->m_CacheDirectory = _arg;
+      this->useCache=true;
+    }
+    else 
+    { 
+      this->m_CacheDirectory = ""; 
+      this->useCache=false;
+    } 
+    this->Modified(); 
+  } 
+  
+  virtual void SetCacheDirectory (const std::string & _arg) 
+  { 
+    this->SetCacheDirectory( _arg.c_str() ); 
+    this->useCache=true;
+  } 
+          
+  itkSetMacro(Depth, int);
+  itkGetMacro(Depth, int);
+  
+  itkGetStringMacro(CacheDirectory);
+
+  /*-------- This part of the interface deals with reading data. ------ */
+
+  /** Determine the file type. Returns true if this ImageIO can read the
+   * file specified. */
+  virtual bool CanReadFile(const char*);
+  
+  /** Determine the file type. Returns true if the ImageIO can stream read the specified file */
+  virtual bool CanStreamRead(){  return true; };
+
+  /** Set the spacing and dimention information for the set filename. */
+  virtual void ReadImageInformation();
+ 
+  /** Reads the data from disk into the memory buffer provided. */
+  virtual void Read(void* buffer);
+    
+  /** Reads 3D data from multiple files assuming one slice per file. */
+  virtual void ReadVolume(void* buffer);
+
+  /*-------- This part of the interfaces deals with writing data. ----- */
+
+  /** Determine the file type. Returns true if this ImageIO can read the
+   * file specified. */
+  virtual bool CanWriteFile(const char*);
+
+  /** Determine the file type. Returns true if the ImageIO can stream write the specified file */
+//THOMAS
+  virtual bool CanStreamWrite() { return false; };
+
+  /** Writes the spacing and dimentions of the image.
+   * Assumes SetFileName has been called with a valid file name. */
+  virtual void WriteImageInformation();
+
+  /** Writes the data to disk from the memory buffer provided. Make sure
+   * that the IORegion has been set properly. */
+  virtual void Write(const void* buffer);
+
+  // JULIEN: NOT USED, NOT IMPLEMENTED
+  //void SampleImage(void* buffer,int XBegin, int YBegin, int SizeXRead, int SizeYRead, int XSample, int YSample);
+  
+protected:
+  /** Construtor.*/
+  NetworkedQuadTreeImageIO();
+  /** Destructor.*/
+  ~NetworkedQuadTreeImageIO();
+  
+  void PrintSelf(std::ostream& os, itk::Indent indent) const;
+  /** Read all information on the image*/
+  void InternalReadImageInformation();
+  /** Write all information on the image*/
+  void InternalWriteImageInformation();
+  /** Dimension along Ox of the image*/
+  int m_width;
+  /** Dimension along Oy of the image*/
+  int m_height;
+  /** Number of bands of the image*/
+  int m_NbBands;
+  /** Buffer*/
+  //float **pafimas;
+  
+  /** Determines the level of compression for written files. 
+   *  Range 0-9; 0 = none, 9 = maximum , default = 4 */
+  int m_CompressionLevel;
+  const char* m_currentfile;
+
+private:
+  NetworkedQuadTreeImageIO(const Self&); //purposely not implemented
+  void operator=(const Self&); //purposely not implemented
+
+  void InternalRead(double x, double y, void* buffer);
+  void BuildFileName(std::ostringstream& quad, std::ostringstream& filename);
+  void GetFromNet(std::ostringstream& quad);
+  void FillCacheFaults(void* buffer);
+      
+
+  /** Nombre d'octets par pixel */
+  int           m_NbOctetPixel;
+  
+  /** Resolution depth*/
+  int m_Depth;
+  bool useCache;
+  std::string m_CacheDirectory;
+  std::string m_ServerName;
+  
+  bool m_FlagWriteImageInformation;
+
+};
+
+} // end namespace otb
+
+#endif // __otbNetworkedQuadTreeImageIO_h

Code/IO/otbNetworkedQuadTreeImageIOFactory.cxx

+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+#include "otbNetworkedQuadTreeImageIOFactory.h"
+
+#include "itkCreateObjectFunction.h"
+#include "otbNetworkedQuadTreeImageIO.h"
+#include "itkVersion.h"
+
+  
+namespace otb
+{
+
+NetworkedQuadTreeImageIOFactory::NetworkedQuadTreeImageIOFactory()
+{
+  this->RegisterOverride("itkImageIOBase",
+                         "otbNetworkedQuadTreeImageIO",
+                         "NetworkedQuadTree Image IO",
+                         1,
+                         itk::CreateObjectFunction<NetworkedQuadTreeImageIO>::New());
+}
+  
+NetworkedQuadTreeImageIOFactory::~NetworkedQuadTreeImageIOFactory()
+{
+}
+
+const char* 
+NetworkedQuadTreeImageIOFactory::GetITKSourceVersion(void) const
+{
+  return ITK_SOURCE_VERSION;
+}
+
+const char* 
+NetworkedQuadTreeImageIOFactory::GetDescription() const
+{
+  return "NetworkedQuadTree ImageIO Factory, enabling NetworkedQuadTree image format loading in OTB";
+}
+
+} // end namespace otb
+

Code/IO/otbNetworkedQuadTreeImageIOFactory.h

+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
+#ifndef __otbNetworkedQuadTreeImageIOFactory_h
+#define __otbNetworkedQuadTreeImageIOFactory_h
+
+#include "itkObjectFactoryBase.h"
+#include "itkImageIOBase.h"
+
+namespace otb
+{
+/** \class NetworkedQuadTreeImageIOFactory
+ * \brief Creation of a NetworkedQuadTreeImageIO object using object factory.
+ */
+class ITK_EXPORT NetworkedQuadTreeImageIOFactory : public itk::ObjectFactoryBase
+{
+public:  
+  /** Standard class typedefs. */
+  typedef NetworkedQuadTreeImageIOFactory   Self;
+  typedef itk::ObjectFactoryBase  Superclass;
+  typedef itk::SmartPointer<Self>  Pointer;
+  typedef itk::SmartPointer<const Self>  ConstPointer;
+  
+  /** Class methods used to interface with the registered factories. */
+  virtual const char* GetITKSourceVersion(void) const;
+  virtual const char* GetDescription(void) const;
+  
+  /** Method for class instantiation. */
+  itkFactorylessNewMacro(Self);
+
+  /** Run-time type information (and related methods). */
+  itkTypeMacro(NetworkedQuadTreeImageIOFactory, itk::ObjectFactoryBase);
+
+  /** Register one factory of this type  */
+  static void RegisterOneFactory(void)
+  {
+    NetworkedQuadTreeImageIOFactory::Pointer NetworkedQuadTreeFactory = NetworkedQuadTreeImageIOFactory::New();
+    itk::ObjectFactoryBase::RegisterFactory(NetworkedQuadTreeFactory);
+  }
+
+protected:
+  NetworkedQuadTreeImageIOFactory();
+  ~NetworkedQuadTreeImageIOFactory();
+
+private:
+  NetworkedQuadTreeImageIOFactory(const Self&); //purposely not implemented
+  void operator=(const Self&); //purposely not implemented
+
+};
+  
+  
+} // end namespace otb
+
+#endif

Code/Projections/otbSensorModelBase.h

@@ -76,12 +76,14 @@ class ITK_EXPORT SensorModelBase : public itk::Transform<TScalarType,
       ImageKeywordlist GetImageGeometryKeywordlist(void) const;
       /* Get an ossimKeywordlist */
       ossimKeywordlist GetOssimKeywordlist(void);
+  /* Get an ossimModel */
+      ossimProjection* GetOssimModel(void);
       
       /* Set the Imagekeywordlist and affect the ossim projection ( m_Model) */
-      virtual void SetImageGeometry(ImageKeywordlist image_kwl);
+      virtual void SetImageGeometry(const ImageKeywordlist image_kwl);
       
       /* Set the Imagekeywordlist and affect the ossim projection ( m_Model) */
-      virtual void SetImageGeometry(ossimKeywordlist &geom_kwl);
+      virtual void SetImageGeometry(const ossimKeywordlist &geom_kwl);
       
      
 //      itkGetObjectMacro(DEMHandler, DEMHandlerType);

Code/Projections/otbSensorModelBase.txx

@@ -87,6 +87,19 @@ namespace otb
     
     return geom;
   }
+
+  /// Get the ossim model
+  template < class TScalarType,
+	     unsigned int NInputDimensions,
+	     unsigned int NOutputDimensions,
+	     unsigned int NParametersDimensions >
+  ossimProjection*
+  SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions,NParametersDimensions>
+  ::GetOssimModel(void)
+  {
+    
+    return m_Model;
+  }
   
   /* Set the Imagekeywordlist and affect the ossim projection ( m_Model) */
   template < class TScalarType,
@@ -95,7 +108,7 @@ namespace otb
 	     unsigned int NParametersDimensions >
   void
   SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions,NParametersDimensions>
-  ::SetImageGeometry(ImageKeywordlist image_kwl)
+  ::SetImageGeometry(const ImageKeywordlist image_kwl)
   {
     m_ImageKeywordlist = image_kwl;
     CreateProjection(m_ImageKeywordlist);
@@ -108,7 +121,7 @@ namespace otb
 	     unsigned int NParametersDimensions >
   void
   SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions,NParametersDimensions>
-  ::SetImageGeometry(ossimKeywordlist & geom_kwl)
+  ::SetImageGeometry(const ossimKeywordlist & geom_kwl)
   {
     m_ImageKeywordlist.Clear();
     m_ImageKeywordlist.SetKeywordlist(geom_kwl);