summaryrefslogtreecommitdiff
path: root/src/Hill.H
diff options
context:
space:
mode:
Diffstat (limited to 'src/Hill.H')
-rw-r--r--src/Hill.H115
1 files changed, 51 insertions, 64 deletions
diff --git a/src/Hill.H b/src/Hill.H
index 13d7d64..2e95def 100644
--- a/src/Hill.H
+++ b/src/Hill.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 HILL_H
#define HILL_H
@@ -24,69 +11,69 @@
class Hill;
class Hill {
- private:
-
- public:
- typedef enum {
- DUPLICATE = 0x01,
- TRACK_POINT = 0x02,
- VISIBLE = 0x04,
- HIDDEN = 0x08
- } flags_t;
-
- double phi, lam;
- double height;
- double alph;
- double a_view;
- double a_nick;
- double dist;
- int x, y;
- int label_x, label_y;
- char *name;
- int flags;
-
- Hill(const char *n, double p, double l, double h);
-
- Hill(const Hill& h);
-
- Hill(int x_tmp, int y_tmp);
-
- ~Hill();
+ private:
+
+ public:
+ typedef enum {
+ DUPLICATE = 0x01,
+ TRACK_POINT = 0x02,
+ VISIBLE = 0x04,
+ HIDDEN = 0x08
+ } flags_t;
+
+ double phi, lam;
+ double height;
+ double alph;
+ double a_view;
+ double a_nick;
+ double dist;
+ int x, y;
+ int label_x, label_y;
+ char *name;
+ int flags;
+
+ Hill(const char *n, double p, double l, double h);
+
+ Hill(const Hill& h);
+
+ Hill(int x_tmp, int y_tmp);
+
+ ~Hill();
};
class Hills {
- private:
- int num, cap;
- Hill **m;
+ private:
+ int num, cap;
+ Hill **m;
+
+ public:
+ Hills();
+
+ Hills(const Hills *h);
- public:
- Hills();
+ ~Hills();
- Hills(const Hills *h);
+ int load(const char *file);
- ~Hills();
+ void mark_duplicates(double dist);
- int load(const char *file);
+ void add(Hill *m);
- void mark_duplicates(double dist);
+ void add(Hills *h);
- void add(Hill *m);
+ void sort_phi();
- void add(Hills *h);
+ void sort_name();
- void sort_phi();
+ void sort();
- void sort_name();
+ void clear();
- void sort();
-
- void clear();
+ void clobber();
- void clobber();
+ int get_num();
- int get_num();
-
- Hill *get(int n);
+ Hill *get(int n);
};
#endif