From 2ca6f942b3afa17e2620d126db8069df0a365215 Mon Sep 17 00:00:00 2001 From: Matt Leotta Date: Sun, 29 Aug 2010 21:27:23 -0400 Subject: [PATCH] Renamed dbvidl2 to vidl --- dbpro/filters/CMakeLists.txt | 10 +++--- ...esource.cxx => vidl_frame_to_resource.cxx} | 6 ++-- ...to_resource.h => vidl_frame_to_resource.h} | 35 ++++++++++--------- ...multi_source.cxx => vidl_multi_source.cxx} | 6 ++-- ...dl2_multi_source.h => vidl_multi_source.h} | 16 ++++----- ...o_frame.cxx => vidl_resource_to_frame.cxx} | 6 ++-- ...ce_to_frame.h => vidl_resource_to_frame.h} | 14 ++++---- .../{dbvidl2_sink.cxx => vidl_sink.cxx} | 6 ++-- dbpro/filters/{dbvidl2_sink.h => vidl_sink.h} | 14 ++++---- .../{dbvidl2_source.cxx => vidl_source.cxx} | 6 ++-- .../{dbvidl2_source.h => vidl_source.h} | 14 ++++---- modrec/modrec_vehicle_fit_video.cxx | 2 +- modrec/modrec_vehicle_tracker.cxx | 28 +++++++-------- 13 files changed, 82 insertions(+), 81 deletions(-) rename dbpro/filters/{dbvidl2_frame_to_resource.cxx => vidl_frame_to_resource.cxx} (93%) rename dbpro/filters/{dbvidl2_frame_to_resource.h => vidl_frame_to_resource.h} (66%) rename dbpro/filters/{dbvidl2_multi_source.cxx => vidl_multi_source.cxx} (87%) rename dbpro/filters/{dbvidl2_multi_source.h => vidl_multi_source.h} (76%) rename dbpro/filters/{dbvidl2_resource_to_frame.cxx => vidl_resource_to_frame.cxx} (84%) rename dbpro/filters/{dbvidl2_resource_to_frame.h => vidl_resource_to_frame.h} (68%) rename dbpro/filters/{dbvidl2_sink.cxx => vidl_sink.cxx} (86%) rename dbpro/filters/{dbvidl2_sink.h => vidl_sink.h} (76%) rename dbpro/filters/{dbvidl2_source.cxx => vidl_source.cxx} (84%) rename dbpro/filters/{dbvidl2_source.h => vidl_source.h} (76%) diff --git a/dbpro/filters/CMakeLists.txt b/dbpro/filters/CMakeLists.txt index 3dd55d2..916a8b2 100644 --- a/dbpro/filters/CMakeLists.txt +++ b/dbpro/filters/CMakeLists.txt @@ -22,11 +22,11 @@ set(dbpro_filters_sources dbbgm.h - dbvidl2_source.cxx dbvidl2_source.h - dbvidl2_multi_source.cxx dbvidl2_multi_source.h - dbvidl2_sink.cxx dbvidl2_sink.h - dbvidl2_frame_to_resource.cxx dbvidl2_frame_to_resource.h - dbvidl2_resource_to_frame.cxx dbvidl2_resource_to_frame.h + vidl_source.cxx vidl_source.h + vidl_multi_source.cxx vidl_multi_source.h + vidl_sink.cxx vidl_sink.h + vidl_frame_to_resource.cxx vidl_frame_to_resource.h + vidl_resource_to_frame.cxx vidl_resource_to_frame.h ) diff --git a/dbpro/filters/dbvidl2_frame_to_resource.cxx b/dbpro/filters/vidl_frame_to_resource.cxx similarity index 93% rename from dbpro/filters/dbvidl2_frame_to_resource.cxx rename to dbpro/filters/vidl_frame_to_resource.cxx index 4d08e00..1b89ff0 100644 --- a/dbpro/filters/dbvidl2_frame_to_resource.cxx +++ b/dbpro/filters/vidl_frame_to_resource.cxx @@ -1,4 +1,4 @@ -// This is dbpro/filters/dbvidl2_frame_to_resource.cxx +// This is dbpro/filters/vidl_frame_to_resource.cxx // Copyright Matthew Leotta 2006 - 2010. // Distributed under the Boost Software License, Version 1.0. @@ -8,14 +8,14 @@ //: // \file -#include "dbvidl2_frame_to_resource.h" +#include "vidl_frame_to_resource.h" #include #include //: Run the process on the current frame dbpro_signal -dbvidl2_frame_to_resource::execute() +vidl_frame_to_resource::execute() { assert(input_type_id(0) == typeid(vidl_frame_sptr)); vidl_frame_sptr frame = input(0); diff --git a/dbpro/filters/dbvidl2_frame_to_resource.h b/dbpro/filters/vidl_frame_to_resource.h similarity index 66% rename from dbpro/filters/dbvidl2_frame_to_resource.h rename to dbpro/filters/vidl_frame_to_resource.h index c87bd13..367ad6c 100644 --- a/dbpro/filters/dbvidl2_frame_to_resource.h +++ b/dbpro/filters/vidl_frame_to_resource.h @@ -1,6 +1,6 @@ -// This is dbpro/filters/dbvidl2_frame_to_resource.h -#ifndef dbvidl2_frame_to_resource_h_ -#define dbvidl2_frame_to_resource_h_ +// This is dbpro/filters/vidl_frame_to_resource.h +#ifndef vidl_frame_to_resource_h_ +#define vidl_frame_to_resource_h_ //: // \file @@ -25,7 +25,7 @@ //: Convert a vidl_frame into a vil_image_resource -class dbvidl2_frame_to_resource : public dbpro_filter +class vidl_frame_to_resource : public dbpro_filter { public: @@ -45,25 +45,26 @@ class dbvidl2_frame_to_resource : public dbpro_filter enum buffer_t { ALLOCATE_MEMORY, REUSE_MEMORY }; //: Default Constructor - dbvidl2_frame_to_resource() : image_rsc_(NULL), - output_format_(VIL_PIXEL_FORMAT_BYTE), - color_(VIDL_PIXEL_COLOR_UNKNOWN), - channel_mode_(INTERLEAVED), - buffer_mode_(ALLOCATE_MEMORY), - wrap_mode_(REQUIRE_WRAP) {} + vidl_frame_to_resource() + : image_rsc_(NULL), + output_format_(VIL_PIXEL_FORMAT_BYTE), + color_(VIDL_PIXEL_COLOR_UNKNOWN), + channel_mode_(INTERLEAVED), + buffer_mode_(ALLOCATE_MEMORY), + wrap_mode_(REQUIRE_WRAP) {} //: Constructor - dbvidl2_frame_to_resource( wrap_t wrap, - vil_pixel_format of=VIL_PIXEL_FORMAT_BYTE, - vidl_pixel_color color=VIDL_PIXEL_COLOR_UNKNOWN, - channel_t channel=PLANES, - buffer_t buffer=ALLOCATE_MEMORY) + vidl_frame_to_resource( wrap_t wrap, + vil_pixel_format of=VIL_PIXEL_FORMAT_BYTE, + vidl_pixel_color color=VIDL_PIXEL_COLOR_UNKNOWN, + channel_t channel=PLANES, + buffer_t buffer=ALLOCATE_MEMORY) : image_rsc_(NULL), output_format_(of), color_(color), channel_mode_(channel), buffer_mode_(buffer), wrap_mode_(wrap) {} //: Destructor - virtual ~dbvidl2_frame_to_resource(){} + virtual ~vidl_frame_to_resource(){} //: Execute this process dbpro_signal execute(); @@ -79,4 +80,4 @@ class dbvidl2_frame_to_resource : public dbpro_filter }; -#endif // dbvidl2_frame_to_resource_h_ +#endif // vidl_frame_to_resource_h_ diff --git a/dbpro/filters/dbvidl2_multi_source.cxx b/dbpro/filters/vidl_multi_source.cxx similarity index 87% rename from dbpro/filters/dbvidl2_multi_source.cxx rename to dbpro/filters/vidl_multi_source.cxx index 495fb96..11b3838 100644 --- a/dbpro/filters/dbvidl2_multi_source.cxx +++ b/dbpro/filters/vidl_multi_source.cxx @@ -1,4 +1,4 @@ -// This is dbpro/filters/dbvidl2_multi_source.cxx +// This is dbpro/filters/vidl_multi_source.cxx // Copyright Matthew Leotta 2006 - 2010. // Distributed under the Boost Software License, Version 1.0. @@ -8,13 +8,13 @@ //: // \file -#include "dbvidl2_multi_source.h" +#include "vidl_multi_source.h" #include //: Run the process on the current frame dbpro_signal -dbvidl2_multi_source::execute() +vidl_multi_source::execute() { bool all_passed = true; for(unsigned int i=0; i //: A source that provides frames from multiple video streams in sync -class dbvidl2_multi_source : public dbpro_source +class vidl_multi_source : public dbpro_source { public: //: Constructor - dbvidl2_multi_source() {} + vidl_multi_source() {} //: Constructor - dbvidl2_multi_source(const vcl_vector& streams) + vidl_multi_source(const vcl_vector& streams) : istreams_(streams) {} //: Destructor - virtual ~dbvidl2_multi_source(){} + virtual ~vidl_multi_source(){} //: add an istream void add_stream(const vidl_istream_sptr& is) { istreams_.push_back(is); } @@ -53,4 +53,4 @@ class dbvidl2_multi_source : public dbpro_source vcl_vector istreams_; }; -#endif // dbvidl2_multi_source_h_ +#endif // vidl_multi_source_h_ diff --git a/dbpro/filters/dbvidl2_resource_to_frame.cxx b/dbpro/filters/vidl_resource_to_frame.cxx similarity index 84% rename from dbpro/filters/dbvidl2_resource_to_frame.cxx rename to dbpro/filters/vidl_resource_to_frame.cxx index b56acf7..db3376e 100644 --- a/dbpro/filters/dbvidl2_resource_to_frame.cxx +++ b/dbpro/filters/vidl_resource_to_frame.cxx @@ -1,4 +1,4 @@ -// This is dbpro/filters/dbvidl2_resource_to_frame.cxx +// This is dbpro/filters/vidl_resource_to_frame.cxx // Copyright Matthew Leotta 2006 - 2010. // Distributed under the Boost Software License, Version 1.0. @@ -8,14 +8,14 @@ //: // \file -#include "dbvidl2_resource_to_frame.h" +#include "vidl_resource_to_frame.h" #include #include //: Run the process on the current frame dbpro_signal -dbvidl2_resource_to_frame::execute() +vidl_resource_to_frame::execute() { assert(input_type_id(0) == typeid(vil_image_resource_sptr)); vil_image_resource_sptr image = input(0); diff --git a/dbpro/filters/dbvidl2_resource_to_frame.h b/dbpro/filters/vidl_resource_to_frame.h similarity index 68% rename from dbpro/filters/dbvidl2_resource_to_frame.h rename to dbpro/filters/vidl_resource_to_frame.h index b20fa21..f1519a0 100644 --- a/dbpro/filters/dbvidl2_resource_to_frame.h +++ b/dbpro/filters/vidl_resource_to_frame.h @@ -1,6 +1,6 @@ -// This is dbpro/filters/dbvidl2_resource_to_frame.h -#ifndef dbvidl2_resource_to_frame_h_ -#define dbvidl2_resource_to_frame_h_ +// This is dbpro/filters/vidl_resource_to_frame.h +#ifndef vidl_resource_to_frame_h_ +#define vidl_resource_to_frame_h_ //: // \file @@ -23,15 +23,15 @@ //: Convert a vil_image_resource into a vidl_frame -class dbvidl2_resource_to_frame : public dbpro_filter +class vidl_resource_to_frame : public dbpro_filter { public: //: Constructor - dbvidl2_resource_to_frame(){} + vidl_resource_to_frame(){} //: Destructor - virtual ~dbvidl2_resource_to_frame(){} + virtual ~vidl_resource_to_frame(){} //: Execute this process dbpro_signal execute(); @@ -40,4 +40,4 @@ class dbvidl2_resource_to_frame : public dbpro_filter }; -#endif // dbvidl2_resource_to_frame_h_ +#endif // vidl_resource_to_frame_h_ diff --git a/dbpro/filters/dbvidl2_sink.cxx b/dbpro/filters/vidl_sink.cxx similarity index 86% rename from dbpro/filters/dbvidl2_sink.cxx rename to dbpro/filters/vidl_sink.cxx index 64764b4..35455a3 100644 --- a/dbpro/filters/dbvidl2_sink.cxx +++ b/dbpro/filters/vidl_sink.cxx @@ -1,4 +1,4 @@ -// This is dbpro/filters/dbvidl2_sink.cxx +// This is dbpro/filters/vidl_sink.cxx // Copyright Matthew Leotta 2006 - 2010. // Distributed under the Boost Software License, Version 1.0. @@ -8,14 +8,14 @@ //: // \file -#include "dbvidl2_sink.h" +#include "vidl_sink.h" #include //: Run the process on the current frame dbpro_signal -dbvidl2_sink::execute() +vidl_sink::execute() { if(!ostream_) return DBPRO_VALID; diff --git a/dbpro/filters/dbvidl2_sink.h b/dbpro/filters/vidl_sink.h similarity index 76% rename from dbpro/filters/dbvidl2_sink.h rename to dbpro/filters/vidl_sink.h index 733cd48..f543f31 100644 --- a/dbpro/filters/dbvidl2_sink.h +++ b/dbpro/filters/vidl_sink.h @@ -1,6 +1,6 @@ -// This is dbpro/filters/dbvidl2_sink.h -#ifndef dbvidl2_sink_h_ -#define dbvidl2_sink_h_ +// This is dbpro/filters/vidl_sink.h +#ifndef vidl_sink_h_ +#define vidl_sink_h_ //: // \file @@ -23,15 +23,15 @@ #include //: Convert a vidl_ostream into a dbpro_sink -class dbvidl2_sink : public dbpro_sink +class vidl_sink : public dbpro_sink { public: //: Constructor - dbvidl2_sink(const vidl_ostream_sptr& o) : ostream_(o) {} + vidl_sink(const vidl_ostream_sptr& o) : ostream_(o) {} //: Destructor - virtual ~dbvidl2_sink(){} + virtual ~vidl_sink(){} //: Set the ostream void set_stream(const vidl_ostream_sptr& o) { ostream_ = o; } @@ -46,4 +46,4 @@ class dbvidl2_sink : public dbpro_sink vidl_ostream_sptr ostream_; }; -#endif // dbvidl2_sink_h_ +#endif // vidl_sink_h_ diff --git a/dbpro/filters/dbvidl2_source.cxx b/dbpro/filters/vidl_source.cxx similarity index 84% rename from dbpro/filters/dbvidl2_source.cxx rename to dbpro/filters/vidl_source.cxx index f9f9533..f99bf99 100644 --- a/dbpro/filters/dbvidl2_source.cxx +++ b/dbpro/filters/vidl_source.cxx @@ -1,4 +1,4 @@ -// This is dbpro/filters/dbvidl2_source.cxx +// This is dbpro/filters/vidl_source.cxx // Copyright Matthew Leotta 2006 - 2010. // Distributed under the Boost Software License, Version 1.0. @@ -8,13 +8,13 @@ //: // \file -#include "dbvidl2_source.h" +#include "vidl_source.h" #include //: Run the process on the current frame dbpro_signal -dbvidl2_source::execute() +vidl_source::execute() { if(!istream_->advance()){ return DBPRO_EOS; diff --git a/dbpro/filters/dbvidl2_source.h b/dbpro/filters/vidl_source.h similarity index 76% rename from dbpro/filters/dbvidl2_source.h rename to dbpro/filters/vidl_source.h index 52afd69..a75c8fb 100644 --- a/dbpro/filters/dbvidl2_source.h +++ b/dbpro/filters/vidl_source.h @@ -1,6 +1,6 @@ -// This is dbpro/filters/dbvidl2_source.h -#ifndef dbvidl2_source_h_ -#define dbvidl2_source_h_ +// This is dbpro/filters/vidl_source.h +#ifndef vidl_source_h_ +#define vidl_source_h_ //: // \file @@ -23,15 +23,15 @@ #include //: Convert a vidl_istream into a dbpro_source -class dbvidl2_source : public dbpro_source +class vidl_source : public dbpro_source { public: //: Constructor - dbvidl2_source(const vidl_istream_sptr& i) : istream_(i) {} + vidl_source(const vidl_istream_sptr& i) : istream_(i) {} //: Destructor - virtual ~dbvidl2_source(){} + virtual ~vidl_source(){} //: Set the istream void set_stream(const vidl_istream_sptr& i) { istream_ = i; } @@ -46,4 +46,4 @@ class dbvidl2_source : public dbpro_source vidl_istream_sptr istream_; }; -#endif // dbvidl2_source_h_ +#endif // vidl_source_h_ diff --git a/modrec/modrec_vehicle_fit_video.cxx b/modrec/modrec_vehicle_fit_video.cxx index 0dabc70..798255a 100644 --- a/modrec/modrec_vehicle_fit_video.cxx +++ b/modrec/modrec_vehicle_fit_video.cxx @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/modrec/modrec_vehicle_tracker.cxx b/modrec/modrec_vehicle_tracker.cxx index 2e8e268..7a44414 100644 --- a/modrec/modrec_vehicle_tracker.cxx +++ b/modrec/modrec_vehicle_tracker.cxx @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -834,17 +834,17 @@ modrec_vehicle_tracker::modrec_vehicle_tracker(modrec_vehicle_fit_video* optimiz se.set_to_disk(2.0); //graph_.enable_debug(); - graph_["source"] = new dbvidl2_source(NULL); - graph_["to_resource"] = new dbvidl2_frame_to_resource(dbvidl2_frame_to_resource::ALLOW_WRAP, - VIL_PIXEL_FORMAT_BYTE,VIDL_PIXEL_COLOR_RGB, - dbvidl2_frame_to_resource::PLANES, - dbvidl2_frame_to_resource::REUSE_MEMORY); - - graph_["to_rsc_mono"] = new dbvidl2_frame_to_resource(dbvidl2_frame_to_resource::ALLOW_WRAP, - VIL_PIXEL_FORMAT_BYTE,VIDL_PIXEL_COLOR_MONO, - dbvidl2_frame_to_resource::PLANES, - dbvidl2_frame_to_resource::ALLOCATE_MEMORY); - //dbvidl2_frame_to_resource::REUSE_MEMORY); + graph_["source"] = new vidl_source(NULL); + graph_["to_resource"] = new vidl_frame_to_resource(vidl_frame_to_resource::ALLOW_WRAP, + VIL_PIXEL_FORMAT_BYTE,VIDL_PIXEL_COLOR_RGB, + vidl_frame_to_resource::PLANES, + vidl_frame_to_resource::REUSE_MEMORY); + + graph_["to_rsc_mono"] = new vidl_frame_to_resource(vidl_frame_to_resource::ALLOW_WRAP, + VIL_PIXEL_FORMAT_BYTE,VIDL_PIXEL_COLOR_MONO, + vidl_frame_to_resource::PLANES, + vidl_frame_to_resource::ALLOCATE_MEMORY); + //vidl_frame_to_resource::REUSE_MEMORY); graph_["gauss_img"] = new dbil_gauss_filter(); graph_["grad_ij"] = new dbil_sobel_1x3_filter(); graph_["edge_map"] = new dbil_subpix_edge_filter(); @@ -1059,7 +1059,7 @@ void modrec_vehicle_tracker::set_vehicle_model(const modrec_pca_vehicle& vehicle //: set the video input stream void modrec_vehicle_tracker::set_istream(const vidl_istream_sptr& istream) { - dbvidl2_source* source = dynamic_cast(graph_["source"].ptr()); + vidl_source* source = dynamic_cast(graph_["source"].ptr()); if(source){ source->set_stream(istream); }