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/Panorama.H | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/Panorama.H') 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 -- 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/Panorama.H | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/Panorama.H') 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 -- cgit v1.2.3 From f8fb82ba705f6314d502b8efc8f03ecd16b8bed8 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 22:27:04 +0100 Subject: more reindent --- src/Panorama.H | 140 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 70 insertions(+), 70 deletions(-) (limited to 'src/Panorama.H') diff --git a/src/Panorama.H b/src/Panorama.H index 80a8f69..81cdf8e 100644 --- a/src/Panorama.H +++ b/src/Panorama.H @@ -14,122 +14,122 @@ class Panorama { - private: - double view_phi, view_lam, view_height; - char *view_name; - double height_dist_ratio; - double view_angle; - double hide_value; - Hills *mountains; - Hills *close_mountains; - Hills *visible_mountains; - ViewParams parms; - Projection::Projection *proj; - Projection::Projection_t projection_type; - - Hill * get_pos(const char *name); + private: + double view_phi, view_lam, view_height; + char *view_name; + double height_dist_ratio; + double view_angle; + double hide_value; + Hills *mountains; + Hills *close_mountains; + Hills *visible_mountains; + ViewParams parms; + Projection::Projection *proj; + Projection::Projection_t projection_type; - void update_angles(); + Hill * get_pos(const char *name); - void update_coordinates(); + void update_angles(); - void update_close_mountains(); + void update_coordinates(); - void update_visible_mountains(); - - void mark_hidden(Hills *hills); + void update_close_mountains(); - double distance(double phi, double lam); + void update_visible_mountains(); - double sin_alpha(double lam, double phi, double c); + void mark_hidden(Hills *hills); - double cos_alpha(double phi, double c); + double distance(double phi, double lam); - double alpha(double phi, double lam); + double sin_alpha(double lam, double phi, double c); - double nick(double dist, double height); - - double comp_center_angle(double alph_a, double alph_b, double d1, double d2); + double cos_alpha(double phi, double c); - double comp_scale(double alph_a, double alph_b, double d1, double d2); + double alpha(double phi, double lam); - int get_matrix(double m[]); + double nick(double dist, double height); - int optimize(Hill *m1, Hill *m2); + double comp_center_angle(double alph_a, double alph_b, double d1, double d2); - double get_value(Hills *p); + double comp_scale(double alph_a, double alph_b, double d1, double d2); - double pi_d, deg2rad; + int get_matrix(double m[]); - public: - Panorama(); + int optimize(Hill *m1, Hill *m2); - ~Panorama(); - - int load_data(const char *name); + double get_value(Hills *p); - void add_hills(Hills *h); + double pi_d, deg2rad; - void remove_trackpoints(); + public: + Panorama(); - int set_viewpoint(const char *pos); + ~Panorama(); - void set_viewpoint(const Hill *m); + int load_data(const char *name); - void set_height_dist_ratio(double r); + void add_hills(Hills *h); - void set_hide_value(double h); + void remove_trackpoints(); - Hills * get_mountains(); + int set_viewpoint(const char *pos); - Hills * get_close_mountains(); + void set_viewpoint(const Hill *m); - Hills * get_visible_mountains(); + void set_height_dist_ratio(double r); - void set_center_angle(double a); + void set_hide_value(double h); - void set_nick_angle(double a); + Hills * get_mountains(); - void set_tilt_angle(double a); + Hills * get_close_mountains(); - void set_scale(double s); + Hills * get_visible_mountains(); - void set_view_lat(double v); + void set_center_angle(double a); - void set_view_long(double v); + void set_nick_angle(double a); - void set_view_height(double v); + void set_tilt_angle(double a); - const char * get_viewpoint(); + void set_scale(double s); - double get_center_angle(); + void set_view_lat(double v); - double get_nick_angle(); + void set_view_long(double v); - double get_tilt_angle(); + void set_view_height(double v); - double get_scale(); + const char * get_viewpoint(); - double get_height_dist_ratio(); - - double get_view_lat(); + double get_center_angle(); - double get_view_long(); + double get_nick_angle(); - double get_view_height(); + double get_tilt_angle(); - double get_earth_radius(Hill *m); + double get_scale(); - double get_real_distance(Hill *m); + double get_height_dist_ratio(); - int comp_params(Hill *m1, Hill *m2); + double get_view_lat(); - int guess(Hills *p1, Hill *m1); + double get_view_long(); - Projection::Projection_t get_projection(); + double get_view_height(); - void set_projection(Projection::Projection_t p); + double get_earth_radius(Hill *m); - int get_coordinates(double a_view, double a_nick, double *x, double *y); + double get_real_distance(Hill *m); + + int comp_params(Hill *m1, Hill *m2); + + int guess(Hills *p1, Hill *m1); + + Projection::Projection_t get_projection(); + + void set_projection(Projection::Projection_t p); + + int get_coordinates(double a_view, double a_nick, double *x, double *y); }; #endif -- cgit v1.2.3