From ff517293a856c4ac49738b9b4837dd04c441b2d5 Mon Sep 17 00:00:00 2001 From: spillerrec Date: Tue, 29 Sep 2015 20:30:58 +0200 Subject: [PATCH] CLEANUP: Put everything into a Overmix namespace --- src/ARenderPipe.hpp | 4 ++++ src/Deteleciner.cpp | 2 ++ src/Deteleciner.hpp | 4 ++++ src/Geometry.hpp | 4 ++++ src/MultiPlaneIterator.cpp | 2 ++ src/MultiPlaneIterator.hpp | 4 ++++ src/RenderOperations.hpp | 4 ++++ src/aligners/AImageAligner.cpp | 2 ++ src/aligners/AImageAligner.hpp | 4 ++++ src/aligners/AnimationSaver.cpp | 1 + src/aligners/AnimationSaver.hpp | 4 ++++ src/aligners/AnimationSeparator.cpp | 1 + src/aligners/AnimationSeparator.hpp | 4 ++++ src/aligners/AverageAligner.cpp | 2 ++ src/aligners/AverageAligner.hpp | 4 ++++ src/aligners/FakeAligner.hpp | 4 ++++ src/aligners/FrameAligner.cpp | 2 ++ src/aligners/FrameAligner.hpp | 4 ++++ src/aligners/ImageAligner.cpp | 2 ++ src/aligners/ImageAligner.hpp | 4 ++++ src/aligners/LayeredAligner.cpp | 2 ++ src/aligners/LayeredAligner.hpp | 4 ++++ src/aligners/LinearAligner.cpp | 2 ++ src/aligners/LinearAligner.hpp | 4 ++++ src/aligners/RecursiveAligner.cpp | 3 ++- src/aligners/RecursiveAligner.hpp | 4 ++++ src/aligners/SuperResAligner.cpp | 2 ++ src/aligners/SuperResAligner.hpp | 4 ++++ src/color.cpp | 2 ++ src/color.hpp | 4 ++++ src/containers/AContainer.cpp | 2 ++ src/containers/AContainer.hpp | 4 ++++ src/containers/DelegatedContainer.hpp | 4 ++++ src/containers/FrameContainer.hpp | 4 ++++ src/containers/ImageContainer.cpp | 2 ++ src/containers/ImageContainer.hpp | 4 ++++ src/containers/ImageContainerSaver.cpp | 1 + src/containers/ImageContainerSaver.hpp | 4 ++++ src/containers/ImageGroup.hpp | 4 ++++ src/debug.cpp | 1 + src/debug.hpp | 4 ++-- src/degraders/JpegDegrader.cpp | 2 ++ src/degraders/JpegDegrader.hpp | 4 ++++ src/gui/ImagesModel.cpp | 2 ++ src/gui/ImagesModel.hpp | 4 ++++ src/gui/configs/AConfig.hpp | 3 +++ src/gui/configs/AlignerConfigs.cpp | 2 ++ src/gui/configs/AlignerConfigs.hpp | 3 +++ src/gui/configs/ConfigChooser.hpp | 3 +++ src/gui/configs/RenderConfigs.cpp | 2 ++ src/gui/configs/RenderConfigs.hpp | 13 ++++++++++--- src/gui/mainwindow.cpp | 2 ++ src/gui/mainwindow.hpp | 10 +++++++--- src/gui/savers/ASaver.hpp | 4 ++++ src/gui/savers/DumpSaver.cpp | 2 ++ src/gui/savers/DumpSaver.hpp | 4 ++++ src/gui/visualisations/MovementGraph.cpp | 2 ++ src/gui/visualisations/MovementGraph.hpp | 4 ++++ src/main.cpp | 2 ++ src/planes/FourierPlane.cpp | 2 +- src/planes/FourierPlane.hpp | 4 ++++ src/planes/ImageEx-dump.cpp | 1 + src/planes/ImageEx-jpeg.cpp | 2 ++ src/planes/ImageEx-png.cpp | 1 + src/planes/ImageEx-qimage.cpp | 3 ++- src/planes/ImageEx.cpp | 3 ++- src/planes/ImageEx.hpp | 7 +++++-- src/planes/Plane-binarize.cpp | 1 + src/planes/Plane-blurring.cpp | 1 + src/planes/Plane-diff.cpp | 1 + src/planes/Plane-edgedetection.cpp | 1 + src/planes/Plane-pixel.cpp | 2 ++ src/planes/Plane-scaling.cpp | 1 + src/planes/Plane.cpp | 1 + src/planes/Plane.hpp | 4 ++++ src/planes/PlaneBase.hpp | 4 ++++ src/renders/ARender.hpp | 4 ++++ src/renders/AnimRender.cpp | 1 + src/renders/AnimRender.hpp | 4 ++++ src/renders/AverageRender.cpp | 1 + src/renders/AverageRender.hpp | 5 +++++ src/renders/DiffRender.cpp | 1 + src/renders/DiffRender.hpp | 4 ++++ src/renders/EstimatorRender.cpp | 3 ++- src/renders/EstimatorRender.hpp | 4 ++++ src/renders/FloatRender.cpp | 1 + src/renders/FloatRender.hpp | 4 ++++ src/renders/JpegRender.cpp | 3 ++- src/renders/JpegRender.hpp | 4 ++++ src/renders/PixelatorRender.cpp | 1 + src/renders/PixelatorRender.hpp | 4 ++++ src/renders/PlaneRender.cpp | 1 + src/renders/PlaneRender.hpp | 4 ++++ src/renders/RobustSrRender.cpp | 1 + src/renders/RobustSrRender.hpp | 3 +++ src/renders/StatisticsRender.cpp | 2 ++ src/renders/StatisticsRender.hpp | 4 ++++ src/utils/Animator.cpp | 2 ++ src/utils/Animator.hpp | 4 ++++ src/utils/ImageLoader.cpp | 1 + src/utils/ImageLoader.hpp | 6 +++++- src/utils/PlaneUtils.hpp | 4 ++++ 102 files changed, 293 insertions(+), 17 deletions(-) diff --git a/src/ARenderPipe.hpp b/src/ARenderPipe.hpp index 83161d6..3895bdb 100644 --- a/src/ARenderPipe.hpp +++ b/src/ARenderPipe.hpp @@ -22,6 +22,8 @@ #include +namespace Overmix{ + class ARenderPipe{ private: ImageEx cache; @@ -57,4 +59,6 @@ class ARenderPipe{ virtual ~ARenderPipe(){ } }; +} + #endif \ No newline at end of file diff --git a/src/Deteleciner.cpp b/src/Deteleciner.cpp index 04927e1..98f7aab 100644 --- a/src/Deteleciner.cpp +++ b/src/Deteleciner.cpp @@ -19,6 +19,8 @@ #include "Deteleciner.hpp" #include "planes/ImageEx.hpp" +using namespace Overmix; + ImageEx Deteleciner::addInterlaced( ImageEx image ){ if( !frame.is_valid() ){ frame = image; diff --git a/src/Deteleciner.hpp b/src/Deteleciner.hpp index 4bf907e..733bae9 100644 --- a/src/Deteleciner.hpp +++ b/src/Deteleciner.hpp @@ -20,6 +20,8 @@ #include "planes/ImageEx.hpp" +namespace Overmix{ + class Deteleciner{ private: bool active{ false }; @@ -44,4 +46,6 @@ class Deteleciner{ ImageEx process( ImageEx img ); }; +} + #endif \ No newline at end of file diff --git a/src/Geometry.hpp b/src/Geometry.hpp index 3bce643..4d9ef46 100644 --- a/src/Geometry.hpp +++ b/src/Geometry.hpp @@ -24,6 +24,8 @@ #include #include +namespace Overmix{ + template struct Point{ T x{ 0 }; @@ -182,4 +184,6 @@ struct Rectangle{ } }; +} + #endif diff --git a/src/MultiPlaneIterator.cpp b/src/MultiPlaneIterator.cpp index c9cc190..62c9957 100644 --- a/src/MultiPlaneIterator.cpp +++ b/src/MultiPlaneIterator.cpp @@ -22,6 +22,8 @@ #include #include +using namespace Overmix; + MultiPlaneLineIterator::MultiPlaneLineIterator( int y, int left, int right, const std::vector &infos, void *data diff --git a/src/MultiPlaneIterator.hpp b/src/MultiPlaneIterator.hpp index 1531c3a..dec963c 100644 --- a/src/MultiPlaneIterator.hpp +++ b/src/MultiPlaneIterator.hpp @@ -27,6 +27,8 @@ #include "color.hpp" #include "renders/ARender.hpp" +namespace Overmix{ + struct PlaneItInfo{ Plane& p; int x, y; @@ -290,4 +292,6 @@ class MultiPlaneIterator{ } }; +} + #endif \ No newline at end of file diff --git a/src/RenderOperations.hpp b/src/RenderOperations.hpp index 61d9306..cefcdc1 100644 --- a/src/RenderOperations.hpp +++ b/src/RenderOperations.hpp @@ -21,6 +21,8 @@ #include "ARenderPipe.hpp" #include "color.hpp" +namespace Overmix{ + class RenderPipeScaling : public ARenderPipe{ private: Point size; @@ -168,4 +170,6 @@ class RenderPipeThreshold : public ARenderPipe{ void setSize( int size ){ set( this->size, size ); } }; +} + #endif \ No newline at end of file diff --git a/src/aligners/AImageAligner.cpp b/src/aligners/AImageAligner.cpp index 19857e3..ba22b07 100644 --- a/src/aligners/AImageAligner.cpp +++ b/src/aligners/AImageAligner.cpp @@ -23,6 +23,8 @@ #include +using namespace Overmix; + AImageAligner::AImageAligner( AContainer& container, AlignMethod method, double scale ) : method(method), scale(scale), raw(false), container(container){ diff --git a/src/aligners/AImageAligner.hpp b/src/aligners/AImageAligner.hpp index 27c23f5..54ce9c7 100644 --- a/src/aligners/AImageAligner.hpp +++ b/src/aligners/AImageAligner.hpp @@ -24,6 +24,8 @@ #include +namespace Overmix{ + class AProcessWatcher; class ImageContainer; @@ -110,4 +112,6 @@ class AImageAligner : public AContainer{ virtual void align( AProcessWatcher* watcher=nullptr ) = 0; }; +} + #endif \ No newline at end of file diff --git a/src/aligners/AnimationSaver.cpp b/src/aligners/AnimationSaver.cpp index 8ef6443..b3b7684 100644 --- a/src/aligners/AnimationSaver.cpp +++ b/src/aligners/AnimationSaver.cpp @@ -27,6 +27,7 @@ #include using namespace std; +using namespace Overmix; //TODO: not needed, can be done with QString directly static QString numberZeroFill( int number, int digits ){ diff --git a/src/aligners/AnimationSaver.hpp b/src/aligners/AnimationSaver.hpp index 3af8cb2..8150509 100644 --- a/src/aligners/AnimationSaver.hpp +++ b/src/aligners/AnimationSaver.hpp @@ -24,6 +24,8 @@ #include #include +namespace Overmix{ + class ImageEx; class AnimationSaver{ @@ -60,4 +62,6 @@ class AnimationSaver{ void write(); }; +} + #endif \ No newline at end of file diff --git a/src/aligners/AnimationSeparator.cpp b/src/aligners/AnimationSeparator.cpp index 4742b96..a4d915e 100644 --- a/src/aligners/AnimationSeparator.cpp +++ b/src/aligners/AnimationSeparator.cpp @@ -27,6 +27,7 @@ #include "../debug.hpp" using namespace std; +using namespace Overmix; class AnimFrame{ diff --git a/src/aligners/AnimationSeparator.hpp b/src/aligners/AnimationSeparator.hpp index 13e388b..e2fd7ea 100644 --- a/src/aligners/AnimationSeparator.hpp +++ b/src/aligners/AnimationSeparator.hpp @@ -20,6 +20,8 @@ #include "AImageAligner.hpp" +namespace Overmix{ + class AnimationSeparator : public AImageAligner{ private: double find_threshold( AProcessWatcher* watcher ); @@ -29,4 +31,6 @@ class AnimationSeparator : public AImageAligner{ virtual void align( AProcessWatcher* watcher=nullptr ) override; }; +} + #endif \ No newline at end of file diff --git a/src/aligners/AverageAligner.cpp b/src/aligners/AverageAligner.cpp index 3fa88dc..c92df80 100644 --- a/src/aligners/AverageAligner.cpp +++ b/src/aligners/AverageAligner.cpp @@ -19,6 +19,8 @@ #include "AverageAligner.hpp" #include "../renders/AverageRender.hpp" +using namespace Overmix; + void AverageAligner::align( AProcessWatcher* watcher ){ if( count() == 0 ) return; diff --git a/src/aligners/AverageAligner.hpp b/src/aligners/AverageAligner.hpp index cecdf12..34c1e88 100644 --- a/src/aligners/AverageAligner.hpp +++ b/src/aligners/AverageAligner.hpp @@ -20,6 +20,8 @@ #include "AImageAligner.hpp" +namespace Overmix{ + class AverageAligner : public AImageAligner{ public: AverageAligner( AContainer& container, AlignMethod method, double scale=1.0 ) @@ -27,4 +29,6 @@ class AverageAligner : public AImageAligner{ virtual void align( AProcessWatcher* watcher=nullptr ) override; }; +} + #endif \ No newline at end of file diff --git a/src/aligners/FakeAligner.hpp b/src/aligners/FakeAligner.hpp index affc93e..7f982f1 100644 --- a/src/aligners/FakeAligner.hpp +++ b/src/aligners/FakeAligner.hpp @@ -20,10 +20,14 @@ #include "AImageAligner.hpp" +namespace Overmix{ + class FakeAligner : public AImageAligner{ public: FakeAligner( AContainer& container ) : AImageAligner( container, ALIGN_BOTH, 1.0 ){ } virtual void align( AProcessWatcher* ) override{ resetPosition(); } }; +} + #endif \ No newline at end of file diff --git a/src/aligners/FrameAligner.cpp b/src/aligners/FrameAligner.cpp index 2a25127..a70f492 100644 --- a/src/aligners/FrameAligner.cpp +++ b/src/aligners/FrameAligner.cpp @@ -22,6 +22,8 @@ #include "../containers/ImageContainer.hpp" #include "../containers/FrameContainer.hpp" +using namespace Overmix; + void FrameAligner::align( AProcessWatcher* watcher ){ auto frames = getFrames(); auto base_point = minPoint(); diff --git a/src/aligners/FrameAligner.hpp b/src/aligners/FrameAligner.hpp index 336e362..cc0c3d8 100644 --- a/src/aligners/FrameAligner.hpp +++ b/src/aligners/FrameAligner.hpp @@ -20,6 +20,8 @@ #include "AImageAligner.hpp" +namespace Overmix{ + class FrameAligner : public AImageAligner{ public: FrameAligner( AContainer& container, AlignMethod method, double scale=1.0 ) @@ -27,4 +29,6 @@ class FrameAligner : public AImageAligner{ virtual void align( AProcessWatcher* watcher=nullptr ) override; }; +} + #endif \ No newline at end of file diff --git a/src/aligners/ImageAligner.cpp b/src/aligners/ImageAligner.cpp index c767f70..466140c 100644 --- a/src/aligners/ImageAligner.cpp +++ b/src/aligners/ImageAligner.cpp @@ -25,6 +25,8 @@ #include #include +using namespace Overmix; + void ImageAligner::on_add(){ //Compare this one against all other images diff --git a/src/aligners/ImageAligner.hpp b/src/aligners/ImageAligner.hpp index 37c8da8..4398343 100644 --- a/src/aligners/ImageAligner.hpp +++ b/src/aligners/ImageAligner.hpp @@ -20,6 +20,8 @@ #include "AImageAligner.hpp" +namespace Overmix{ + class ImageAligner : public AImageAligner{ protected: std::vector offsets; @@ -39,4 +41,6 @@ class ImageAligner : public AImageAligner{ }; +} + #endif \ No newline at end of file diff --git a/src/aligners/LayeredAligner.cpp b/src/aligners/LayeredAligner.cpp index e830725..11b8088 100644 --- a/src/aligners/LayeredAligner.cpp +++ b/src/aligners/LayeredAligner.cpp @@ -19,6 +19,8 @@ #include "LayeredAligner.hpp" #include "AverageAligner.hpp" +using namespace Overmix; + /* class InternAligner : public AverageAligner{ protected: diff --git a/src/aligners/LayeredAligner.hpp b/src/aligners/LayeredAligner.hpp index 17c1274..db4701e 100644 --- a/src/aligners/LayeredAligner.hpp +++ b/src/aligners/LayeredAligner.hpp @@ -20,6 +20,8 @@ #include "AImageAligner.hpp" +namespace Overmix{ + class LayeredAligner : public AImageAligner{ public: LayeredAligner( AContainer& container, AlignMethod method, double scale=1.0 ) @@ -27,4 +29,6 @@ class LayeredAligner : public AImageAligner{ virtual void align( AProcessWatcher* watcher=nullptr ) override; }; +} + #endif \ No newline at end of file diff --git a/src/aligners/LinearAligner.cpp b/src/aligners/LinearAligner.cpp index 3fb8625..f548345 100644 --- a/src/aligners/LinearAligner.cpp +++ b/src/aligners/LinearAligner.cpp @@ -18,6 +18,8 @@ #include "LinearAligner.hpp" +using namespace Overmix; + struct LinearFunc{ double x1 = 0.0, x2 = 0.0, xy = 0.0, y1 = 0.0; unsigned n = 0; diff --git a/src/aligners/LinearAligner.hpp b/src/aligners/LinearAligner.hpp index 8b81cac..0de31be 100644 --- a/src/aligners/LinearAligner.hpp +++ b/src/aligners/LinearAligner.hpp @@ -20,6 +20,8 @@ #include "AImageAligner.hpp" +namespace Overmix{ + class LinearAligner : public AImageAligner{ public: LinearAligner( AContainer& container, AlignMethod method ) @@ -27,4 +29,6 @@ class LinearAligner : public AImageAligner{ virtual void align( AProcessWatcher* watcher=nullptr ) override; }; +} + #endif \ No newline at end of file diff --git a/src/aligners/RecursiveAligner.cpp b/src/aligners/RecursiveAligner.cpp index e268211..427acad 100644 --- a/src/aligners/RecursiveAligner.cpp +++ b/src/aligners/RecursiveAligner.cpp @@ -22,6 +22,7 @@ #include using namespace std; +using namespace Overmix; static void copyLine( Plane& plane_out, const Plane& plane_in, unsigned y_out, unsigned y_in ){ auto out = plane_out.scan_line( y_out ); @@ -66,7 +67,7 @@ static Plane mergeVertical( const Plane& p1, const Plane& p2, int offset ){ return out; } -class ImageGetter{ +class Overmix::ImageGetter{ private: Plane p, a; unsigned val; diff --git a/src/aligners/RecursiveAligner.hpp b/src/aligners/RecursiveAligner.hpp index c5faa7f..4e2719a 100644 --- a/src/aligners/RecursiveAligner.hpp +++ b/src/aligners/RecursiveAligner.hpp @@ -21,6 +21,8 @@ #include "AImageAligner.hpp" #include +namespace Overmix{ + class ImageGetter; class RecursiveAligner : public AImageAligner{ @@ -37,4 +39,6 @@ class RecursiveAligner : public AImageAligner{ virtual void align( AProcessWatcher* watcher=nullptr ) override; }; +} + #endif \ No newline at end of file diff --git a/src/aligners/SuperResAligner.cpp b/src/aligners/SuperResAligner.cpp index c1f578e..7c41221 100644 --- a/src/aligners/SuperResAligner.cpp +++ b/src/aligners/SuperResAligner.cpp @@ -19,6 +19,8 @@ #include "SuperResAligner.hpp" #include "../renders/RobustSrRender.hpp" +using namespace Overmix; + void SuperResAligner::align( AProcessWatcher* watcher ){ auto base = RobustSrRender( local_scale ).render( *this, watcher ); diff --git a/src/aligners/SuperResAligner.hpp b/src/aligners/SuperResAligner.hpp index f8a33ae..fe29b38 100644 --- a/src/aligners/SuperResAligner.hpp +++ b/src/aligners/SuperResAligner.hpp @@ -20,6 +20,8 @@ #include "AImageAligner.hpp" +namespace Overmix{ + class SuperResAligner : public AImageAligner{ private: double local_scale; @@ -29,4 +31,6 @@ class SuperResAligner : public AImageAligner{ virtual void align( AProcessWatcher* watcher=nullptr ) override; }; +} + #endif \ No newline at end of file diff --git a/src/color.cpp b/src/color.cpp index c37ca07..9560197 100644 --- a/src/color.cpp +++ b/src/color.cpp @@ -19,6 +19,8 @@ #include +using namespace Overmix; + static std::vector generate_gamma(){ std::vector temp( UINT16_MAX ); diff --git a/src/color.hpp b/src/color.hpp index af3c376..8725ee0 100644 --- a/src/color.hpp +++ b/src/color.hpp @@ -22,6 +22,8 @@ #include #include +namespace Overmix{ + typedef short color_type; typedef int precision_color_type; @@ -156,4 +158,6 @@ struct color{ } }; +} + #endif \ No newline at end of file diff --git a/src/containers/AContainer.cpp b/src/containers/AContainer.cpp index 3ff4f8e..f066748 100644 --- a/src/containers/AContainer.cpp +++ b/src/containers/AContainer.cpp @@ -20,6 +20,8 @@ #include "../planes/ImageEx.hpp" +using namespace Overmix; + const Plane& AContainer::alpha( unsigned index ) const{ return image( index ).alpha_plane(); diff --git a/src/containers/AContainer.hpp b/src/containers/AContainer.hpp index 102c3e0..e0fbde2 100644 --- a/src/containers/AContainer.hpp +++ b/src/containers/AContainer.hpp @@ -21,6 +21,8 @@ #include "../Geometry.hpp" #include +namespace Overmix{ + class ImageEx; class Plane; enum class ScalingFunction; @@ -58,4 +60,6 @@ class AContainer{ std::vector getFrames() const; }; +} + #endif \ No newline at end of file diff --git a/src/containers/DelegatedContainer.hpp b/src/containers/DelegatedContainer.hpp index 75ddcd4..6abd73e 100644 --- a/src/containers/DelegatedContainer.hpp +++ b/src/containers/DelegatedContainer.hpp @@ -20,6 +20,8 @@ #include "AContainer.hpp" +namespace Overmix{ + class ConstDelegatedContainer : public AContainer{ protected: ImageEx* temp; //TODO: avoid? used in imageRef @@ -57,4 +59,6 @@ class DelegatedContainer : public ConstDelegatedContainer{ DelegatedContainer( AContainer& container ) : ConstDelegatedContainer(container), container(container) { } }; +} + #endif \ No newline at end of file diff --git a/src/containers/FrameContainer.hpp b/src/containers/FrameContainer.hpp index 3cd4ecd..591b5ab 100644 --- a/src/containers/FrameContainer.hpp +++ b/src/containers/FrameContainer.hpp @@ -20,6 +20,8 @@ #include "AContainer.hpp" +namespace Overmix{ + class FrameContainer : public AContainer{ private: AContainer& container; @@ -52,4 +54,6 @@ class FrameContainer : public AContainer{ unsigned realIndex( unsigned index ) const{ return indexes[index]; } }; +} + #endif \ No newline at end of file diff --git a/src/containers/ImageContainer.cpp b/src/containers/ImageContainer.cpp index 51ffc78..b282d75 100644 --- a/src/containers/ImageContainer.cpp +++ b/src/containers/ImageContainer.cpp @@ -20,6 +20,8 @@ #include "../utils/utils.hpp" +using namespace Overmix; + void ImageContainer::prepareAdds( unsigned amount ){ if( groups.size() == 0 ) groups.emplace_back( "Auto group", masks ); //TODO: do not repeat this! diff --git a/src/containers/ImageContainer.hpp b/src/containers/ImageContainer.hpp index 30d8f8c..1dafabb 100644 --- a/src/containers/ImageContainer.hpp +++ b/src/containers/ImageContainer.hpp @@ -20,6 +20,8 @@ #include "ImageGroup.hpp" +namespace Overmix{ + class ImageContainer : public AContainer{ public: /** A index to an ImageItem */ @@ -112,4 +114,6 @@ class ImageContainer : public AContainer{ //TODO: Get render thing }; +} + #endif \ No newline at end of file diff --git a/src/containers/ImageContainerSaver.cpp b/src/containers/ImageContainerSaver.cpp index c8ec2a4..ec5d434 100644 --- a/src/containers/ImageContainerSaver.cpp +++ b/src/containers/ImageContainerSaver.cpp @@ -31,6 +31,7 @@ #include "pugixml/pugixml.hpp" using namespace pugi; +using namespace Overmix; const auto NODE_ROOT = "alignment"; const auto NODE_MASKS = "masks"; diff --git a/src/containers/ImageContainerSaver.hpp b/src/containers/ImageContainerSaver.hpp index f0ca573..33f0b7f 100644 --- a/src/containers/ImageContainerSaver.hpp +++ b/src/containers/ImageContainerSaver.hpp @@ -20,6 +20,8 @@ #include +namespace Overmix{ + class ImageContainer; class ImageContainerSaver{ @@ -28,4 +30,6 @@ class ImageContainerSaver{ static QString save( const ImageContainer& container, QString filename ); }; +} + #endif \ No newline at end of file diff --git a/src/containers/ImageGroup.hpp b/src/containers/ImageGroup.hpp index 2630176..1029c18 100644 --- a/src/containers/ImageGroup.hpp +++ b/src/containers/ImageGroup.hpp @@ -24,6 +24,8 @@ #include #include +namespace Overmix{ + class ImageItem{ private: ImageEx img; @@ -87,4 +89,6 @@ class ImageGroup : public AContainer{ virtual void setFrame( unsigned index, int newVal ) override{ items[index].frame = newVal; } }; +} + #endif \ No newline at end of file diff --git a/src/debug.cpp b/src/debug.cpp index 828b6a7..8baed14 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -29,6 +29,7 @@ Q_LOGGING_CATEGORY(LogDelta, "overmix.delta") Q_LOGGING_CATEGORY(LogImageIO, "overmix.imageio") using namespace std; +using namespace Overmix; void debug::output_rectable( ImageContainer& imgs, Rectangle<> area ){ diff --git a/src/debug.hpp b/src/debug.hpp index df5e4fb..185246e 100644 --- a/src/debug.hpp +++ b/src/debug.hpp @@ -30,8 +30,8 @@ Q_DECLARE_LOGGING_CATEGORY(LogTiming) Q_DECLARE_LOGGING_CATEGORY(LogDelta) Q_DECLARE_LOGGING_CATEGORY(LogImageIO) -class ImageContainer; class QImage; +namespace Overmix{ class ImageContainer; } struct Timer{ QElapsedTimer t; @@ -48,7 +48,7 @@ namespace debug{ void make_low_res( QImage image, QString dir, unsigned scale ); - void output_rectable( ImageContainer& imgs, Rectangle<> area ); + void output_rectable( Overmix::ImageContainer& imgs, Overmix::Rectangle<> area ); class CsvFile{ diff --git a/src/degraders/JpegDegrader.cpp b/src/degraders/JpegDegrader.cpp index 49b3702..835a9ba 100644 --- a/src/degraders/JpegDegrader.cpp +++ b/src/degraders/JpegDegrader.cpp @@ -22,6 +22,8 @@ #include "../planes/FourierPlane.hpp" #include "../planes/ImageEx.hpp" +using namespace Overmix; + constexpr int DCTSIZE = 8; QuantTable::QuantTable() : table( DCTSIZE, DCTSIZE ) { table.fill( 1 ); } diff --git a/src/degraders/JpegDegrader.hpp b/src/degraders/JpegDegrader.hpp index a442674..b706f84 100644 --- a/src/degraders/JpegDegrader.hpp +++ b/src/degraders/JpegDegrader.hpp @@ -22,6 +22,8 @@ #include "../planes/Plane.hpp" +namespace Overmix{ + class ImageEx; class DctPlane; @@ -69,4 +71,6 @@ class JpegDegrader{ void addPlane( JpegPlane plane ){ planes.emplace_back( plane ); } }; +} + #endif \ No newline at end of file diff --git a/src/gui/ImagesModel.cpp b/src/gui/ImagesModel.cpp index e4ec83c..429821e 100644 --- a/src/gui/ImagesModel.cpp +++ b/src/gui/ImagesModel.cpp @@ -22,6 +22,8 @@ #include +using namespace Overmix; + class ImagesIndex{ private: diff --git a/src/gui/ImagesModel.hpp b/src/gui/ImagesModel.hpp index 3d3284e..ea42bd8 100644 --- a/src/gui/ImagesModel.hpp +++ b/src/gui/ImagesModel.hpp @@ -24,6 +24,8 @@ #include +namespace Overmix{ + class ImagesModel : public QAbstractItemModel{ Q_OBJECT @@ -50,5 +52,7 @@ class ImagesModel : public QAbstractItemModel{ QImage getImage( const QModelIndex& index ) const; }; +} + #endif diff --git a/src/gui/configs/AConfig.hpp b/src/gui/configs/AConfig.hpp index 0a02781..d8be2f7 100644 --- a/src/gui/configs/AConfig.hpp +++ b/src/gui/configs/AConfig.hpp @@ -23,6 +23,8 @@ #include #include +namespace Overmix{ + class AConfig : public QWidget{ Q_OBJECT @@ -56,6 +58,7 @@ class AConfig : public QWidget{ } }; +} #endif diff --git a/src/gui/configs/AlignerConfigs.cpp b/src/gui/configs/AlignerConfigs.cpp index 19289fa..9646e8f 100644 --- a/src/gui/configs/AlignerConfigs.cpp +++ b/src/gui/configs/AlignerConfigs.cpp @@ -28,6 +28,8 @@ #include +using namespace Overmix; + AlignerConfigChooser::AlignerConfigChooser( QWidget* parent, bool expand ) : ConfigChooser( parent, expand ){ } diff --git a/src/gui/configs/AlignerConfigs.hpp b/src/gui/configs/AlignerConfigs.hpp index 8f36edf..64b3df3 100644 --- a/src/gui/configs/AlignerConfigs.hpp +++ b/src/gui/configs/AlignerConfigs.hpp @@ -25,6 +25,8 @@ #include "ui_imagealigner.h" +namespace Overmix{ + class AAlignerConfig : public AConfig, private Ui::ImageAligner{ Q_OBJECT @@ -130,5 +132,6 @@ class SuperResAlignerConfig : public AAlignerConfig{ QString discription() const override{ return "Aligns against the super-resolution image"; } }; +} #endif diff --git a/src/gui/configs/ConfigChooser.hpp b/src/gui/configs/ConfigChooser.hpp index b1f91a4..fa9972e 100644 --- a/src/gui/configs/ConfigChooser.hpp +++ b/src/gui/configs/ConfigChooser.hpp @@ -27,6 +27,8 @@ #include +namespace Overmix{ + template class ConfigChooser : public AConfig{ //NOTE: no Q_OBJECT, because fake-shit @@ -84,6 +86,7 @@ class ConfigChooser : public AConfig{ } }; +} #endif diff --git a/src/gui/configs/RenderConfigs.cpp b/src/gui/configs/RenderConfigs.cpp index 152ddd9..693bea0 100644 --- a/src/gui/configs/RenderConfigs.cpp +++ b/src/gui/configs/RenderConfigs.cpp @@ -33,6 +33,8 @@ #include #include +using namespace Overmix; + RenderConfigChooser::RenderConfigChooser( QWidget* parent, bool expand ) : ConfigChooser( parent, expand ) diff --git a/src/gui/configs/RenderConfigs.hpp b/src/gui/configs/RenderConfigs.hpp index c6302bc..98a15e5 100644 --- a/src/gui/configs/RenderConfigs.hpp +++ b/src/gui/configs/RenderConfigs.hpp @@ -20,6 +20,12 @@ #include "ConfigChooser.hpp" +class QSpinBox; +class QLineEdit; +class QComboBox; + +namespace Overmix{ + class ARender; class ARenderConfig : public AConfig{ @@ -79,7 +85,7 @@ class FloatRenderConfig : public ARenderConfig{ class StatisticsRenderConfig : public ARenderConfig{ private: - class QComboBox* function; + QComboBox* function; public: StatisticsRenderConfig( QWidget* parent ); std::unique_ptr getRender() const override; @@ -108,8 +114,8 @@ class PixelatorRenderConfig : public ARenderConfig{ class JpegRenderConfig : public ARenderConfig{ private: - class QSpinBox* iterations; - class QLineEdit* path; + QSpinBox* iterations; + QLineEdit* path; public: JpegRenderConfig( QWidget* parent ); std::unique_ptr getRender() const override; @@ -118,5 +124,6 @@ class JpegRenderConfig : public ARenderConfig{ QString discription() const override{ return "Estimates a JPEG degraded image"; } }; +} #endif diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 6e4c284..1e83f16 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -59,6 +59,8 @@ #include #include +using namespace Overmix; + class DialogWatcher : public AProcessWatcher{ private: QProgressDialog dialog; diff --git a/src/gui/mainwindow.hpp b/src/gui/mainwindow.hpp index a841f31..8e0fd2d 100644 --- a/src/gui/mainwindow.hpp +++ b/src/gui/mainwindow.hpp @@ -38,14 +38,16 @@ #include "configs/AlignerConfigs.hpp" #include "configs/RenderConfigs.hpp" +class QGroupBox; +class imageCache; + +namespace Overmix{ + class ARender; class AContainer; class AImageAligner; class Deteleciner; class ImageContainer; -class QGroupBox; - -class imageCache; class main_widget: public QMainWindow{ Q_OBJECT @@ -155,4 +157,6 @@ class main_widget: public QMainWindow{ void create_slide(); }; +} + #endif \ No newline at end of file diff --git a/src/gui/savers/ASaver.hpp b/src/gui/savers/ASaver.hpp index e829877..505652a 100644 --- a/src/gui/savers/ASaver.hpp +++ b/src/gui/savers/ASaver.hpp @@ -21,6 +21,8 @@ #include #include +namespace Overmix{ + class ImageEx; class ASaver: public QDialog{ @@ -41,4 +43,6 @@ class ASaver: public QDialog{ } }; +} + #endif \ No newline at end of file diff --git a/src/gui/savers/DumpSaver.cpp b/src/gui/savers/DumpSaver.cpp index 093637e..94e9684 100644 --- a/src/gui/savers/DumpSaver.cpp +++ b/src/gui/savers/DumpSaver.cpp @@ -20,6 +20,8 @@ #include "../../planes/ImageEx.hpp" +using namespace Overmix; + DumpSaver::DumpSaver( const ImageEx& image, QString filename ) : ASaver( image, filename ){ setupUi(this); diff --git a/src/gui/savers/DumpSaver.hpp b/src/gui/savers/DumpSaver.hpp index db0e88c..74c4382 100644 --- a/src/gui/savers/DumpSaver.hpp +++ b/src/gui/savers/DumpSaver.hpp @@ -22,6 +22,8 @@ #include "ui_DumpSaver.h" +namespace Overmix{ + class DumpSaver: public ASaver, private Ui::DumpSaver{ Q_OBJECT @@ -30,4 +32,6 @@ class DumpSaver: public ASaver, private Ui::DumpSaver{ virtual void save( const ImageEx& image, QString filename ) override; }; +} + #endif \ No newline at end of file diff --git a/src/gui/visualisations/MovementGraph.cpp b/src/gui/visualisations/MovementGraph.cpp index ad21142..02385ac 100644 --- a/src/gui/visualisations/MovementGraph.cpp +++ b/src/gui/visualisations/MovementGraph.cpp @@ -28,6 +28,8 @@ #include #include +using namespace Overmix; + static Point imagesMoves( const AContainer& container ){ if( container.count() == 0 ) return { false, false }; diff --git a/src/gui/visualisations/MovementGraph.hpp b/src/gui/visualisations/MovementGraph.hpp index d4b8e02..b8dc638 100644 --- a/src/gui/visualisations/MovementGraph.hpp +++ b/src/gui/visualisations/MovementGraph.hpp @@ -20,6 +20,8 @@ #include +namespace Overmix{ + class MovementGraph : public QWidget{ Q_OBJECT @@ -31,5 +33,7 @@ class MovementGraph : public QWidget{ }; +} + #endif diff --git a/src/main.cpp b/src/main.cpp index e2fdd00..3fd67aa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,6 +24,8 @@ #include #include +using namespace Overmix; + int main( int argc, char *argv[] ){ QApplication a( argc, argv ); auto args = a.arguments(); diff --git a/src/planes/FourierPlane.cpp b/src/planes/FourierPlane.cpp index c0b10d0..61b6aab 100644 --- a/src/planes/FourierPlane.cpp +++ b/src/planes/FourierPlane.cpp @@ -25,7 +25,7 @@ #include using namespace std; - +using namespace Overmix; FourierPlane::FourierPlane( const Plane& p, double range ) diff --git a/src/planes/FourierPlane.hpp b/src/planes/FourierPlane.hpp index 1f65f93..6bb226c 100644 --- a/src/planes/FourierPlane.hpp +++ b/src/planes/FourierPlane.hpp @@ -24,6 +24,8 @@ #include +namespace Overmix{ + class FourierPlane : public PlaneBase>{ private: unsigned real_width; @@ -79,4 +81,6 @@ class DctPlane : public PlaneBase{ void toPlane( Plane& p, Point pos, double range=1.0 ); }; +} + #endif \ No newline at end of file diff --git a/src/planes/ImageEx-dump.cpp b/src/planes/ImageEx-dump.cpp index 983bbee..03d48dd 100644 --- a/src/planes/ImageEx-dump.cpp +++ b/src/planes/ImageEx-dump.cpp @@ -24,6 +24,7 @@ #include using namespace std; +using namespace Overmix; template void copyLine( color_type* out, const T* in, unsigned width, double scale ){ diff --git a/src/planes/ImageEx-jpeg.cpp b/src/planes/ImageEx-jpeg.cpp index e460a0c..7bc5acd 100644 --- a/src/planes/ImageEx-jpeg.cpp +++ b/src/planes/ImageEx-jpeg.cpp @@ -29,6 +29,8 @@ #include +using namespace Overmix; + JpegDegrader ImageEx::getJpegDegrader( QString path ){ JpegDegrader deg; diff --git a/src/planes/ImageEx-png.cpp b/src/planes/ImageEx-png.cpp index 5b43105..b5a0a66 100644 --- a/src/planes/ImageEx-png.cpp +++ b/src/planes/ImageEx-png.cpp @@ -28,6 +28,7 @@ #include using namespace std; +using namespace Overmix; struct MemStream{ //TODO: kinda unnecessary, just pass dev* diff --git a/src/planes/ImageEx-qimage.cpp b/src/planes/ImageEx-qimage.cpp index 44a7e47..60790ff 100644 --- a/src/planes/ImageEx-qimage.cpp +++ b/src/planes/ImageEx-qimage.cpp @@ -27,6 +27,7 @@ #include using namespace std; +using namespace Overmix; bool ImageEx::from_qimage( QIODevice& dev, QString ext ){ @@ -164,7 +165,7 @@ QImage ImageEx::to_qimage( unsigned setting ) const{ static QRgb setQRgbAlpha( QRgb in, int alpha ) { return qRgba( qRed(in), qGreen(in), qBlue(in), alpha ); } -QImage setQImageAlpha( QImage img, const Plane& alpha ){ +QImage Overmix::setQImageAlpha( QImage img, const Plane& alpha ){ if( !alpha ) return img; diff --git a/src/planes/ImageEx.cpp b/src/planes/ImageEx.cpp index 4aca070..d15b7fc 100644 --- a/src/planes/ImageEx.cpp +++ b/src/planes/ImageEx.cpp @@ -24,6 +24,7 @@ using namespace std; +using namespace Overmix; static const double DOUBLE_MAX = std::numeric_limits::max(); @@ -224,7 +225,7 @@ MergeResult ImageEx::best_round( const ImageEx& img, int level, double range_x, ); } -ImageEx deVlcImage( const ImageEx& img ){ +ImageEx Overmix::deVlcImage( const ImageEx& img ){ Timer t( "deVlcImage" ); if( img.getTransform() != Transform::RGB ) return {}; diff --git a/src/planes/ImageEx.hpp b/src/planes/ImageEx.hpp index 7dc6bf4..7fc3457 100644 --- a/src/planes/ImageEx.hpp +++ b/src/planes/ImageEx.hpp @@ -25,7 +25,8 @@ class QImage; class QIODevice; class QString; -class JpegDegrader; + +namespace Overmix{ enum class Transform{ GRAY @@ -64,7 +65,7 @@ class ImageEx{ Transfer transfer; bool read_dump_plane( QIODevice& dev ); bool from_dump( QIODevice& dev ); - bool from_jpeg( QIODevice& dev, JpegDegrader* deg=nullptr ); + bool from_jpeg( QIODevice& dev, class JpegDegrader* deg=nullptr ); bool from_png( QIODevice& dev ); bool from_qimage( QIODevice& dev, QString ext ); @@ -182,4 +183,6 @@ class ImageEx{ QImage setQImageAlpha( QImage img, const Plane& alpha ); ImageEx deVlcImage( const ImageEx& img ); +} + #endif \ No newline at end of file diff --git a/src/planes/Plane-binarize.cpp b/src/planes/Plane-binarize.cpp index b80a3d3..c19c343 100644 --- a/src/planes/Plane-binarize.cpp +++ b/src/planes/Plane-binarize.cpp @@ -22,6 +22,7 @@ #include using namespace std; +using namespace Overmix; static void apply_threshold( const SimplePixel& pixel ){ color_type threshold = *(color_type*)pixel.data; diff --git a/src/planes/Plane-blurring.cpp b/src/planes/Plane-blurring.cpp index 770aec9..8be0271 100644 --- a/src/planes/Plane-blurring.cpp +++ b/src/planes/Plane-blurring.cpp @@ -24,6 +24,7 @@ #include using namespace std; +using namespace Overmix; template diff --git a/src/planes/Plane-diff.cpp b/src/planes/Plane-diff.cpp index 4304022..66e8e51 100644 --- a/src/planes/Plane-diff.cpp +++ b/src/planes/Plane-diff.cpp @@ -25,6 +25,7 @@ #include "../color.hpp" using namespace std; +using namespace Overmix; static const double DOUBLE_MAX = numeric_limits::max(); diff --git a/src/planes/Plane-edgedetection.cpp b/src/planes/Plane-edgedetection.cpp index 0e1bf8d..92a17bf 100644 --- a/src/planes/Plane-edgedetection.cpp +++ b/src/planes/Plane-edgedetection.cpp @@ -22,6 +22,7 @@ #include using namespace std; +using namespace Overmix; template diff --git a/src/planes/Plane-pixel.cpp b/src/planes/Plane-pixel.cpp index e230ca7..a3005d0 100644 --- a/src/planes/Plane-pixel.cpp +++ b/src/planes/Plane-pixel.cpp @@ -21,6 +21,8 @@ #include +using namespace Overmix; + static void do_pixel_line_single( SimplePixel pix ){ for( unsigned i=0; i using namespace std; +using namespace Overmix; Plane Plane::scale_nearest( Point wanted ) const{ Timer t( "scale_nearest" ); diff --git a/src/planes/Plane.cpp b/src/planes/Plane.cpp index b91ea0c..46e60c2 100644 --- a/src/planes/Plane.cpp +++ b/src/planes/Plane.cpp @@ -29,6 +29,7 @@ #include "../color.hpp" using namespace std; +using namespace Overmix; const unsigned long Plane::MAX_VAL = 0xFFFFFFFF; diff --git a/src/planes/Plane.hpp b/src/planes/Plane.hpp index 8c2935f..eb87013 100644 --- a/src/planes/Plane.hpp +++ b/src/planes/Plane.hpp @@ -23,6 +23,8 @@ #include "PlaneBase.hpp" +namespace Overmix{ + typedef short color_type; typedef std::pair, double> MergeResult; @@ -209,4 +211,6 @@ class Plane : public PlaneBase{ Plane deconvolve_rl( double amount, unsigned iterations ) const; }; +} + #endif \ No newline at end of file diff --git a/src/planes/PlaneBase.hpp b/src/planes/PlaneBase.hpp index 7ac64da..0746c23 100644 --- a/src/planes/PlaneBase.hpp +++ b/src/planes/PlaneBase.hpp @@ -20,6 +20,8 @@ #include "../Geometry.hpp" +namespace Overmix{ + template class PlaneBase{ protected: @@ -217,4 +219,6 @@ class PlaneBase{ LineIt, const T> end() const { return { this, size.height() }; } }; +} + #endif \ No newline at end of file diff --git a/src/renders/ARender.hpp b/src/renders/ARender.hpp index f8b06d5..c4947eb 100644 --- a/src/renders/ARender.hpp +++ b/src/renders/ARender.hpp @@ -18,6 +18,8 @@ #ifndef A_RENDER_HPP #define A_RENDER_HPP +namespace Overmix{ + class AContainer; class ImageEx; @@ -57,4 +59,6 @@ class ARender{ virtual ImageEx render( const AContainer& group, AProcessWatcher* watcher=nullptr ) const = 0; }; +} + #endif \ No newline at end of file diff --git a/src/renders/AnimRender.cpp b/src/renders/AnimRender.cpp index 35b6d32..8d2c9b0 100644 --- a/src/renders/AnimRender.cpp +++ b/src/renders/AnimRender.cpp @@ -28,6 +28,7 @@ #include #include using namespace std; +using namespace Overmix; static Plane expand( const Plane& p, Size size, Point pos ){ Plane out( size ); diff --git a/src/renders/AnimRender.hpp b/src/renders/AnimRender.hpp index cc822ce..269162c 100644 --- a/src/renders/AnimRender.hpp +++ b/src/renders/AnimRender.hpp @@ -22,6 +22,8 @@ #include "../containers/ImageContainer.hpp" #include +namespace Overmix{ + class AnimRender{ protected: ImageContainer frames; @@ -33,4 +35,6 @@ class AnimRender{ ImageEx render( int frame, AProcessWatcher* watcher=nullptr ); }; +} + #endif \ No newline at end of file diff --git a/src/renders/AverageRender.cpp b/src/renders/AverageRender.cpp index 430c3d5..5dcb15c 100644 --- a/src/renders/AverageRender.cpp +++ b/src/renders/AverageRender.cpp @@ -26,6 +26,7 @@ #include #include using namespace std; +using namespace Overmix; template PlaneBase resizePlaneToFit( const PlaneBase& input, Size<> size, Point<> pos ){ diff --git a/src/renders/AverageRender.hpp b/src/renders/AverageRender.hpp index b5311c7..df51694 100644 --- a/src/renders/AverageRender.hpp +++ b/src/renders/AverageRender.hpp @@ -22,6 +22,9 @@ #include "../color.hpp" #include "../planes/PlaneBase.hpp" + +namespace Overmix{ + class Plane; class SumPlane { @@ -57,4 +60,6 @@ class AverageRender : public ARender{ virtual ImageEx render( const AContainer& group, AProcessWatcher* watcher=nullptr ) const override; }; +} + #endif \ No newline at end of file diff --git a/src/renders/DiffRender.cpp b/src/renders/DiffRender.cpp index 079d62c..f38151c 100644 --- a/src/renders/DiffRender.cpp +++ b/src/renders/DiffRender.cpp @@ -25,6 +25,7 @@ #include using namespace std; +using namespace Overmix; class StaticDiff{ private: diff --git a/src/renders/DiffRender.hpp b/src/renders/DiffRender.hpp index fedf11b..c792bde 100644 --- a/src/renders/DiffRender.hpp +++ b/src/renders/DiffRender.hpp @@ -22,6 +22,8 @@ #include "../Geometry.hpp" +namespace Overmix{ + class Plane; class DiffRender : public ARender{ @@ -31,4 +33,6 @@ class DiffRender : public ARender{ virtual ImageEx render( const AContainer& group, AProcessWatcher* watcher=nullptr ) const override; }; +} + #endif \ No newline at end of file diff --git a/src/renders/EstimatorRender.cpp b/src/renders/EstimatorRender.cpp index 99d0586..3dca7ee 100644 --- a/src/renders/EstimatorRender.cpp +++ b/src/renders/EstimatorRender.cpp @@ -25,6 +25,7 @@ using namespace std; +using namespace Overmix; static Plane save( Plane p, QString name ){ // ImageEx( p ).to_qimage( ImageEx::SYSTEM_KEEP ).save( name + ".png" ); @@ -35,7 +36,7 @@ Point channelScale( const AContainer& container, unsigned index, unsigne return container.image(index)[channel].getSize() / container.image(index).getSize().to(); } -struct Parameters{ +struct Overmix::Parameters{ //const Plane& background; //double overlay{ 0.85 }; diff --git a/src/renders/EstimatorRender.hpp b/src/renders/EstimatorRender.hpp index 06f2454..e8cf9a0 100644 --- a/src/renders/EstimatorRender.hpp +++ b/src/renders/EstimatorRender.hpp @@ -21,6 +21,9 @@ #include "ARender.hpp" #include "../planes/Plane.hpp" + +namespace Overmix{ + struct Parameters; class EstimatorRender : public ARender{ @@ -44,5 +47,6 @@ class EstimatorRender : public ARender{ virtual ImageEx render( const AContainer& group, AProcessWatcher* watcher=nullptr ) const override; }; +} #endif diff --git a/src/renders/FloatRender.cpp b/src/renders/FloatRender.cpp index 119e198..b8fc8f5 100644 --- a/src/renders/FloatRender.cpp +++ b/src/renders/FloatRender.cpp @@ -29,6 +29,7 @@ #include #include using namespace std; +using namespace Overmix; using PointF = Point; static double cubic( double b, double c, double x ){ diff --git a/src/renders/FloatRender.hpp b/src/renders/FloatRender.hpp index 247c6cd..fef518d 100644 --- a/src/renders/FloatRender.hpp +++ b/src/renders/FloatRender.hpp @@ -21,6 +21,8 @@ #include "ARender.hpp" #include "../Geometry.hpp" +namespace Overmix{ + class FloatRender : public ARender{ Point scale; public: @@ -29,4 +31,6 @@ class FloatRender : public ARender{ virtual ImageEx render( const AContainer& group, AProcessWatcher* watcher=nullptr ) const override; }; +} + #endif \ No newline at end of file diff --git a/src/renders/JpegRender.cpp b/src/renders/JpegRender.cpp index d1c8dda..14ecb41 100644 --- a/src/renders/JpegRender.cpp +++ b/src/renders/JpegRender.cpp @@ -27,6 +27,7 @@ using namespace std; +using namespace Overmix; static Plane save( Plane p, QString name ){ ImageEx( p ).to_qimage().save( name + ".png" ); @@ -37,7 +38,7 @@ static Point channelScale( const AContainer& container, unsigned index, return container.image(index)[channel].getSize().to() / container.image(index).getSize().to(); } -struct Parameters{ +struct Overmix::Parameters{ const AContainer& container; unsigned index; unsigned channel; diff --git a/src/renders/JpegRender.hpp b/src/renders/JpegRender.hpp index 89b4dae..4c0d21e 100644 --- a/src/renders/JpegRender.hpp +++ b/src/renders/JpegRender.hpp @@ -23,6 +23,9 @@ #include "../planes/ImageEx.hpp" #include "../degraders/JpegDegrader.hpp" #include + +namespace Overmix{ + struct Parameters; class JpegRender : public ARender{ @@ -40,5 +43,6 @@ class JpegRender : public ARender{ virtual ImageEx render( const AContainer& group, AProcessWatcher* watcher=nullptr ) const override; }; +} #endif diff --git a/src/renders/PixelatorRender.cpp b/src/renders/PixelatorRender.cpp index 53c2542..992fac7 100644 --- a/src/renders/PixelatorRender.cpp +++ b/src/renders/PixelatorRender.cpp @@ -27,6 +27,7 @@ #include #include using namespace std; +using namespace Overmix; using Color = int; using Histogram = vector; diff --git a/src/renders/PixelatorRender.hpp b/src/renders/PixelatorRender.hpp index 475a819..4ec908f 100644 --- a/src/renders/PixelatorRender.hpp +++ b/src/renders/PixelatorRender.hpp @@ -20,9 +20,13 @@ #include "ARender.hpp" +namespace Overmix{ + class PixelatorRender : public ARender{ public: virtual ImageEx render( const AContainer& group, AProcessWatcher* watcher=nullptr ) const override; }; +} + #endif \ No newline at end of file diff --git a/src/renders/PlaneRender.cpp b/src/renders/PlaneRender.cpp index 7c70ee3..c0ecbf8 100644 --- a/src/renders/PlaneRender.cpp +++ b/src/renders/PlaneRender.cpp @@ -24,6 +24,7 @@ #include #include using namespace std; +using namespace Overmix; Plane PlaneRender::renderPlane( const AContainer& aligner, int plane, AProcessWatcher* watcher ) const{ auto scale = aligner.image( 0 )[plane].getSize().to() / aligner.image( 0 )[0].getSize().to(); diff --git a/src/renders/PlaneRender.hpp b/src/renders/PlaneRender.hpp index 2c1919a..bb90647 100644 --- a/src/renders/PlaneRender.hpp +++ b/src/renders/PlaneRender.hpp @@ -22,6 +22,8 @@ #include "../MultiPlaneIterator.hpp" +namespace Overmix{ + class PlaneRender : public ARender{ protected: unsigned max_planes = -1; @@ -35,4 +37,6 @@ class PlaneRender : public ARender{ virtual ImageEx render( const AContainer& group, AProcessWatcher* watcher=nullptr ) const override; }; +} + #endif \ No newline at end of file diff --git a/src/renders/RobustSrRender.cpp b/src/renders/RobustSrRender.cpp index 8942bce..286b495 100644 --- a/src/renders/RobustSrRender.cpp +++ b/src/renders/RobustSrRender.cpp @@ -30,6 +30,7 @@ using namespace Eigen; using namespace std; +using namespace Overmix; MatrixXf imageToMatrix( const Plane& p ){ MatrixXf out( 1, p.get_width() * p.get_height() ); diff --git a/src/renders/RobustSrRender.hpp b/src/renders/RobustSrRender.hpp index 33745f4..0748bf6 100644 --- a/src/renders/RobustSrRender.hpp +++ b/src/renders/RobustSrRender.hpp @@ -21,6 +21,8 @@ #include "ARender.hpp" +namespace Overmix{ + class RobustSrRender : public ARender{ private: int upscale_factor; @@ -32,5 +34,6 @@ class RobustSrRender : public ARender{ virtual ImageEx render( const AContainer& group, AProcessWatcher* watcher=nullptr ) const override; }; +} #endif diff --git a/src/renders/StatisticsRender.cpp b/src/renders/StatisticsRender.cpp index 8c70592..7ab3e98 100644 --- a/src/renders/StatisticsRender.cpp +++ b/src/renders/StatisticsRender.cpp @@ -22,6 +22,8 @@ #include #include +using namespace Overmix; + static void median_pixel( MultiPlaneLineIterator &it ){ std::vector all; for( unsigned i=1; i +using namespace Overmix; + void blend( ImageEx& img, Point pos, Point size ){ Point end = img.getSize().min( pos+size ); pos = pos.max( {0,0} ); diff --git a/src/utils/Animator.hpp b/src/utils/Animator.hpp index def2797..bb0a4de 100644 --- a/src/utils/Animator.hpp +++ b/src/utils/Animator.hpp @@ -20,6 +20,8 @@ #include "../Geometry.hpp" +namespace Overmix{ + class ImageEx; class Animator{ @@ -35,4 +37,6 @@ class Animator{ void render( const ImageEx& img ) const; }; +} + #endif \ No newline at end of file diff --git a/src/utils/ImageLoader.cpp b/src/utils/ImageLoader.cpp index 075587d..c01f063 100644 --- a/src/utils/ImageLoader.cpp +++ b/src/utils/ImageLoader.cpp @@ -26,6 +26,7 @@ #include using namespace std; +using namespace Overmix; const vector& ImageLoader::loadAll(){ QtConcurrent::blockingMap( images, []( Item& item ){ diff --git a/src/utils/ImageLoader.hpp b/src/utils/ImageLoader.hpp index 9c6f935..19a8eec 100644 --- a/src/utils/ImageLoader.hpp +++ b/src/utils/ImageLoader.hpp @@ -23,7 +23,9 @@ class QStringList; #include #include - + +namespace Overmix{ + class Deteleciner; class ImageEx; class ImageContainer; @@ -43,4 +45,6 @@ class ImageLoader{ static void loadImages( QStringList list, ImageContainer& container, Deteleciner& detele, int alpha_mask=-1 ); }; +} + #endif \ No newline at end of file diff --git a/src/utils/PlaneUtils.hpp b/src/utils/PlaneUtils.hpp index 0b4b1b8..e901da9 100644 --- a/src/utils/PlaneUtils.hpp +++ b/src/utils/PlaneUtils.hpp @@ -21,6 +21,8 @@ #include "../planes/Plane.hpp" #include "../color.hpp" +namespace Overmix{ + class ScaledPlane{ private: Plane scaled; @@ -62,4 +64,6 @@ class ColorRow{ } }; +} + #endif