From 8b9902ac6e239bd36681a2997ee1bdfa4239a5d8 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Sun, 25 Jun 2006 09:54:28 +0200 Subject: Stich -> Stitch and hook new files in Makefile.am --- src/Stitch.H | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/Stitch.H (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H new file mode 100644 index 0000000..86b8f8f --- /dev/null +++ b/src/Stitch.H @@ -0,0 +1,44 @@ +// +// Copyright 2005 by Johannes Hofmann +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Library General Public +// License as published by the Free Software Foundation; either +// version 2 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Library General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +// USA. +// + +#ifndef STITCH_H +#define STITCH_H + +#include "GipfelWidget.H" + +#define MAX_PICS 256 + +class Stitch { + private: + GipfelWidget *gipf[MAX_PICS]; + + + public: + Stitch(); + + ~Stitch(); + + int add_image(const char *file); + + int resample(Fl_RGB_Image *, + double view_start, double view_end, + double nick_start, double nick_end); +}; + +#endif -- cgit v1.2.3 From 7d900b4ede22215413e4a0ddd1675c650ba3225f Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Sun, 25 Jun 2006 11:49:32 +0200 Subject: implement various helper methods --- src/Stitch.H | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index 86b8f8f..8c126f7 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -21,6 +21,7 @@ #define STITCH_H #include "GipfelWidget.H" +#include "DataImage.H" #define MAX_PICS 256 @@ -34,9 +35,9 @@ class Stitch { ~Stitch(); - int add_image(const char *file); + int load_image(char *file); - int resample(Fl_RGB_Image *, + int resample(DataImage *img, double view_start, double view_end, double nick_start, double nick_end); }; -- cgit v1.2.3 From bf376cf0a996b08c39f22d46ba68be4e7957777f Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Sun, 25 Jun 2006 13:02:31 +0200 Subject: first working version --- src/Stitch.H | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index 8c126f7..bc8436e 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -38,8 +38,7 @@ class Stitch { int load_image(char *file); int resample(DataImage *img, - double view_start, double view_end, - double nick_start, double nick_end); + double view_start, double view_end); }; #endif -- cgit v1.2.3 From 52669d81a766eacc1b4e60d0cf477e35b598fcbe Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 2 Aug 2006 17:12:55 +0200 Subject: change Stitch to use OutputImage instead of DataImage --- src/Stitch.H | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index bc8436e..0bb6d48 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -21,13 +21,16 @@ #define STITCH_H #include "GipfelWidget.H" -#include "DataImage.H" +#include "OutputImage.H" #define MAX_PICS 256 + class Stitch { private: GipfelWidget *gipf[MAX_PICS]; + OutputImage *single_images[MAX_PICS]; + OutputImage *merged_image; public: @@ -36,8 +39,12 @@ class Stitch { ~Stitch(); int load_image(char *file); - - int resample(DataImage *img, + + OutputImage * set_output(OutputImage *img); + + OutputImage * set_output(const char *file, OutputImage *img); + + int resample(int w, int h, double view_start, double view_end); }; -- cgit v1.2.3