diff options
| author | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2006-11-26 17:22:42 +0100 |
|---|---|---|
| committer | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2006-11-26 17:22:42 +0100 |
| commit | 2aaf6d31566df56d30ee492418562e04732c8059 (patch) | |
| tree | 3062dd55798ec76edb095c4f83abecd27c7da328 /src/ProjectionSphaeric.H | |
| parent | ceec61fe9614b7fb631781c3f9d21894e084077b (diff) | |
| parent | a10646b1c87e6abc1651ae7160ddd2c7fd1753bc (diff) | |
merge with mainline
Diffstat (limited to 'src/ProjectionSphaeric.H')
| -rw-r--r-- | src/ProjectionSphaeric.H | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/src/ProjectionSphaeric.H b/src/ProjectionSphaeric.H index 06396f1..c6ce5f4 100644 --- a/src/ProjectionSphaeric.H +++ b/src/ProjectionSphaeric.H @@ -1,21 +1,8 @@ -// -// 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. +// Copyright 2006 Johannes Hofmann <Johannes.Hofmann@gmx.de> // +// 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 @@ -24,17 +11,17 @@ #include "Projection.H" class ProjectionSphaeric : public Projection { - private: + private: - double comp_scale(const Hill *m1, const Hill *m2, double d_m1_m2_2); - double comp_dir_view(const Hill *m1, const Hill *m2, double d_m1_2, double d_m2_2, double scale, double sign3); - double comp_nick_view(const Hill *m1, const Hill *m2, double d_m1_2, double scale, double dir_view, double sign1); - double comp_tilt_view(const Hill *m, double scale, double dir_view, double nick_view); + double comp_scale(const Hill *m1, const Hill *m2, double d_m1_m2_2); + double comp_dir_view(const Hill *m1, const Hill *m2, double d_m1_2, double d_m2_2, double scale, double sign3); + double comp_nick_view(const Hill *m1, const Hill *m2, double d_m1_2, double scale, double dir_view, double sign1); + double comp_tilt_view(const Hill *m, double scale, double dir_view, double nick_view); - public: - void get_coordinates(double a_view, double a_nick, const ViewParams *parms, - double *x, double *y); + public: + void get_coordinates(double a_view, double a_nick, const ViewParams *parms, + double *x, double *y); - int comp_params(const Hill *m1, const Hill *m2, ViewParams *parms); + int comp_params(const Hill *m1, const Hill *m2, ViewParams *parms); }; #endif |