From da5192170bb7ed19a8eadbc8ac393b0fa222c7df Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 18:18:57 +0100 Subject: consolidate ExifImageMetaData and src/JpgcomImageMetaData into ImageMetaData --- src/gipfel.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/gipfel.cxx') diff --git a/src/gipfel.cxx b/src/gipfel.cxx index 1106c48..13ef3e5 100644 --- a/src/gipfel.cxx +++ b/src/gipfel.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -438,7 +439,7 @@ int main(int argc, char** argv) { if (view_point) { gipf->set_viewpoint(view_point); } else if (img_file && - gipf->get_view_lat()==0.0 && gipf->get_view_long()==0.0) { + (isnan(gipf->get_view_lat()) || isnan(gipf->get_view_long()))) { viewpoint_cb(NULL, NULL); } -- cgit v1.2.3 From 4188cb198bec8a83cfeb893608af2bd39d515449 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 19:21:16 +0100 Subject: scale -> focal_length_35mm --- src/GipfelWidget.H | 4 ++-- src/GipfelWidget.cxx | 12 ++++++------ src/ImageMetaData.H | 6 +++--- src/ImageMetaData.cxx | 20 ++++++++++---------- src/gipfel.cxx | 26 +++++++++++++------------- 5 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/gipfel.cxx') diff --git a/src/GipfelWidget.H b/src/GipfelWidget.H index 7bcd3c0..f4c2850 100644 --- a/src/GipfelWidget.H +++ b/src/GipfelWidget.H @@ -78,7 +78,7 @@ class GipfelWidget : public Fl_Widget { void set_tilt_angle(double a); - void set_scale(double s); + void set_focal_length_35mm(double s); void set_height_dist_ratio(double r); @@ -100,7 +100,7 @@ class GipfelWidget : public Fl_Widget { double get_tilt_angle(); - double get_scale(); + double get_focal_length_35mm(); double get_height_dist_ratio(); diff --git a/src/GipfelWidget.cxx b/src/GipfelWidget.cxx index a1982d5..f38b21c 100644 --- a/src/GipfelWidget.cxx +++ b/src/GipfelWidget.cxx @@ -114,7 +114,7 @@ GipfelWidget::load_image(char *file) { set_nick_angle(md->get_nick()); set_tilt_angle(md->get_tilt()); set_projection((Projection::Projection_t) md->get_projection_type()); - set_scale(md->get_focallength_sensor_ratio() * img->w()); + set_focal_length_35mm(md->get_focal_length_35mm()); delete md; @@ -144,7 +144,7 @@ GipfelWidget::save_image(char *file) { md->set_direction(get_center_angle()); md->set_nick(get_nick_angle()); md->set_tilt(get_tilt_angle()); - md->set_focallength_sensor_ratio(get_scale() / (double) img->w()); + md->set_focal_length_35mm(get_focal_length_35mm()); md->set_projection_type((int) get_projection()); ret = md->save_image(img_file, file); @@ -469,8 +469,8 @@ GipfelWidget::set_tilt_angle(double a) { } void -GipfelWidget::set_scale(double s) { - pan->set_scale(s); +GipfelWidget::set_focal_length_35mm(double s) { + pan->set_scale(s * (double) img->w() / 35.0); set_labels(pan->get_visible_mountains()); redraw(); } @@ -503,8 +503,8 @@ GipfelWidget::get_tilt_angle() { } double -GipfelWidget::get_scale() { - return pan->get_scale(); +GipfelWidget::get_focal_length_35mm() { + return pan->get_scale() * 35.0 / (double) img->w(); } double diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H index 7116d98..48d5043 100644 --- a/src/ImageMetaData.H +++ b/src/ImageMetaData.H @@ -28,7 +28,7 @@ class ImageMetaData { double direction; double nick; double tilt; - double focallength_sensor_ratio; + double focal_length_35mm; double scale; int projection_type; @@ -48,7 +48,7 @@ class ImageMetaData { double get_direction(); double get_nick(); double get_tilt(); - double get_focallength_sensor_ratio(); + double get_focal_length_35mm(); int get_projection_type(); void set_longitude(double v); @@ -57,7 +57,7 @@ class ImageMetaData { void set_direction(double v); void set_nick(double v); void set_tilt(double v); - void set_focallength_sensor_ratio(double v); + void set_focal_length_35mm(double v); void set_projection_type(int v); }; #endif diff --git a/src/ImageMetaData.cxx b/src/ImageMetaData.cxx index d78493d..a5d3726 100644 --- a/src/ImageMetaData.cxx +++ b/src/ImageMetaData.cxx @@ -37,7 +37,7 @@ ImageMetaData::ImageMetaData() { direction = 0.0; nick = 0.0; tilt = 0.0; - focallength_sensor_ratio = 1.0; + focal_length_35mm = 35.0; scale = NAN; projection_type = 0; } @@ -49,7 +49,7 @@ ImageMetaData::load_image(char *name, int img_width) { ret = load_image_jpgcom(name); if (ret == 2) { // old format - focallength_sensor_ratio = scale / (double) img_width; + focal_length_35mm = scale * 35.0 / (double) img_width; } else if (ret == 1) { // get reasonable defaults from exif data ret = load_image_exif(name); } @@ -111,7 +111,7 @@ ImageMetaData::load_image_exif(char *name) { switch(id) { case EXIF_FOCAL_LENGTH_IN_35MM_FILM: - focallength_sensor_ratio = atof(val) / 35.0; + focal_length_35mm = atof(val); break; case EXIF_GPS_LONGITUDE: longitude = degminsecstr2double(val); @@ -137,7 +137,7 @@ ImageMetaData::load_image_exif(char *name) { #define GIPFEL_FORMAT_1 "gipfel: longitude %lf, latitude %lf, height %lf, direction %lf, nick %lf, tilt %lf, scale %lf, projection type %d" -#define GIPFEL_FORMAT_2 "gipfel: longitude %lf, latitude %lf, height %lf, direction %lf, nick %lf, tilt %lf, focallength_sensor_ratio %lf, projection type %d" +#define GIPFEL_FORMAT_2 "gipfel: longitude %lf, latitude %lf, height %lf, direction %lf, nick %lf, tilt %lf, focal_length_35mm %lf, projection type %d" int ImageMetaData::load_image_jpgcom(char *name) { @@ -167,7 +167,7 @@ ImageMetaData::load_image_jpgcom(char *name) { direction = dir; nick = ni; tilt = ti; - focallength_sensor_ratio = fr; + focal_length_35mm = fr; projection_type = pt; ret = 0; @@ -238,7 +238,7 @@ ImageMetaData::save_image_jpgcom(char *in_img, char *out_img) { direction, nick, tilt, - focallength_sensor_ratio, + focal_length_35mm, projection_type); // try to save gipfel data in JPEG comment section @@ -303,8 +303,8 @@ ImageMetaData::get_tilt() { } double -ImageMetaData::get_focallength_sensor_ratio() { - return focallength_sensor_ratio; +ImageMetaData::get_focal_length_35mm() { + return focal_length_35mm; } int @@ -343,8 +343,8 @@ ImageMetaData::set_tilt(double v) { } void -ImageMetaData::set_focallength_sensor_ratio(double v) { - focallength_sensor_ratio = v; +ImageMetaData::set_focal_length_35mm(double v) { + focal_length_35mm = v; } void diff --git a/src/gipfel.cxx b/src/gipfel.cxx index 13ef3e5..dc15d8e 100644 --- a/src/gipfel.cxx +++ b/src/gipfel.cxx @@ -58,7 +58,7 @@ char *data_file = DEFAULT_DATAFILE; GipfelWidget *gipf = NULL; Fl_Dial *s_center = NULL; -Fl_Slider *s_nick, *s_scale, *s_tilt, *s_height_dist, *s_track_width; +Fl_Slider *s_nick, *s_focal_length, *s_tilt, *s_height_dist, *s_track_width; Fl_Value_Input *i_view_lat, *i_view_long, *i_view_height; Fl_Box *b_viewpoint; Fl_Menu_Bar *mb; @@ -72,7 +72,7 @@ static int stitch(int stitch_w, int stitch_h, int type, const char *path, void set_values() { s_center->value(gipf->get_center_angle()); s_nick->value(gipf->get_nick_angle()); - s_scale->value(gipf->get_scale()); + s_focal_length->value(gipf->get_focal_length_35mm()); s_tilt->value(gipf->get_tilt_angle()); s_height_dist->value(gipf->get_height_dist_ratio()); i_view_lat->value(gipf->get_view_lat()); @@ -114,8 +114,8 @@ void save_cb() { } } -void scale_cb(Fl_Slider* o, void*) { - gipf->set_scale(o->value()); +void focal_length_cb(Fl_Slider* o, void*) { + gipf->set_focal_length_35mm(o->value()); } void angle_cb(Fl_Slider* o, void*) { @@ -245,15 +245,15 @@ create_control_window() { Fl_Box *west = new Fl_Box(0, 125, 40, 20, "West"); - s_scale = new Fl_Value_Slider(235, 60, 160, 15, "Scale"); - s_scale->type(1); - s_scale->box(FL_THIN_DOWN_BOX); - s_scale->labelsize(10); - s_scale->step(5.0); - s_scale->bounds(0.0, 10000.0); - s_scale->slider(FL_UP_BOX); - s_scale->callback((Fl_Callback*)scale_cb); - s_scale->align(FL_ALIGN_TOP); + s_focal_length = new Fl_Value_Slider(235, 60, 160, 15, "Focal Length In 35mm"); + s_focal_length->type(1); + s_focal_length->box(FL_THIN_DOWN_BOX); + s_focal_length->labelsize(10); + s_focal_length->step(0.01); + s_focal_length->bounds(1.0, 200.0); + s_focal_length->slider(FL_UP_BOX); + s_focal_length->callback((Fl_Callback*)focal_length_cb); + s_focal_length->align(FL_ALIGN_TOP); s_nick = new Fl_Value_Slider(235, 90, 160, 15, "Nick (deg.)"); s_nick->type(1); -- cgit v1.2.3 From 364fadcbea5f37799bb42e663106e3a007746984 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 20:45:53 +0100 Subject: strip copyright --- src/Fl_Search_Chooser.H | 20 -------------------- src/Fl_Search_Chooser.cxx | 21 --------------------- src/Fl_Value_Dial.H | 20 -------------------- src/Fl_Value_Dial.cxx | 20 -------------------- src/GipfelWidget.H | 18 ------------------ src/GipfelWidget.cxx | 18 ------------------ src/Hill.H | 18 ------------------ src/Hill.cxx | 18 ------------------ src/ImageMetaData.H | 18 ------------------ src/ImageMetaData.cxx | 18 ------------------ src/JPEGOutputImage.H | 18 ------------------ src/JPEGOutputImage.cxx | 18 ------------------ src/OutputImage.H | 18 ------------------ src/OutputImage.cxx | 18 ------------------ src/Panorama.H | 18 ------------------ src/Panorama.cxx | 18 ------------------ src/PreviewOutputImage.H | 18 ------------------ src/PreviewOutputImage.cxx | 18 ------------------ src/Projection.H | 18 ------------------ src/Projection.cxx | 18 ------------------ src/ProjectionSphaeric.H | 18 ------------------ src/ProjectionSphaeric.cxx | 19 ------------------- src/ProjectionTangential.H | 18 ------------------ src/ProjectionTangential.cxx | 18 ------------------ src/Stitch.H | 18 ------------------ src/Stitch.cxx | 18 ------------------ src/TIFFOutputImage.H | 18 ------------------ src/TIFFOutputImage.cxx | 18 ------------------ src/ViewParams.H | 18 ------------------ src/choose_hill.H | 18 ------------------ src/choose_hill.cxx | 21 --------------------- src/gipfel.cxx | 20 -------------------- 32 files changed, 591 deletions(-) (limited to 'src/gipfel.cxx') diff --git a/src/Fl_Search_Chooser.H b/src/Fl_Search_Chooser.H index c87f0de..c5e88d9 100644 --- a/src/Fl_Search_Chooser.H +++ b/src/Fl_Search_Chooser.H @@ -1,23 +1,3 @@ -// -// Value dial header file for the Fast Light Tool Kit (FLTK). -// -// Copyright 1998-2004 by Bill Spitzak and others. -// -// 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 FL_SEARCH_CHOOSER_H #define FL_SEARCH_CHOOSER_H diff --git a/src/Fl_Search_Chooser.cxx b/src/Fl_Search_Chooser.cxx index 62aa7d1..f1cd6c3 100644 --- a/src/Fl_Search_Chooser.cxx +++ b/src/Fl_Search_Chooser.cxx @@ -1,24 +1,3 @@ -// -// Search Chooser widget for the Fast Light Tool Kit (FLTK). -// -// Copyright 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. -// -// #include #include diff --git a/src/Fl_Value_Dial.H b/src/Fl_Value_Dial.H index f9ac18c..71e32a4 100644 --- a/src/Fl_Value_Dial.H +++ b/src/Fl_Value_Dial.H @@ -1,23 +1,3 @@ -// -// Value dial header file for the Fast Light Tool Kit (FLTK). -// -// Copyright 1998-2004 by Bill Spitzak and others. -// -// 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 Fl_Value_Dial_H #define Fl_Value_Dial_H diff --git a/src/Fl_Value_Dial.cxx b/src/Fl_Value_Dial.cxx index c837930..482ec2e 100644 --- a/src/Fl_Value_Dial.cxx +++ b/src/Fl_Value_Dial.cxx @@ -1,23 +1,3 @@ -// -// Value dial widget for the Fast Light Tool Kit (FLTK). -// -// Copyright 1998-2004 by Bill Spitzak and others. -// -// 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. -// #include #include diff --git a/src/GipfelWidget.H b/src/GipfelWidget.H index f4c2850..86e8d07 100644 --- a/src/GipfelWidget.H +++ b/src/GipfelWidget.H @@ -1,21 +1,3 @@ -// -// Copyright 2006 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 GipfelWidget_H #define GipfelWidget_H diff --git a/src/GipfelWidget.cxx b/src/GipfelWidget.cxx index f38b21c..30320de 100644 --- a/src/GipfelWidget.cxx +++ b/src/GipfelWidget.cxx @@ -1,21 +1,3 @@ -// -// Copyright 2006 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. -// #include #include diff --git a/src/Hill.H b/src/Hill.H index 13d7d64..5c8aca7 100644 --- a/src/Hill.H +++ b/src/Hill.H @@ -1,21 +1,3 @@ -// -// 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 HILL_H #define HILL_H diff --git a/src/Hill.cxx b/src/Hill.cxx index 277cefe..5ec35ee 100644 --- a/src/Hill.cxx +++ b/src/Hill.cxx @@ -1,21 +1,3 @@ -// -// 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. -// #include #include diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H index 48d5043..6cb16fe 100644 --- a/src/ImageMetaData.H +++ b/src/ImageMetaData.H @@ -1,21 +1,3 @@ -// -// Copyright 2006 by Johannes Hofmann -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU 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 IMAGE_META_DATA_H #define IMAGE_META_DATA_H diff --git a/src/ImageMetaData.cxx b/src/ImageMetaData.cxx index a5d3726..6d66954 100644 --- a/src/ImageMetaData.cxx +++ b/src/ImageMetaData.cxx @@ -1,21 +1,3 @@ -// -// Copyright 2006 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. -// #include #include diff --git a/src/JPEGOutputImage.H b/src/JPEGOutputImage.H index 50570e5..4a9e60f 100644 --- a/src/JPEGOutputImage.H +++ b/src/JPEGOutputImage.H @@ -1,21 +1,3 @@ -// -// Copyright 2006 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 JPEGOUTPUTIMAGE_H #define JPEGOUTPUTIMAGE_H diff --git a/src/JPEGOutputImage.cxx b/src/JPEGOutputImage.cxx index 3f7fd11..7ca4cb5 100644 --- a/src/JPEGOutputImage.cxx +++ b/src/JPEGOutputImage.cxx @@ -1,21 +1,3 @@ -// -// Copyright 2006 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. -// #include #include diff --git a/src/OutputImage.H b/src/OutputImage.H index 8792eb6..bae0ff5 100644 --- a/src/OutputImage.H +++ b/src/OutputImage.H @@ -1,21 +1,3 @@ -// -// Copyright 2006 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 OUTPUTIMAGE_H #define OUTPUTIMAGE_H diff --git a/src/OutputImage.cxx b/src/OutputImage.cxx index f2e7296..e4da537 100644 --- a/src/OutputImage.cxx +++ b/src/OutputImage.cxx @@ -1,21 +1,3 @@ -// -// Copyright 2006 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. -// #include #include diff --git a/src/Panorama.H b/src/Panorama.H index a538809..3f8312a 100644 --- a/src/Panorama.H +++ b/src/Panorama.H @@ -1,21 +1,3 @@ -// -// 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 PANORAMA_H #define PANORAMA_H diff --git a/src/Panorama.cxx b/src/Panorama.cxx index ebf0b5b..f964e40 100644 --- a/src/Panorama.cxx +++ b/src/Panorama.cxx @@ -1,21 +1,3 @@ -// -// 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. -// #include #include diff --git a/src/PreviewOutputImage.H b/src/PreviewOutputImage.H index 7095999..5852730 100644 --- a/src/PreviewOutputImage.H +++ b/src/PreviewOutputImage.H @@ -1,21 +1,3 @@ -// -// Copyright 2006 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 PREVIEWOUTPUTIMAGE_H #define PREVIEWOUTPUTIMAGE_H diff --git a/src/PreviewOutputImage.cxx b/src/PreviewOutputImage.cxx index 8b09e80..3caef7f 100644 --- a/src/PreviewOutputImage.cxx +++ b/src/PreviewOutputImage.cxx @@ -1,21 +1,3 @@ -// -// Copyright 2006 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. -// #include #include diff --git a/src/Projection.H b/src/Projection.H index 0a6ec81..cb9bc7e 100644 --- a/src/Projection.H +++ b/src/Projection.H @@ -1,21 +1,3 @@ -// -// Copyright 2006 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 PROJECTION_H #define PROJECTION_H diff --git a/src/Projection.cxx b/src/Projection.cxx index 1916d55..d6dbd34 100644 --- a/src/Projection.cxx +++ b/src/Projection.cxx @@ -1,21 +1,3 @@ -// -// Copyright 2006 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. -// #include #include diff --git a/src/ProjectionSphaeric.H b/src/ProjectionSphaeric.H index 06396f1..49fc74d 100644 --- a/src/ProjectionSphaeric.H +++ b/src/ProjectionSphaeric.H @@ -1,21 +1,3 @@ -// -// 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 PROJECTIONSPHAERIC_H #define PROJECTIONSPHAERIC_H diff --git a/src/ProjectionSphaeric.cxx b/src/ProjectionSphaeric.cxx index e69882b..dbbcec6 100644 --- a/src/ProjectionSphaeric.cxx +++ b/src/ProjectionSphaeric.cxx @@ -1,22 +1,3 @@ -// -// 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. -// - #include #include #include diff --git a/src/ProjectionTangential.H b/src/ProjectionTangential.H index e74511f..77c10d7 100644 --- a/src/ProjectionTangential.H +++ b/src/ProjectionTangential.H @@ -1,21 +1,3 @@ -// -// 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 PROJECTIONTANGENTIAL_H #define PROJECTIONTANGENTIAL_H diff --git a/src/ProjectionTangential.cxx b/src/ProjectionTangential.cxx index 2578c5a..230662a 100644 --- a/src/ProjectionTangential.cxx +++ b/src/ProjectionTangential.cxx @@ -1,21 +1,3 @@ -// -// 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. -// #include #include diff --git a/src/Stitch.H b/src/Stitch.H index 0bb6d48..2fbde1f 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -1,21 +1,3 @@ -// -// 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 diff --git a/src/Stitch.cxx b/src/Stitch.cxx index af46968..ec1daf6 100644 --- a/src/Stitch.cxx +++ b/src/Stitch.cxx @@ -1,21 +1,3 @@ -// -// Copyright 2006 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. -// #include #include diff --git a/src/TIFFOutputImage.H b/src/TIFFOutputImage.H index 3a14279..1c9aad8 100644 --- a/src/TIFFOutputImage.H +++ b/src/TIFFOutputImage.H @@ -1,21 +1,3 @@ -// -// Copyright 2006 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 TIFFOUTPUTIMAGE_H #define TIFFOUTPUTIMAGE_H diff --git a/src/TIFFOutputImage.cxx b/src/TIFFOutputImage.cxx index b8433ca..b528521 100644 --- a/src/TIFFOutputImage.cxx +++ b/src/TIFFOutputImage.cxx @@ -1,21 +1,3 @@ -// -// Copyright 2006 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. -// #include #include diff --git a/src/ViewParams.H b/src/ViewParams.H index 37c5e48..ba24f22 100644 --- a/src/ViewParams.H +++ b/src/ViewParams.H @@ -1,21 +1,3 @@ -// -// 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 VIEWPARAMS_H #define VIEWPARAMS_H diff --git a/src/choose_hill.H b/src/choose_hill.H index e424d70..76fb018 100644 --- a/src/choose_hill.H +++ b/src/choose_hill.H @@ -1,21 +1,3 @@ -// -// Copyright 1998-2004 by Bill Spitzak and others. -// -// 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 CHOOSE_HILL_H #define CHOOSE_HILL_H diff --git a/src/choose_hill.cxx b/src/choose_hill.cxx index f144d5e..9162e40 100644 --- a/src/choose_hill.cxx +++ b/src/choose_hill.cxx @@ -1,24 +1,3 @@ -// -// Search Chooser widget for the Fast Light Tool Kit (FLTK). -// -// Copyright 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. -// -// #include #include diff --git a/src/gipfel.cxx b/src/gipfel.cxx index dc15d8e..3ec7290 100644 --- a/src/gipfel.cxx +++ b/src/gipfel.cxx @@ -1,23 +1,3 @@ -// -// gipfel program. -// -// Copyright 2006 by Johannes Hofmann -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This program 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 -// General Public License for more details. -// -// You should have received a copy of the GNU 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. -// #include #include -- cgit v1.2.3 From 6c50749f40e50a4b6a260a262b40035bfe83fd76 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 20:49:30 +0100 Subject: add simplified copyright --- src/Fl_Search_Chooser.H | 5 +++++ src/Fl_Search_Chooser.cxx | 5 +++++ src/Fl_Value_Dial.H | 5 +++++ src/Fl_Value_Dial.cxx | 5 +++++ src/GipfelWidget.H | 5 +++++ src/GipfelWidget.cxx | 5 +++++ src/Hill.H | 5 +++++ src/Hill.cxx | 5 +++++ src/ImageMetaData.H | 5 +++++ src/ImageMetaData.cxx | 5 +++++ src/JPEGOutputImage.H | 5 +++++ src/JPEGOutputImage.cxx | 5 +++++ src/OutputImage.H | 5 +++++ src/OutputImage.cxx | 5 +++++ src/Panorama.H | 5 +++++ src/Panorama.cxx | 5 +++++ src/PreviewOutputImage.H | 5 +++++ src/PreviewOutputImage.cxx | 5 +++++ src/Projection.H | 5 +++++ src/Projection.cxx | 5 +++++ src/ProjectionSphaeric.H | 5 +++++ src/ProjectionSphaeric.cxx | 5 +++++ src/ProjectionTangential.H | 5 +++++ src/ProjectionTangential.cxx | 5 +++++ src/Stitch.H | 5 +++++ src/Stitch.cxx | 5 +++++ src/TIFFOutputImage.H | 5 +++++ src/TIFFOutputImage.cxx | 5 +++++ src/ViewParams.H | 5 +++++ src/choose_hill.H | 5 +++++ src/choose_hill.cxx | 5 +++++ src/gipfel.cxx | 5 +++++ 32 files changed, 160 insertions(+) (limited to 'src/gipfel.cxx') diff --git a/src/Fl_Search_Chooser.H b/src/Fl_Search_Chooser.H index c5e88d9..d3478c2 100644 --- a/src/Fl_Search_Chooser.H +++ b/src/Fl_Search_Chooser.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef FL_SEARCH_CHOOSER_H #define FL_SEARCH_CHOOSER_H diff --git a/src/Fl_Search_Chooser.cxx b/src/Fl_Search_Chooser.cxx index f1cd6c3..28396a0 100644 --- a/src/Fl_Search_Chooser.cxx +++ b/src/Fl_Search_Chooser.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/Fl_Value_Dial.H b/src/Fl_Value_Dial.H index 71e32a4..35a3adf 100644 --- a/src/Fl_Value_Dial.H +++ b/src/Fl_Value_Dial.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef Fl_Value_Dial_H #define Fl_Value_Dial_H diff --git a/src/Fl_Value_Dial.cxx b/src/Fl_Value_Dial.cxx index 482ec2e..773cb58 100644 --- a/src/Fl_Value_Dial.cxx +++ b/src/Fl_Value_Dial.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/GipfelWidget.H b/src/GipfelWidget.H index 86e8d07..4b3166e 100644 --- a/src/GipfelWidget.H +++ b/src/GipfelWidget.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef GipfelWidget_H #define GipfelWidget_H diff --git a/src/GipfelWidget.cxx b/src/GipfelWidget.cxx index 30320de..2927cde 100644 --- a/src/GipfelWidget.cxx +++ b/src/GipfelWidget.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/Hill.H b/src/Hill.H index 5c8aca7..37ab44a 100644 --- a/src/Hill.H +++ b/src/Hill.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef HILL_H #define HILL_H diff --git a/src/Hill.cxx b/src/Hill.cxx index 5ec35ee..14b8f81 100644 --- a/src/Hill.cxx +++ b/src/Hill.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H index 6cb16fe..5796964 100644 --- a/src/ImageMetaData.H +++ b/src/ImageMetaData.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef IMAGE_META_DATA_H #define IMAGE_META_DATA_H diff --git a/src/ImageMetaData.cxx b/src/ImageMetaData.cxx index 6d66954..6519239 100644 --- a/src/ImageMetaData.cxx +++ b/src/ImageMetaData.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/JPEGOutputImage.H b/src/JPEGOutputImage.H index 4a9e60f..b3554c8 100644 --- a/src/JPEGOutputImage.H +++ b/src/JPEGOutputImage.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef JPEGOUTPUTIMAGE_H #define JPEGOUTPUTIMAGE_H diff --git a/src/JPEGOutputImage.cxx b/src/JPEGOutputImage.cxx index 7ca4cb5..6e685d0 100644 --- a/src/JPEGOutputImage.cxx +++ b/src/JPEGOutputImage.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/OutputImage.H b/src/OutputImage.H index bae0ff5..9be72c5 100644 --- a/src/OutputImage.H +++ b/src/OutputImage.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef OUTPUTIMAGE_H #define OUTPUTIMAGE_H diff --git a/src/OutputImage.cxx b/src/OutputImage.cxx index e4da537..ddf8e14 100644 --- a/src/OutputImage.cxx +++ b/src/OutputImage.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/Panorama.H b/src/Panorama.H index 3f8312a..80a8f69 100644 --- a/src/Panorama.H +++ b/src/Panorama.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef PANORAMA_H #define PANORAMA_H diff --git a/src/Panorama.cxx b/src/Panorama.cxx index f964e40..4674c47 100644 --- a/src/Panorama.cxx +++ b/src/Panorama.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/PreviewOutputImage.H b/src/PreviewOutputImage.H index 5852730..8b41684 100644 --- a/src/PreviewOutputImage.H +++ b/src/PreviewOutputImage.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef PREVIEWOUTPUTIMAGE_H #define PREVIEWOUTPUTIMAGE_H diff --git a/src/PreviewOutputImage.cxx b/src/PreviewOutputImage.cxx index 3caef7f..4b1d993 100644 --- a/src/PreviewOutputImage.cxx +++ b/src/PreviewOutputImage.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/Projection.H b/src/Projection.H index cb9bc7e..6db0e97 100644 --- a/src/Projection.H +++ b/src/Projection.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef PROJECTION_H #define PROJECTION_H diff --git a/src/Projection.cxx b/src/Projection.cxx index d6dbd34..88ec5bf 100644 --- a/src/Projection.cxx +++ b/src/Projection.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/ProjectionSphaeric.H b/src/ProjectionSphaeric.H index 49fc74d..f80940a 100644 --- a/src/ProjectionSphaeric.H +++ b/src/ProjectionSphaeric.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef PROJECTIONSPHAERIC_H #define PROJECTIONSPHAERIC_H diff --git a/src/ProjectionSphaeric.cxx b/src/ProjectionSphaeric.cxx index dbbcec6..d4e7e43 100644 --- a/src/ProjectionSphaeric.cxx +++ b/src/ProjectionSphaeric.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include #include diff --git a/src/ProjectionTangential.H b/src/ProjectionTangential.H index 77c10d7..07ddaf9 100644 --- a/src/ProjectionTangential.H +++ b/src/ProjectionTangential.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef PROJECTIONTANGENTIAL_H #define PROJECTIONTANGENTIAL_H diff --git a/src/ProjectionTangential.cxx b/src/ProjectionTangential.cxx index 230662a..230767c 100644 --- a/src/ProjectionTangential.cxx +++ b/src/ProjectionTangential.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/Stitch.H b/src/Stitch.H index 2fbde1f..d29c2e9 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef STITCH_H #define STITCH_H diff --git a/src/Stitch.cxx b/src/Stitch.cxx index ec1daf6..f378747 100644 --- a/src/Stitch.cxx +++ b/src/Stitch.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/TIFFOutputImage.H b/src/TIFFOutputImage.H index 1c9aad8..820a281 100644 --- a/src/TIFFOutputImage.H +++ b/src/TIFFOutputImage.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef TIFFOUTPUTIMAGE_H #define TIFFOUTPUTIMAGE_H diff --git a/src/TIFFOutputImage.cxx b/src/TIFFOutputImage.cxx index b528521..cc1b289 100644 --- a/src/TIFFOutputImage.cxx +++ b/src/TIFFOutputImage.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/ViewParams.H b/src/ViewParams.H index ba24f22..b6f34a2 100644 --- a/src/ViewParams.H +++ b/src/ViewParams.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef VIEWPARAMS_H #define VIEWPARAMS_H diff --git a/src/choose_hill.H b/src/choose_hill.H index 76fb018..2425fa3 100644 --- a/src/choose_hill.H +++ b/src/choose_hill.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef CHOOSE_HILL_H #define CHOOSE_HILL_H diff --git a/src/choose_hill.cxx b/src/choose_hill.cxx index 9162e40..d3477f3 100644 --- a/src/choose_hill.cxx +++ b/src/choose_hill.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include diff --git a/src/gipfel.cxx b/src/gipfel.cxx index 3ec7290..343d19f 100644 --- a/src/gipfel.cxx +++ b/src/gipfel.cxx @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #include #include -- cgit v1.2.3 From 09419b6f28bb7058c43501d1e1e10b71ef2499ab Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 21:48:01 +0100 Subject: increase max focal length --- src/gipfel.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gipfel.cxx') diff --git a/src/gipfel.cxx b/src/gipfel.cxx index 343d19f..3c204b7 100644 --- a/src/gipfel.cxx +++ b/src/gipfel.cxx @@ -230,12 +230,12 @@ create_control_window() { Fl_Box *west = new Fl_Box(0, 125, 40, 20, "West"); - s_focal_length = new Fl_Value_Slider(235, 60, 160, 15, "Focal Length In 35mm"); + s_focal_length = new Fl_Value_Slider(235, 60, 160, 15, "Focal Length in 35mm"); s_focal_length->type(1); s_focal_length->box(FL_THIN_DOWN_BOX); s_focal_length->labelsize(10); s_focal_length->step(0.01); - s_focal_length->bounds(1.0, 200.0); + s_focal_length->bounds(1.0, 300.0); s_focal_length->slider(FL_UP_BOX); s_focal_length->callback((Fl_Callback*)focal_length_cb); s_focal_length->align(FL_ALIGN_TOP); -- cgit v1.2.3 From 3065ecc1e1c44770ecad9e4bf29c4b71f0a2bc52 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 22:19:08 +0100 Subject: reindent --- src/gipfel.cxx | 687 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 344 insertions(+), 343 deletions(-) (limited to 'src/gipfel.cxx') diff --git a/src/gipfel.cxx b/src/gipfel.cxx index 3c204b7..6eb4ee9 100644 --- a/src/gipfel.cxx +++ b/src/gipfel.cxx @@ -52,426 +52,427 @@ Fl_Menu_Bar *mb; #define STITCH_JPEG 2 #define STITCH_TIFF 4 static int stitch(int stitch_w, int stitch_h, int type, const char *path, - int argc, char **argv); + int argc, char **argv); void set_values() { - s_center->value(gipf->get_center_angle()); - s_nick->value(gipf->get_nick_angle()); - s_focal_length->value(gipf->get_focal_length_35mm()); - s_tilt->value(gipf->get_tilt_angle()); - s_height_dist->value(gipf->get_height_dist_ratio()); - i_view_lat->value(gipf->get_view_lat()); - i_view_long->value(gipf->get_view_long()); - i_view_height->value(gipf->get_view_height()); - b_viewpoint->label(gipf->get_viewpoint()); - if (gipf->get_projection() == Projection::TANGENTIAL) { - mb->mode(8, FL_MENU_RADIO|FL_MENU_VALUE); - mb->mode(9, FL_MENU_RADIO); - } else { - mb->mode(9, FL_MENU_RADIO|FL_MENU_VALUE); - mb->mode(8, FL_MENU_RADIO); - } + s_center->value(gipf->get_center_angle()); + s_nick->value(gipf->get_nick_angle()); + s_focal_length->value(gipf->get_focal_length_35mm()); + s_tilt->value(gipf->get_tilt_angle()); + s_height_dist->value(gipf->get_height_dist_ratio()); + i_view_lat->value(gipf->get_view_lat()); + i_view_long->value(gipf->get_view_long()); + i_view_height->value(gipf->get_view_height()); + b_viewpoint->label(gipf->get_viewpoint()); + if (gipf->get_projection() == Projection::TANGENTIAL) { + mb->mode(8, FL_MENU_RADIO|FL_MENU_VALUE); + mb->mode(9, FL_MENU_RADIO); + } else { + mb->mode(9, FL_MENU_RADIO|FL_MENU_VALUE); + mb->mode(8, FL_MENU_RADIO); + } } void quit_cb() { - exit(0); + exit(0); } void open_cb() { - char *file = fl_file_chooser("Open File?", "*.jpg", img_file); - if(file != NULL) { - gipf->load_image(file); - set_values(); - } + char *file = fl_file_chooser("Open File?", "*.jpg", img_file); + if(file != NULL) { + gipf->load_image(file); + set_values(); + } } void track_cb() { - char *file = fl_file_chooser("Track File?", NULL, NULL); - if (gipf->load_track(file) == 0) { - s_track_width->activate(); - } + char *file = fl_file_chooser("Track File?", NULL, NULL); + if (gipf->load_track(file) == 0) { + s_track_width->activate(); + } } void save_cb() { - char *file = fl_file_chooser("Save Image As?", NULL, NULL); - if (file) { - gipf->save_image(file); - } + char *file = fl_file_chooser("Save Image As?", NULL, NULL); + if (file) { + gipf->save_image(file); + } } void focal_length_cb(Fl_Slider* o, void*) { - gipf->set_focal_length_35mm(o->value()); + gipf->set_focal_length_35mm(o->value()); } void angle_cb(Fl_Slider* o, void*) { - gipf->set_center_angle(o->value()); + gipf->set_center_angle(o->value()); } void nick_cb(Fl_Slider* o, void*) { - gipf->set_nick_angle(o->value()); + gipf->set_nick_angle(o->value()); } void tilt_cb(Fl_Slider* o, void*) { - gipf->set_tilt_angle(o->value()); + gipf->set_tilt_angle(o->value()); } void h_d_cb(Fl_Slider* o, void*) { - gipf->set_height_dist_ratio(o->value()); + gipf->set_height_dist_ratio(o->value()); } void view_lat_cb(Fl_Value_Input* o, void*) { - gipf->set_view_lat(o->value()); + gipf->set_view_lat(o->value()); } void view_long_cb(Fl_Value_Input* o, void*) { - gipf->set_view_long(o->value()); + gipf->set_view_long(o->value()); } void view_height_cb(Fl_Value_Input* o, void*) { - gipf->set_view_height(o->value()); + gipf->set_view_height(o->value()); } void track_width_cb(Fl_Value_Input* o, void*) { - gipf->set_track_width(o->value()); + gipf->set_track_width(o->value()); } void viewpoint_cb(Fl_Value_Input* o, void*) { - Hill *m = choose_hill(gipf->get_mountains(), "Choose Viewpoint"); - if (m) { - gipf->set_viewpoint(m); - set_values(); - } + Hill *m = choose_hill(gipf->get_mountains(), "Choose Viewpoint"); + if (m) { + gipf->set_viewpoint(m); + set_values(); + } } void proj_cb(Fl_Value_Input* o, void*d) { - if(d == NULL) { - gipf->set_projection(Projection::TANGENTIAL); - } else { - gipf->set_projection(Projection::SPHAERIC); - } + if(d == NULL) { + gipf->set_projection(Projection::TANGENTIAL); + } else { + gipf->set_projection(Projection::SPHAERIC); + } } void hidden_cb(Fl_Menu_* o, void*d) { - gipf->set_show_hidden(o->mvalue()->value()); + gipf->set_show_hidden(o->mvalue()->value()); } void comp_cb(Fl_Widget *, void *) { - gipf->comp_params(); - set_values(); + gipf->comp_params(); + set_values(); } void guess_cb(Fl_Widget *, void *) { - gipf->guess(); - set_values(); + gipf->guess(); + set_values(); } void about_cb() { - fl_message("gipfel -- and you know what you see.\n" - "Version %s\n\n" - "(c) Johannes Hofmann 2006\n\n" - "Default datafile by http://www.alpin-koordinaten.de\n", - VERSION); + fl_message("gipfel -- and you know what you see.\n" + "Version %s\n\n" + "(c) Johannes Hofmann 2006\n\n" + "Default datafile by http://www.alpin-koordinaten.de\n", + VERSION); } void fill_menubar(Fl_Menu_Bar* mb) { - mb->add("&File/L&oad Image", FL_CTRL+'o', (Fl_Callback*)open_cb); - mb->add("&File/&Save Image", FL_CTRL+'s', (Fl_Callback*)save_cb); - mb->add("&File/Choose &Viewpoint", FL_CTRL+'v', (Fl_Callback*)viewpoint_cb); - mb->add("&File/Load &Track", FL_CTRL+'t', (Fl_Callback*)track_cb); - mb->add("&File/&Quit", FL_CTRL+'q', (Fl_Callback*)quit_cb); + mb->add("&File/L&oad Image", FL_CTRL+'o', (Fl_Callback*)open_cb); + mb->add("&File/&Save Image", FL_CTRL+'s', (Fl_Callback*)save_cb); + mb->add("&File/Choose &Viewpoint", FL_CTRL+'v', (Fl_Callback*)viewpoint_cb); + mb->add("&File/Load &Track", FL_CTRL+'t', (Fl_Callback*)track_cb); + mb->add("&File/&Quit", FL_CTRL+'q', (Fl_Callback*)quit_cb); + mb->add("&Projection/Normal Projection", 0, (Fl_Callback *)proj_cb, + (void *)0, FL_MENU_RADIO|FL_MENU_VALUE); + mb->add("&Projection/Panoramic Projection", 0, (Fl_Callback *)proj_cb, + (void *)1, FL_MENU_RADIO); - mb->add("&Projection/Normal Projection", 0, (Fl_Callback *)proj_cb, - (void *)0, FL_MENU_RADIO|FL_MENU_VALUE); - mb->add("&Projection/Panoramic Projection", 0, (Fl_Callback *)proj_cb, - (void *)1, FL_MENU_RADIO); + mb->add("&Option/Show Hidden", 0, (Fl_Callback *) hidden_cb, + (void *)0, FL_MENU_TOGGLE); - mb->add("&Option/Show Hidden", 0, (Fl_Callback *) hidden_cb, - (void *)0, FL_MENU_TOGGLE); - - mb->add("&Help/About", 0, (Fl_Callback*)about_cb); + mb->add("&Help/About", 0, (Fl_Callback*)about_cb); } void usage() { - fprintf(stderr, - "usage: gipfel [-v ] [-d ]\n" - " [-s] [-j ] [-t ] [-h ]\n" - " []\n" - " -v Set point from which the picture was taken.\n" - " This must be a string that unambiguously \n" - " matches the name of an entry in the data file.\n" - " -d Use for GPS data.\n" - " -s Stitch mode.\n" - " -w Width of result image.\n" - " -h Height of result image.\n" - " -j JPEG output file for Stitch mode.\n" - " -t Output directory for TIFF images in Stitch mode.\n" - " JPEG file(s) to use.\n"); + fprintf(stderr, + "usage: gipfel [-v ] [-d ]\n" + " [-s] [-j ] [-t ] [-h ]\n" + " []\n" + " -v Set point from which the picture was taken.\n" + " This must be a string that unambiguously \n" + " matches the name of an entry in the data file.\n" + " -d Use for GPS data.\n" + " -s Stitch mode.\n" + " -w Width of result image.\n" + " -h Height of result image.\n" + " -j JPEG output file for Stitch mode.\n" + " -t Output directory for TIFF images in Stitch mode.\n" + " JPEG file(s) to use.\n"); } Fl_Window * create_control_window() { - Fl_Window *win = new Fl_Window(400,350); - mb = new Fl_Menu_Bar(0, 0, 400, 30); - fill_menubar(mb); - - s_center = new Fl_Value_Dial(40, 60, 150, 150, NULL); - s_center->type(FL_LINE_DIAL); - s_center->labelsize(10); - s_center->step(0.01); - s_center->bounds(0.0, 360.0); - s_center->angles(180, 540); - s_center->callback((Fl_Callback*)angle_cb); - - Fl_Box *north = new Fl_Box(95, 40, 40, 20, "North"); - Fl_Box *south = new Fl_Box(95, 210, 40, 20, "South"); - Fl_Box *east = new Fl_Box(190, 125, 40, 20, "East"); - Fl_Box *west = new Fl_Box(0, 125, 40, 20, "West"); - - - s_focal_length = new Fl_Value_Slider(235, 60, 160, 15, "Focal Length in 35mm"); - s_focal_length->type(1); - s_focal_length->box(FL_THIN_DOWN_BOX); - s_focal_length->labelsize(10); - s_focal_length->step(0.01); - s_focal_length->bounds(1.0, 300.0); - s_focal_length->slider(FL_UP_BOX); - s_focal_length->callback((Fl_Callback*)focal_length_cb); - s_focal_length->align(FL_ALIGN_TOP); - - s_nick = new Fl_Value_Slider(235, 90, 160, 15, "Nick (deg.)"); - s_nick->type(1); - s_nick->box(FL_THIN_DOWN_BOX); - s_nick->labelsize(10); - s_nick->step(0.01); - s_nick->bounds(-20.0, 20.0); - s_nick->slider(FL_UP_BOX); - s_nick->callback((Fl_Callback*)nick_cb); - s_nick->align(FL_ALIGN_TOP); - - s_tilt = new Fl_Value_Slider(235, 120, 160, 15, "Tilt (deg.)"); - s_tilt->type(1); - s_tilt->box(FL_THIN_DOWN_BOX); - s_tilt->labelsize(10); - s_tilt->step(0.01); - s_tilt->bounds(-10.0, 10.0); - s_tilt->slider(FL_UP_BOX); - s_tilt->callback((Fl_Callback*)tilt_cb); - s_tilt->align(FL_ALIGN_TOP); - - s_height_dist = new Fl_Value_Slider(235, 150, 160, 15, "Visibility"); - s_height_dist->type(1); - s_height_dist->box(FL_THIN_DOWN_BOX); - s_height_dist->labelsize(10); - s_height_dist->step(-0.001); - s_height_dist->bounds(0.1, 0.01); - s_height_dist->slider(FL_UP_BOX); - s_height_dist->callback((Fl_Callback*)h_d_cb); - s_height_dist->align(FL_ALIGN_TOP); - - s_track_width = new Fl_Value_Slider(235, 180, 160, 15, "Track Width"); - s_track_width->type(1); - s_track_width->box(FL_THIN_DOWN_BOX); - s_track_width->labelsize(10); - s_track_width->step(1.0); - s_track_width->bounds(1.0, 500.0); - s_track_width->value(200.0); - s_track_width->slider(FL_UP_BOX); - s_track_width->callback((Fl_Callback*)track_width_cb); - s_track_width->align(FL_ALIGN_TOP); - s_track_width->deactivate(); - // Viewpoint Stuff - - b_viewpoint = new Fl_Box(FL_DOWN_BOX, 30, 255, 300, 80, ""); - b_viewpoint->align(FL_ALIGN_TOP); - - i_view_lat = new Fl_Value_Input(40, 270, 100, 20, "Latitude"); - i_view_lat->labelsize(10); - i_view_lat->align(FL_ALIGN_TOP); - i_view_lat->when(FL_WHEN_ENTER_KEY); - i_view_lat->callback((Fl_Callback*)view_lat_cb); - - i_view_long = new Fl_Value_Input(200, 270, 100, 20, "Longitude"); - i_view_long->labelsize(10); - i_view_long->align(FL_ALIGN_TOP); - i_view_long->when(FL_WHEN_ENTER_KEY); - i_view_long->callback((Fl_Callback*)view_long_cb); - - i_view_height = new Fl_Value_Input(40, 310, 80, 20, "Height"); - i_view_height->labelsize(10); - i_view_height->align(FL_ALIGN_TOP); - i_view_height->when(FL_WHEN_ENTER_KEY); - i_view_height->callback((Fl_Callback*)view_height_cb); - - // Buttons - Fl_Button *b = new Fl_Button(240, 210, 60, 20, "comp"); - b->color(FL_RED); - b->callback(comp_cb); - Fl_Button *b1 = new Fl_Button(320, 210, 60, 20, "guess"); - b1->callback(guess_cb); - b1->color(FL_GREEN); - - win->end(); - return win; + Fl_Window *win = new Fl_Window(400,350); + mb = new Fl_Menu_Bar(0, 0, 400, 30); + fill_menubar(mb); + + s_center = new Fl_Value_Dial(40, 60, 150, 150, NULL); + s_center->type(FL_LINE_DIAL); + s_center->labelsize(10); + s_center->step(0.01); + s_center->bounds(0.0, 360.0); + s_center->angles(180, 540); + s_center->callback((Fl_Callback*)angle_cb); + + Fl_Box *north = new Fl_Box(95, 40, 40, 20, "North"); + Fl_Box *south = new Fl_Box(95, 210, 40, 20, "South"); + Fl_Box *east = new Fl_Box(190, 125, 40, 20, "East"); + Fl_Box *west = new Fl_Box(0, 125, 40, 20, "West"); + + + s_focal_length = new Fl_Value_Slider(235, 60, 160, 15, "Focal Length in 35mm"); + s_focal_length->type(1); + s_focal_length->box(FL_THIN_DOWN_BOX); + s_focal_length->labelsize(10); + s_focal_length->step(0.01); + s_focal_length->bounds(1.0, 300.0); + s_focal_length->slider(FL_UP_BOX); + s_focal_length->callback((Fl_Callback*)focal_length_cb); + s_focal_length->align(FL_ALIGN_TOP); + + s_nick = new Fl_Value_Slider(235, 90, 160, 15, "Nick (deg.)"); + s_nick->type(1); + s_nick->box(FL_THIN_DOWN_BOX); + s_nick->labelsize(10); + s_nick->step(0.01); + s_nick->bounds(-20.0, 20.0); + s_nick->slider(FL_UP_BOX); + s_nick->callback((Fl_Callback*)nick_cb); + s_nick->align(FL_ALIGN_TOP); + + s_tilt = new Fl_Value_Slider(235, 120, 160, 15, "Tilt (deg.)"); + s_tilt->type(1); + s_tilt->box(FL_THIN_DOWN_BOX); + s_tilt->labelsize(10); + s_tilt->step(0.01); + s_tilt->bounds(-10.0, 10.0); + s_tilt->slider(FL_UP_BOX); + s_tilt->callback((Fl_Callback*)tilt_cb); + s_tilt->align(FL_ALIGN_TOP); + + s_height_dist = new Fl_Value_Slider(235, 150, 160, 15, "Visibility"); + s_height_dist->type(1); + s_height_dist->box(FL_THIN_DOWN_BOX); + s_height_dist->labelsize(10); + s_height_dist->step(-0.001); + s_height_dist->bounds(0.1, 0.01); + s_height_dist->slider(FL_UP_BOX); + s_height_dist->callback((Fl_Callback*)h_d_cb); + s_height_dist->align(FL_ALIGN_TOP); + + s_track_width = new Fl_Value_Slider(235, 180, 160, 15, "Track Width"); + s_track_width->type(1); + s_track_width->box(FL_THIN_DOWN_BOX); + s_track_width->labelsize(10); + s_track_width->step(1.0); + s_track_width->bounds(1.0, 500.0); + s_track_width->value(200.0); + s_track_width->slider(FL_UP_BOX); + s_track_width->callback((Fl_Callback*)track_width_cb); + s_track_width->align(FL_ALIGN_TOP); + s_track_width->deactivate(); + // Viewpoint Stuff + + b_viewpoint = new Fl_Box(FL_DOWN_BOX, 30, 255, 300, 80, ""); + b_viewpoint->align(FL_ALIGN_TOP); + + i_view_lat = new Fl_Value_Input(40, 270, 100, 20, "Latitude"); + i_view_lat->labelsize(10); + i_view_lat->align(FL_ALIGN_TOP); + i_view_lat->when(FL_WHEN_ENTER_KEY); + i_view_lat->callback((Fl_Callback*)view_lat_cb); + + i_view_long = new Fl_Value_Input(200, 270, 100, 20, "Longitude"); + i_view_long->labelsize(10); + i_view_long->align(FL_ALIGN_TOP); + i_view_long->when(FL_WHEN_ENTER_KEY); + i_view_long->callback((Fl_Callback*)view_long_cb); + + i_view_height = new Fl_Value_Input(40, 310, 80, 20, "Height"); + i_view_height->labelsize(10); + i_view_height->align(FL_ALIGN_TOP); + i_view_height->when(FL_WHEN_ENTER_KEY); + i_view_height->callback((Fl_Callback*)view_height_cb); + + // Buttons + Fl_Button *b = new Fl_Button(240, 210, 60, 20, "comp"); + b->color(FL_RED); + b->callback(comp_cb); + Fl_Button *b1 = new Fl_Button(320, 210, 60, 20, "guess"); + b1->callback(guess_cb); + b1->color(FL_GREEN); + + win->end(); + return win; } int main(int argc, char** argv) { - char c, *sep, *tmp, **my_argv; - char *view_point = NULL; - int err, bflag = 0, dflag = 0, my_argc; - int stitch_flag = 0, stitch_w = 2000, stitch_h = 500; - int jpeg_flag = 0, tiff_flag = 0; - char *outpath; - Fl_Window *control_win, *view_win; - Fl_Scroll *scroll; - - - err = 0; - while ((c = getopt(argc, argv, "?d:v:sw:h:j:t:")) != EOF) { - switch (c) { - case '?': - usage(); - exit(0); - break; - case 'd': - data_file = optarg; - break; - case 'v': - view_point = optarg; - break; - case 's': - stitch_flag++; - break; - case 'j': - jpeg_flag++; - outpath = optarg; - break; - case 't': - tiff_flag++; - outpath = optarg; - break; - case 'w': - stitch_w = atoi(optarg); - break; - case 'h': - stitch_h = atoi(optarg); - break; - default: - err++; - } - } - - - my_argc = argc - optind; - my_argv = argv + optind; - - if (my_argc >= 1) { - img_file = my_argv[0]; - } - - if (data_file == NULL || err) { - usage(); - exit(1); - } - - if (stitch_flag) { - int type = STITCH_PREVIEW; - if (jpeg_flag) { - type = STITCH_JPEG; - } else if (tiff_flag) { - type = STITCH_TIFF; - } - stitch(stitch_w, stitch_h, type, outpath, my_argc, my_argv); - exit(0); - } - - Fl::get_system_colors(); - if (getenv("FLTK_SCHEME")) { - Fl::scheme(NULL); - } else { - Fl::scheme("plastic"); - } - - control_win = create_control_window(); - - view_win = new Fl_Window(800, 600); - - // The Fl_Group is used to avoid FL_DAMAGE_ALL in Fl_Scroll::position - Fl_Group *g = new Fl_Group(0, 0, view_win->w(), view_win->h()); - view_win->resizable(g); - scroll = new Fl_Scroll(0, 0, view_win->w(), view_win->h()); - - gipf = new GipfelWidget(0,0,800,600); - if (img_file) { - gipf->load_image(img_file); - } - - view_win->size(gipf->w(), gipf->h()); - scroll->size(gipf->w(), gipf->h()); - - gipf->load_data(data_file); - scroll->end(); - - set_values(); - - view_win->resizable(scroll); - - view_win->end(); - view_win->show(1, argv); - control_win->show(1, argv); - - if (view_point) { - gipf->set_viewpoint(view_point); - } else if (img_file && - (isnan(gipf->get_view_lat()) || isnan(gipf->get_view_long()))) { - viewpoint_cb(NULL, NULL); - } - - return Fl::run(); + char c, *sep, *tmp, **my_argv; + char *view_point = NULL; + int err, bflag = 0, dflag = 0, my_argc; + int stitch_flag = 0, stitch_w = 2000, stitch_h = 500; + int jpeg_flag = 0, tiff_flag = 0; + char *outpath; + Fl_Window *control_win, *view_win; + Fl_Scroll *scroll; + + + err = 0; + while ((c = getopt(argc, argv, "?d:v:sw:h:j:t:")) != EOF) { + switch (c) { + case '?': + usage(); + exit(0); + break; + case 'd': + data_file = optarg; + break; + case 'v': + view_point = optarg; + break; + case 's': + stitch_flag++; + break; + case 'j': + jpeg_flag++; + outpath = optarg; + break; + case 't': + tiff_flag++; + outpath = optarg; + break; + case 'w': + stitch_w = atoi(optarg); + break; + case 'h': + stitch_h = atoi(optarg); + break; + default: + err++; + } + } + + + my_argc = argc - optind; + my_argv = argv + optind; + + if (my_argc >= 1) { + img_file = my_argv[0]; + } + + if (data_file == NULL || err) { + usage(); + exit(1); + } + + if (stitch_flag) { + int type = STITCH_PREVIEW; + if (jpeg_flag) { + type = STITCH_JPEG; + } else if (tiff_flag) { + type = STITCH_TIFF; + } + stitch(stitch_w, stitch_h, type, outpath, my_argc, my_argv); + exit(0); + } + + Fl::get_system_colors(); + if (getenv("FLTK_SCHEME")) { + Fl::scheme(NULL); + } else { + Fl::scheme("plastic"); + } + + control_win = create_control_window(); + + view_win = new Fl_Window(800, 600); + + // The Fl_Group is used to avoid FL_DAMAGE_ALL in Fl_Scroll::position + Fl_Group *g = new Fl_Group(0, 0, view_win->w(), view_win->h()); + view_win->resizable(g); + scroll = new Fl_Scroll(0, 0, view_win->w(), view_win->h()); + + gipf = new GipfelWidget(0,0,800,600); + if (img_file) { + gipf->load_image(img_file); + } + + view_win->size(gipf->w(), gipf->h()); + scroll->size(gipf->w(), gipf->h()); + + gipf->load_data(data_file); + scroll->end(); + + set_values(); + + view_win->resizable(scroll); + + view_win->end(); + view_win->show(1, argv); + control_win->show(1, argv); + + if (view_point) { + gipf->set_viewpoint(view_point); + } else if (img_file && + (isnan(gipf->get_view_lat()) || isnan(gipf->get_view_long()))) { + viewpoint_cb(NULL, NULL); + } + + return Fl::run(); } static int stitch(int stitch_w, int stitch_h, int type, const char *path, int argc, char **argv) { - Fl_Window *win; - Fl_Scroll *scroll; - Stitch *st = new Stitch(); - - for (int i=0; iload_image(argv[i]); - } - - if (type == STITCH_JPEG) { - - st->set_output((OutputImage*) new JPEGOutputImage(path, 90)); - st->resample(stitch_w, stitch_h, 0.0, 7.0); - - } else if (type == STITCH_TIFF) { - - for (int i=0; iset_output(argv[i], (OutputImage*) new TIFFOutputImage(buf)); - } - - st->resample(stitch_w, stitch_h, 0.0, 7.0); - - } else { - win = new Fl_Window(0,0, stitch_w, stitch_h); - scroll = new Fl_Scroll(0, 0, win->w(), win->h()); - PreviewOutputImage *img = new PreviewOutputImage(0, 0, stitch_w, stitch_h); - win->resizable(scroll); - win->show(0, argv); - st->set_output((OutputImage*) img); - st->resample(stitch_w, stitch_h, 0.0, 7.0); - img->redraw(); - Fl::run(); - } - - return 0; + Fl_Window *win; + Fl_Scroll *scroll; + Stitch *st = new Stitch(); + + for (int i=0; iload_image(argv[i]); + } + + if (type == STITCH_JPEG) { + + st->set_output((OutputImage*) new JPEGOutputImage(path, 90)); + st->resample(stitch_w, stitch_h, 0.0, 7.0); + + } else if (type == STITCH_TIFF) { + + for (int i=0; iset_output(argv[i], (OutputImage*) new TIFFOutputImage(buf)); + } + + st->resample(stitch_w, stitch_h, 0.0, 7.0); + + } else { + win = new Fl_Window(0,0, stitch_w, stitch_h); + scroll = new Fl_Scroll(0, 0, win->w(), win->h()); + PreviewOutputImage *img = + new PreviewOutputImage(0, 0, stitch_w, stitch_h); + + win->resizable(scroll); + win->show(0, argv); + st->set_output((OutputImage*) img); + st->resample(stitch_w, stitch_h, 0.0, 7.0); + img->redraw(); + Fl::run(); + } + + return 0; } -- cgit v1.2.3 From a10646b1c87e6abc1651ae7160ddd2c7fd1753bc Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 22:38:13 +0100 Subject: set window title bar --- configure.ac | 2 +- src/gipfel.cxx | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/gipfel.cxx') diff --git a/configure.ac b/configure.ac index 1b5d0ac..27e4908 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(gipfel, 0.1.3, Johannes.Hofmann@gmx.de) +AC_INIT(gipfel, 0.2.0, Johannes.Hofmann@gmx.de) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/Panorama.H]) AC_CONFIG_HEADER(config.h) diff --git a/src/gipfel.cxx b/src/gipfel.cxx index 6eb4ee9..cf43af7 100644 --- a/src/gipfel.cxx +++ b/src/gipfel.cxx @@ -42,6 +42,7 @@ char *img_file; char *data_file = DEFAULT_DATAFILE; GipfelWidget *gipf = NULL; +Fl_Window *control_win, *view_win; Fl_Dial *s_center = NULL; Fl_Slider *s_nick, *s_focal_length, *s_tilt, *s_height_dist, *s_track_width; Fl_Value_Input *i_view_lat, *i_view_long, *i_view_height; @@ -81,6 +82,8 @@ void open_cb() { char *file = fl_file_chooser("Open File?", "*.jpg", img_file); if(file != NULL) { gipf->load_image(file); + view_win->label(file); + control_win->label(file); set_values(); } } @@ -322,7 +325,6 @@ int main(int argc, char** argv) { int stitch_flag = 0, stitch_w = 2000, stitch_h = 500; int jpeg_flag = 0, tiff_flag = 0; char *outpath; - Fl_Window *control_win, *view_win; Fl_Scroll *scroll; @@ -404,6 +406,8 @@ int main(int argc, char** argv) { gipf = new GipfelWidget(0,0,800,600); if (img_file) { gipf->load_image(img_file); + view_win->label(img_file); + control_win->label(img_file); } view_win->size(gipf->w(), gipf->h()); -- cgit v1.2.3