From d1b3dd4e0e06283a6e08de531aa414c75bcb377d Mon Sep 17 00:00:00 2001 From: josch Date: Wed, 19 Sep 2012 14:13:57 +0200 Subject: [PATCH] updated svn to 709 --- ...057a6d9159d25c5e8e26f83bbd0193ce8.svn-base | 38 ++++++++ .svn/wc.db | Bin 611328 -> 611328 bytes CONTRIBUTORS | 1 + include/scanserver/scan_io/scan_io.h | 90 ------------------ include/scanserver/scan_io/scan_io_ks.h | 27 ------ include/scanserver/scan_io/scan_io_ks_rgb.h | 27 ------ .../scanserver/scan_io/scan_io_riegl_rgb.h | 27 ------ .../scanserver/scan_io/scan_io_riegl_txt.h | 27 ------ include/scanserver/scan_io/scan_io_rts.h | 30 ------ include/scanserver/scan_io/scan_io_rxp.h | 83 ---------------- include/scanserver/scan_io/scan_io_uos.h | 27 ------ include/scanserver/scan_io/scan_io_uos_rgb.h | 27 ------ 12 files changed, 39 insertions(+), 365 deletions(-) create mode 100644 .svn/pristine/02/026e80e057a6d9159d25c5e8e26f83bbd0193ce8.svn-base delete mode 100644 include/scanserver/scan_io/scan_io.h delete mode 100644 include/scanserver/scan_io/scan_io_ks.h delete mode 100644 include/scanserver/scan_io/scan_io_ks_rgb.h delete mode 100644 include/scanserver/scan_io/scan_io_riegl_rgb.h delete mode 100644 include/scanserver/scan_io/scan_io_riegl_txt.h delete mode 100644 include/scanserver/scan_io/scan_io_rts.h delete mode 100644 include/scanserver/scan_io/scan_io_rxp.h delete mode 100644 include/scanserver/scan_io/scan_io_uos.h delete mode 100644 include/scanserver/scan_io/scan_io_uos_rgb.h diff --git a/.svn/pristine/02/026e80e057a6d9159d25c5e8e26f83bbd0193ce8.svn-base b/.svn/pristine/02/026e80e057a6d9159d25c5e8e26f83bbd0193ce8.svn-base new file mode 100644 index 0000000..0292987 --- /dev/null +++ b/.svn/pristine/02/026e80e057a6d9159d25c5e8e26f83bbd0193ce8.svn-base @@ -0,0 +1,38 @@ +Project admins + +Andreas Nuechter andreas@nuechti.de +Kai Lingemann kai.lingemann@gmx.de +Dorit Borrmann d.borrmann@jacobs-university.de + +List of contributors + +Andreas Nuechter andreas@nuechti.de +Kai Lingemann kai.lingemann@gmx.de +Dorit Borrmann d.borrmann@jacobs-university.de +Jan Elseberg j.elseberg@jacobs-university.de +Jochen Sprickerhof jochen@sprickerhof.de +HamidReza Houshiar h.houshiar@jacobs-university.de +Sven Albrecht sven.albrecht@uni-osnabrueck.de +Stan Serebryakov cfr.ssv@gmail.com +Thomas Escher tescher@uni-osnabrueck.de +Thomas Wiemann twiemann@uni-osnabrueck.de +Alexandru Tandrau alexandru@tandrau.com +Alexandru Eugen Ichim eugen@alexichim.com +Flavia Grosan me@flaviagrosan.com +Deyuan Qiu deyuan.qiu@googlemail.com +Darko Makreshanski d.makreshanski@jacobs-university.de +Mohammad Faisal Abdullah m.faisal@jacobs-university.de +Li Ming liming751218@whu.edu.cn +Li Wei xpaulee@gmail.com +Shams Feyzabadi sh.feyzabadi@gmail.co +Vladislav Perelmann v.perelman@jacobs-university.de +Chen Long lchen.whu@gmail.com +Remuas Dumitru r.dumitru@jaocbs-university.de +Billy Okal okal.billy@googlemail.com + +Further contributors + +Uwe Hebbelmann, Sebastian Stock, Andre Schemschat +Hartmut Surmann +Amuz Tamrakars, Ulugbek Makhmudov +Christof Soeger, Marcel Junker, Anton Fluegge, Hannes Schulz \ No newline at end of file diff --git a/.svn/wc.db b/.svn/wc.db index 05742f4135c6bb705e3665f2f642b55472640988..308d0b6572385eff6c5bf7b0195889bbadb069bd 100644 GIT binary patch delta 14701 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 bEB-ly%G)#4Khp6K1lLB_Sha-@0*%ER!;+ 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 J>^{zf{{!35g1`U( diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 81f53b4..0292987 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -28,6 +28,7 @@ Shams Feyzabadi sh.feyzabadi@gmail.co Vladislav Perelmann v.perelman@jacobs-university.de Chen Long lchen.whu@gmail.com Remuas Dumitru r.dumitru@jaocbs-university.de +Billy Okal okal.billy@googlemail.com Further contributors diff --git a/include/scanserver/scan_io/scan_io.h b/include/scanserver/scan_io/scan_io.h deleted file mode 100644 index 39502ea..0000000 --- a/include/scanserver/scan_io/scan_io.h +++ /dev/null @@ -1,90 +0,0 @@ -/** - * @file - * @brief IO of a 3D scan - * @author Kai Lingemann. Institute of Computer Science, University of Osnabrueck, Germany. - * @author Andreas Nuechter. Institute of Computer Science, University of Osnabrueck, Germany. - * @author Thomas Escher - */ - -#ifndef __SCAN_IO_H__ -#define __SCAN_IO_H__ - -#include -#include -#include -#include - -#include "scanserver/io_types.h" -#include "scanserver/pointfilter.h" - - - -/** - * @brief IO of a 3D scan - * - * This class needs to be instantiated by a class loading - * 3D scans from different file formats. - */ -class ScanIO { -public: - /** - * Read a directory and return all possible scans in the [start,end] interval. - * - * @param dir_path The directory from which to read the scans - * @param start Starting index - * @param end Last index - * @return List of IO-specific identifiers of scans, matching the search - */ - virtual std::list readDirectory(const char* dir_path, unsigned int start, unsigned int end) = 0; - - /** - * Reads the pose from a dedicated pose file or from the scan file. - * - * @param dir_path The directory the scan is contained in - * @param scan_identifier IO-specific identifier for the particular scan - * @param pose Pointer to an existing double[6] array where the pose is saved in - */ - virtual void readPose(const char* dir_path, const char* identifier, double* pose) = 0; - - /** - * Given a scan identifier, load the contents of this particular scan. - * - * @param dir_path The directory the scan is contained in - * @param identifier IO-specific identifier for the particular scan - * @param filter Filter object which each point is tested on by its position - */ - virtual void readScan(const char* dir_path, const char* identifier, PointFilter&& filter, std::vector* xyz = 0, std::vector* rgb = 0, std::vector* reflectance = 0, std::vector* amplitude = 0, std::vector* type = 0, std::vector* deviation = 0) = 0; - - /** - * Returns whether this ScanIO can load the requested data from a scan. - * - * @param type data channel request - * @return whether it's supported or not - */ - virtual bool supports(IODataType type) = 0; - - /** - * @brief Global mapping of io_types to single instances of ScanIOs. - * - * If the ScanIO doesn't exist, it will be created and saved in a map. - * Otherwise, the matching ScanIO will be returned. - * - * @param type Key identifying the ScanIO - * @return The newly created or found ScanIO - */ - static ScanIO* getScanIO(IOType iotype); - - //! Delete all ScanIO instances and (lazy) try to unload the libraries. - static void clearScanIOs(); -private: - static std::map m_scanIOs; -}; - -// Since the shared object files are loaded on the fly, we -// need class factories - -// the types of the class factories -typedef ScanIO* create_sio(); -typedef void destroy_sio(ScanIO*); - -#endif diff --git a/include/scanserver/scan_io/scan_io_ks.h b/include/scanserver/scan_io/scan_io_ks.h deleted file mode 100644 index 878000c..0000000 --- a/include/scanserver/scan_io/scan_io_ks.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file - * @brief IO of a 3D scan in uos file format - * @author Thomas Escher - */ - -#ifndef __SCAN_IO_KS_H__ -#define __SCAN_IO_KS_H__ - -#include "scan_io.h" - - - -/** - * @brief 3D scan loader for KS scans - * - * The compiled class is available as shared object file - */ -class ScanIO_ks : public ScanIO { -public: - virtual std::list readDirectory(const char* dir_path, unsigned int start, unsigned int end); - virtual void readPose(const char* dir_path, const char* identifier, double* pose); - virtual void readScan(const char* dir_path, const char* identifier, PointFilter&& filter, std::vector* xyz, std::vector* rgb, std::vector* reflectance, std::vector* amplitude, std::vector* type, std::vector* deviation); - virtual bool supports(IODataType type); -}; - -#endif diff --git a/include/scanserver/scan_io/scan_io_ks_rgb.h b/include/scanserver/scan_io/scan_io_ks_rgb.h deleted file mode 100644 index 1a5fb6a..0000000 --- a/include/scanserver/scan_io/scan_io_ks_rgb.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file - * @brief IO of a 3D scan in uos file format - * @author Thomas Escher - */ - -#ifndef __SCAN_IO_KS_RGB_H__ -#define __SCAN_IO_KS_RGB_H__ - -#include "scan_io.h" - - - -/** - * @brief 3D scan loader for KS RGB scans - * - * The compiled class is available as shared object file - */ -class ScanIO_ks_rgb : public ScanIO { -public: - virtual std::list readDirectory(const char* dir_path, unsigned int start, unsigned int end); - virtual void readPose(const char* dir_path, const char* identifier, double* pose); - virtual void readScan(const char* dir_path, const char* identifier, PointFilter&& filter, std::vector* xyz, std::vector* rgb, std::vector* reflectance, std::vector* amplitude, std::vector* type, std::vector* deviation); - virtual bool supports(IODataType type); -}; - -#endif diff --git a/include/scanserver/scan_io/scan_io_riegl_rgb.h b/include/scanserver/scan_io/scan_io_riegl_rgb.h deleted file mode 100644 index 98b5a4b..0000000 --- a/include/scanserver/scan_io/scan_io_riegl_rgb.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file - * @brief IO of a 3D scan in uos file format - * @author Thomas Escher - */ - -#ifndef __SCAN_IO_RIEGL_RGB_H__ -#define __SCAN_IO_RIEGL_RGB_H__ - -#include "scan_io.h" - - - -/** - * @brief 3D scan loader for Riegl scans - * - * The compiled class is available as shared object file - */ -class ScanIO_riegl_rgb : public ScanIO { -public: - virtual std::list readDirectory(const char* dir_path, unsigned int start, unsigned int end); - virtual void readPose(const char* dir_path, const char* identifier, double* pose); - virtual void readScan(const char* dir_path, const char* identifier, PointFilter&& filter, std::vector* xyz, std::vector* rgb, std::vector* reflectance, std::vector* amplitude, std::vector* type, std::vector* deviation); - virtual bool supports(IODataType type); -}; - -#endif diff --git a/include/scanserver/scan_io/scan_io_riegl_txt.h b/include/scanserver/scan_io/scan_io_riegl_txt.h deleted file mode 100644 index f4567de..0000000 --- a/include/scanserver/scan_io/scan_io_riegl_txt.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file - * @brief IO of a 3D scan in uos file format - * @author Thomas Escher - */ - -#ifndef __SCAN_IO_RIEGL_H__ -#define __SCAN_IO_RIEGL_H__ - -#include "scan_io.h" - - - -/** - * @brief 3D scan loader for Riegl scans - * - * The compiled class is available as shared object file - */ -class ScanIO_riegl_txt : public ScanIO { -public: - virtual std::list readDirectory(const char* dir_path, unsigned int start, unsigned int end); - virtual void readPose(const char* dir_path, const char* identifier, double* pose); - virtual void readScan(const char* dir_path, const char* identifier, PointFilter&& filter, std::vector* xyz, std::vector* rgb, std::vector* reflectance, std::vector* amplitude, std::vector* type, std::vector* deviation); - virtual bool supports(IODataType type); -}; - -#endif diff --git a/include/scanserver/scan_io/scan_io_rts.h b/include/scanserver/scan_io/scan_io_rts.h deleted file mode 100644 index d43c458..0000000 --- a/include/scanserver/scan_io/scan_io_rts.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file - * @brief IO of a 3D scan in rts file format - * @author Thomas Escher - */ - -#ifndef __SCAN_IO_UOS_H__ -#define __SCAN_IO_UOS_H__ - -#include "scan_io.h" - - - -/** - * @brief 3D scan loader for RTS scans - * - * The compiled class is available as shared object file - */ -class ScanIO_rts : public ScanIO { -public: - virtual std::list readDirectory(const char* dir_path, unsigned int start, unsigned int end); - virtual void readPose(const char* dir_path, const char* identifier, double* pose); - virtual void readScan(const char* dir_path, const char* identifier, PointFilter&& filter, std::vector* xyz, std::vector* rgb, std::vector* reflectance, std::vector* amplitude, std::vector* type, std::vector* deviation); - virtual bool supports(IODataType type); -private: - std::string cached_dir; - std::vector cached_poses; -}; - -#endif diff --git a/include/scanserver/scan_io/scan_io_rxp.h b/include/scanserver/scan_io/scan_io_rxp.h deleted file mode 100644 index 52b158f..0000000 --- a/include/scanserver/scan_io/scan_io_rxp.h +++ /dev/null @@ -1,83 +0,0 @@ -/** - * @file - * @brief IO of a 3D scan in rxp file format - * @author Thomas Escher - */ - -#ifndef __SCAN_IO_RXP_H__ -#define __SCAN_IO_RXP_H__ - -#include "scan_io.h" -#include "slam6d/point.h" - -#include "riegl/scanlib.hpp" -using namespace scanlib; -using namespace std; -using namespace std::tr1; - -class importer; - - - -/** - * @brief 3D scan loader for RXP scans - * - * The compiled class is available as shared object file - */ -class ScanIO_rxp : public ScanIO { -public: - virtual std::list readDirectory(const char* dir_path, unsigned int start, unsigned int end); - virtual void readPose(const char* dir_path, const char* identifier, double* pose); - virtual void readScan(const char* dir_path, const char* identifier, PointFilter&& filter, std::vector* xyz, std::vector* rgb, std::vector* reflectance, std::vector* amplitude, std::vector* type, std::vector* deviation); - virtual bool supports(IODataType type); - - ScanIO_rxp() : dec(0), imp(0) {} -private: - std::tr1::shared_ptr rc; - decoder_rxpmarker *dec; - importer *imp; - std::string old_path; -}; - -/** - * The importer class is the interface to riegl's pointcloud class, and will convert their point struct to slam6d's point class. - * - * Code adapted from rivlib/example/pointcloudcpp.cpp available from http://www.riegl.com . - */ -class importer : public scanlib::pointcloud -{ -public: - importer(PointFilter& filter, int start, std::vector* xyz, std::vector* reflectance, std::vector* amplitude, std::vector* type, std::vector* deviation) : - pointcloud(false), // set this to true if you need gps aligned timing - filter(&filter), xyz(xyz), reflectance(reflectance), amplitude(amplitude), type(type), deviation(deviation), - start(start), currentscan(0) - {} - inline int getCurrentScan() { return currentscan; } - inline void set(PointFilter& filter, std::vector* xyz, std::vector* reflectance, std::vector* amplitude, std::vector* type, std::vector* deviation) - { - this->filter = &filter; - this->xyz = xyz; - this->reflectance = reflectance; - this->amplitude = amplitude; - this->type = type; - this->deviation = deviation; - } -protected: - PointFilter* filter; - std::vector *xyz; - std::vector *reflectance; - std::vector *amplitude; - std::vector *type; - std::vector *deviation; - int start; - int currentscan; - // overridden from pointcloud class - void on_echo_transformed(echo_type echo); - - void on_frame_stop(const scanlib::frame_stop& arg) { - scanlib::basic_packets::on_frame_stop(arg); - currentscan++; - } -}; - -#endif diff --git a/include/scanserver/scan_io/scan_io_uos.h b/include/scanserver/scan_io/scan_io_uos.h deleted file mode 100644 index 4119b36..0000000 --- a/include/scanserver/scan_io/scan_io_uos.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file - * @brief IO of a 3D scan in uos file format - * @author Thomas Escher - */ - -#ifndef __SCAN_IO_UOS_H__ -#define __SCAN_IO_UOS_H__ - -#include "scan_io.h" - - - -/** - * @brief 3D scan loader for UOS scans - * - * The compiled class is available as shared object file - */ -class ScanIO_uos : public ScanIO { -public: - virtual std::list readDirectory(const char* dir_path, unsigned int start, unsigned int end); - virtual void readPose(const char* dir_path, const char* identifier, double* pose); - virtual void readScan(const char* dir_path, const char* identifier, PointFilter&& filter, std::vector* xyz, std::vector* rgb, std::vector* reflectance, std::vector* amplitude, std::vector* type, std::vector* deviation); - virtual bool supports(IODataType type); -}; - -#endif diff --git a/include/scanserver/scan_io/scan_io_uos_rgb.h b/include/scanserver/scan_io/scan_io_uos_rgb.h deleted file mode 100644 index 2a6144b..0000000 --- a/include/scanserver/scan_io/scan_io_uos_rgb.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file - * @brief IO of a 3D scan in uos file format - * @author Thomas Escher - */ - -#ifndef __SCAN_IO_UOS_RGB_H__ -#define __SCAN_IO_UOS_RGB_H__ - -#include "scan_io.h" - - - -/** - * @brief 3D scan loader for UOS scans with color information - * - * The compiled class is available as shared object file - */ -class ScanIO_uos_rgb : public ScanIO { -public: - virtual std::list readDirectory(const char* dir_path, unsigned int start, unsigned int end); - virtual void readPose(const char* dir_path, const char* identifier, double* pose); - virtual void readScan(const char* dir_path, const char* identifier, PointFilter&& filter, std::vector* xyz, std::vector* rgb, std::vector* reflectance, std::vector* amplitude, std::vector* type, std::vector* deviation); - virtual bool supports(IODataType type); -}; - -#endif