summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2009-03-26 11:35:12 +0100
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2009-03-26 11:35:12 +0100
commit4a6583ea047c6404624637ce81b4c515c7c4fe6d (patch)
tree1449702a21724892145b31e9f0d2769c3606a2da /src
parent18d7d8d4cecaed1143b2e09b192b406762bf4c2f (diff)
implement Find Peak dialog
Diffstat (limited to 'src')
-rw-r--r--src/GipfelWidget.H4
-rw-r--r--src/GipfelWidget.cxx42
2 files changed, 27 insertions, 19 deletions
diff --git a/src/GipfelWidget.H b/src/GipfelWidget.H
index f8e242e..0e4c97f 100644
--- a/src/GipfelWidget.H
+++ b/src/GipfelWidget.H
@@ -19,12 +19,12 @@ class GipfelWidget : public Fl_Group {
Hills *track_points;
Hills *known_hills;
Panorama *pan;
- Fl_Menu_Button *mb;
char *img_file;
double track_width;
int have_gipfel_info;
ImageMetaData *md;
int show_hidden;
+ int mouse_x, mouse_y;
char focused_mountain_label[128];
int handle(int event);
@@ -48,7 +48,7 @@ class GipfelWidget : public Fl_Group {
static int get_pixel(Fl_Image *img, int x, int y,
int *r, int *g, int *b);
- static void center_cb(Fl_Widget *o, void *f);
+ static void find_peak_cb(Fl_Widget *o, void *f);
public:
typedef enum {
diff --git a/src/GipfelWidget.cxx b/src/GipfelWidget.cxx
index b895ecb..31162ef 100644
--- a/src/GipfelWidget.cxx
+++ b/src/GipfelWidget.cxx
@@ -40,7 +40,6 @@ GipfelWidget::GipfelWidget(int X,int Y,int W, int H): Fl_Group(X, Y, W, H) {
pan = new Panorama();
cur_mountain = NULL;
focused_mountain = NULL;
- mb = NULL;
known_hills = new Hills();
img_file = NULL;
track_width = 200.0;
@@ -49,6 +48,7 @@ GipfelWidget::GipfelWidget(int X,int Y,int W, int H): Fl_Group(X, Y, W, H) {
md = new ImageMetaData();
track_points = NULL;
fl_register_images();
+ mouse_x = mouse_y = 0;
}
int
@@ -76,11 +76,6 @@ GipfelWidget::load_image(char *file) {
h(img->h());
w(img->w());
- mb = new Fl_Menu_Button(x(),y(),w()+x(),h()+y(),"&popup");
- mb->type(Fl_Menu_Button::POPUP3);
- mb->box(FL_NO_BOX);
- mb->add("Center Peak", 0, (Fl_Callback*) center_cb, this);
-
// try to retrieve gipfel data from JPEG meta data
md->load_image(file);
set_view_long(md->longitude());
@@ -516,15 +511,21 @@ GipfelWidget::get_focal_length_35mm() {
}
void
-GipfelWidget::center_cb(Fl_Widget *o, void *f) {
+GipfelWidget::find_peak_cb(Fl_Widget *, void *f) {
GipfelWidget *g = (GipfelWidget*) f;
- Hill *m = choose_hill(g->pan->get_close_mountains(), "Center Peak");
+ Hill *m = choose_hill(g->pan->get_close_mountains(), "Find Peak");
if (m) {
- g->set_center_angle(m->alph / deg2rad);
-
if (!g->known_hills->contains(m))
g->known_hills->add(m);
+
+ m->flags |= Hill::VISIBLE;
+ if (! g->pan->get_visible_mountains()->contains(m))
+ g->pan->get_visible_mountains()->add(m);
+ g->set_labels(g->pan->get_visible_mountains());
+
+ g->cur_mountain = m;
+ g->set_mountain(g->mouse_x, g->mouse_y);
}
}
@@ -598,23 +599,30 @@ GipfelWidget::set_track_width(double w) {
int
GipfelWidget::handle(int event) {
- int mark_x, mark_y;
Hill *m;
switch(event) {
case FL_PUSH:
- mark_x = Fl::event_x()-x();
- mark_y = Fl::event_y()-y();
- if (Fl::event_button() == 1) {
- m = find_mountain(known_hills, mark_x, mark_y);
+ mouse_x = Fl::event_x()-x();
+ mouse_y = Fl::event_y()-y();
+ if (Fl::event_button() == FL_LEFT_MOUSE) {
+ m = find_mountain(known_hills, mouse_x, mouse_y);
if (m)
cur_mountain = m;
- } else if (Fl::event_button() == 2) {
- toggle_known_mountain(mark_x, mark_y);
+ } else if (Fl::event_button() == FL_MIDDLE_MOUSE) {
+ toggle_known_mountain(mouse_x, mouse_y);
if (focused_mountain) {
focused_mountain = NULL;
redraw();
}
+ } else if (Fl::event_button() == FL_RIGHT_MOUSE) {
+ Fl_Menu_Item rclick_menu[] = {
+ {"Find Peak", 0, find_peak_cb, this},
+ {0}
+ };
+ const Fl_Menu_Item *mi = rclick_menu->popup(Fl::event_x(), Fl::event_y(), 0, 0, 0);
+ if (mi)
+ mi->do_callback(0, mi->user_data());
}
Fl::focus(this);