From 7569e93f2ba1b191281d989421cf0ec75421b322 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@c-s.fr>
Date: Fri, 16 Mar 2007 09:26:38 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20classe=20de=20base=20SpatialO?=
=?UTF-8?q?bjectSource=20en=20vue=20de=20l'int=C3=A9gration=20du=20DXF=20r?=
=?UTF-8?q?eader.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Code/Common/otbSpatialObjectSource.h | 79 +++++++++++++++++++
Code/Common/otbSpatialObjectSource.txx | 61 ++++++++++++++
Testing/Code/Common/CMakeLists.txt | 6 +-
Testing/Code/Common/otbCommonTests.cxx | 1 +
.../Code/Common/otbSpatialObjectSourceNew.cxx | 46 +++++++++++
Utilities/CMakeLists.txt | 2 +-
6 files changed, 193 insertions(+), 2 deletions(-)
create mode 100644 Code/Common/otbSpatialObjectSource.h
create mode 100644 Code/Common/otbSpatialObjectSource.txx
create mode 100644 Testing/Code/Common/otbSpatialObjectSourceNew.cxx
diff --git a/Code/Common/otbSpatialObjectSource.h b/Code/Common/otbSpatialObjectSource.h
new file mode 100644
index 0000000000..4d5a38238c
--- /dev/null
+++ b/Code/Common/otbSpatialObjectSource.h
@@ -0,0 +1,79 @@
+/*=========================================================================
+
+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 _otbSpatialObjectSource_h
+#define _otbSpatialObjectSource_h
+
+#include "itkProcessObject.h"
+
+namespace otb
+{
+ /**
+ * \class SpatialObjectSource
+ * \brief Base class for filters producing a SpatialObject as output.
+ * \ingroup DataSources
+ */
+template <class TSpatialObject>
+class ITK_EXPORT SpatialObjectSource
+ : public itk::ProcessObject
+{
+ public:
+ /** Standard typedefs */
+ typedef SpatialObjectSource Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ /** Creation througth the object factory */
+ itkNewMacro(Self);
+
+ /** Runtime information */
+ itkTypeMacro(SpatialObjectSource,ProcessObject);
+
+ /** Template parameters typedefs */
+ typedef TSpatialObject SpatialObjectType;
+ typedef typename SpatialObjectType::Pointer SpatialObjectPointerType;
+
+ /** Data object pointer */
+ typedef itk::DataObject::Pointer DataObjectPointer;
+
+ /**
+ * Get the output spatial object.
+ * \return The outptu spatial object.
+ */
+ virtual SpatialObjectType * GetOutput(void);
+
+ protected:
+ /** Constructor */
+ SpatialObjectSource();
+ /** Destructor */
+ ~SpatialObjectSource() {}
+ /** PrintSelf method */
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
+
+private:
+ SpatialObjectSource(const Self&);//purposely not implemented
+ void operator=(const Self&); //purposely not implemented
+
+};
+} // end namespace otb
+
+#ifndef OTB_MANUAL_INSTANTIATION
+#include "otbSpatialObjectSource.txx"
+#endif
+
+#endif
diff --git a/Code/Common/otbSpatialObjectSource.txx b/Code/Common/otbSpatialObjectSource.txx
new file mode 100644
index 0000000000..2676c9bb89
--- /dev/null
+++ b/Code/Common/otbSpatialObjectSource.txx
@@ -0,0 +1,61 @@
+/*=========================================================================
+
+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 _otbSpatialObjectSource_txx
+#define _otbSpatialObjectSource_txx
+
+#include "otbSpatialObjectSource.h"
+
+namespace otb
+{
+/**
+ * Constructor.
+ */
+template <class TSpatialObject>
+SpatialObjectSource<TSpatialObject>
+::SpatialObjectSource()
+{
+ this->Superclass::SetNumberOfRequiredOutputs(1);
+ this->Superclass::SetNthOutput(0,SpatialObjectType::New().GetPointer());
+}
+/**
+ * Get the output image list
+ * \return The image list produced.
+ */
+template <class TSpatialObject>
+typename SpatialObjectSource<TSpatialObject>::SpatialObjectType *
+SpatialObjectSource<TSpatialObject>
+::GetOutput(void)
+{
+ if(this->GetNumberOfOutputs()<1)
+ {
+ return 0;
+ }
+ return static_cast<SpatialObjectType *> (this->ProcessObject::GetOutput(0));
+}
+/**
+ * PrintSelf Method
+ */
+template<class TSpatialObject>
+void
+SpatialObjectSource<TSpatialObject>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
+{
+ Superclass::PrintSelf(os,indent);
+}
+}// end namespace otb
+#endif
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index 4001973ab9..c887722a6b 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -307,7 +307,10 @@ ADD_TEST(coTvImageToVectorImageCastFilter ${COMMON_TESTS}
ADD_TEST(coTuImageToPathFilterNew ${COMMON_TESTS}
otbImageToPathFilterNew)
-
+# ------- otb::SpatialObjectSource -------------------------------------------
+ADD_TEST(coTuSpatialObjectSourceNew ${COMMON_TESTS}
+ otbSpatialObjectSourceNew)
+
# ------- Fichiers sources CXX -----------------------------------
SET(BasicCommon_SRCS
otbSystemTest.cxx
@@ -346,6 +349,7 @@ otbConcatenateVectorImageFilter.cxx
otbImageToVectorImageCastFilterNew.cxx
otbImageToVectorImageCastFilter.cxx
otbImageToPathFilterNew.cxx
+otbSpatialObjectSourceNew.cxx
)
diff --git a/Testing/Code/Common/otbCommonTests.cxx b/Testing/Code/Common/otbCommonTests.cxx
index 6a5050cff1..b4008850a1 100644
--- a/Testing/Code/Common/otbCommonTests.cxx
+++ b/Testing/Code/Common/otbCommonTests.cxx
@@ -62,4 +62,5 @@ REGISTER_TEST(otbConcatenateVectorImageFilter);
REGISTER_TEST(otbImageToVectorImageCastFilterNew);
REGISTER_TEST(otbImageToVectorImageCastFilter);
REGISTER_TEST(otbImageToPathFilterNew);
+REGISTER_TEST(otbSpatialObjectSourceNew);
}
diff --git a/Testing/Code/Common/otbSpatialObjectSourceNew.cxx b/Testing/Code/Common/otbSpatialObjectSourceNew.cxx
new file mode 100644
index 0000000000..6f8d30806d
--- /dev/null
+++ b/Testing/Code/Common/otbSpatialObjectSourceNew.cxx
@@ -0,0 +1,46 @@
+/*=========================================================================
+
+ 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 "itkExceptionObject.h"
+
+#include "otbSpatialObjectSource.h"
+#include "itkGroupSpatialObject.h"
+
+int otbSpatialObjectSourceNew(int argc, char* argv[])
+{
+try
+ {
+ const unsigned int Dimension = 2;
+ typedef itk::GroupSpatialObject<Dimension> SpatialObjectType;
+ typedef otb::SpatialObjectSource<SpatialObjectType> SpatialObjectSourceType;
+
+ // Instantiation
+ SpatialObjectSourceType::Pointer source = SpatialObjectSourceType::New();
+ }
+catch( itk::ExceptionObject & err )
+ {
+ std::cout << "Exception itk::ExceptionObject thrown !" << std::endl;
+ std::cout << err << std::endl;
+ return EXIT_FAILURE;
+ }
+catch( ... )
+ {
+ std::cout << "Unknown exception thrown !" << std::endl;
+ return EXIT_FAILURE;
+ }
+ return EXIT_SUCCESS;
+}
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index cf81272776..7633047034 100755
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -4,7 +4,7 @@ IF(NOT OTB_USE_EXTERNAL_ITK)
SUBDIRS( ITK )
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
-SUBDIRS( BGL otbsvm)
+SUBDIRS(BGL otbsvm dxflib)
OPTION(OTB_OSSIM_COMPILATION "EXPERIMENTAL: Compile OSSIM library embedded within OTB" OFF)
MARK_AS_ADVANCED(OTB_OSSIM_COMPILATION)
--
GitLab