From 7b58a6debdec0d9d9309d63154c0016e66757982 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Wed, 17 Jan 2007 10:00:56 +0100
Subject: remove marker stuff (guess)
---
NEWS | 4 ++++
src/GipfelWidget.H | 1 -
src/GipfelWidget.cxx | 16 ----------------
3 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/NEWS b/NEWS
index 9d0106c..974b818 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
gipfel ChangeLog
=================
+
+gipfel-0.2.1
+ - Improve "Choose Viewpoint" dialog.
+
gipfel-0.2.0
- Change scale factor to "focal length in 35mm" this makes it
independent of the image size. One can now scale an already
diff --git a/src/GipfelWidget.H b/src/GipfelWidget.H
index fa82803..3671a87 100644
--- a/src/GipfelWidget.H
+++ b/src/GipfelWidget.H
@@ -16,7 +16,6 @@ class GipfelWidget : public Fl_Widget {
private:
Fl_Image *img;
Hill *cur_mountain;
- Hills *marker;
Hills *track_points;
Hills *known_hills;
Panorama *pan;
diff --git a/src/GipfelWidget.cxx b/src/GipfelWidget.cxx
index 9d43f7b..a8efa97 100644
--- a/src/GipfelWidget.cxx
+++ b/src/GipfelWidget.cxx
@@ -45,16 +45,11 @@ GipfelWidget::GipfelWidget(int X,int Y,int W, int H): Fl_Widget(X, Y, W, H) {
pan = new Panorama();
cur_mountain = NULL;
mb = NULL;
- marker = new Hills();
known_hills = new Hills();
img_file = NULL;
track_width = 200.0;
show_hidden = 0;
md = new ImageMetaData();
-
- for (i=0; i<=3; i++) {
- marker->add(new Hill(i * 10, 0));
- }
track_points = NULL;
fl_register_images();
}
@@ -406,17 +401,6 @@ GipfelWidget::toggle_known_mountain(int m_x, int m_y) {
}
}
- for (i=0; i<marker->get_num(); i++) {
- m = marker->get(i);
-
- if (m_x - center_x >= m->x - 2 && m_x - center_x < m->x + 2 &&
- m_y - center_y >= m->y - 2 && m_y - center_y < m->y + 2) {
- cur_mountain = m;
- redraw();
- return 0;
- }
- }
-
cur_mountain = NULL;
redraw();
return 1;
--
cgit v1.2.3