From c07cca69bbd203eaff54da76b2fd89b460e71b06 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Mon, 15 Aug 2005 12:07:30 +0100
Subject: remove duplicate include

---
 src/gipfel.cxx | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/gipfel.cxx b/src/gipfel.cxx
index 221bcec..dc53fd3 100644
--- a/src/gipfel.cxx
+++ b/src/gipfel.cxx
@@ -32,8 +32,6 @@
 #include <errno.h>
 #include <signal.h>
 
-#include "../config.h"
-
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Scroll.H>
-- 
cgit v1.2.3


From 629ccf74c82978cf3dafa104fac26673fb234489 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Mon, 15 Aug 2005 12:16:31 +0100
Subject: set focus on input of Fl_Search_Chooser add label to input field

---
 src/Fl_Search_Chooser.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Fl_Search_Chooser.cxx b/src/Fl_Search_Chooser.cxx
index bfcf7fb..bc77309 100644
--- a/src/Fl_Search_Chooser.cxx
+++ b/src/Fl_Search_Chooser.cxx
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Button.H>
 #include "Fl_Search_Chooser.H"
@@ -86,13 +87,14 @@ Fl_Search_Chooser::Fl_Search_Chooser(const char *title) {
   Fl_Group *g = new Fl_Group(10, 10, w->w() - 10, w->h() - 10);
   sb = new Fl_Search_Browser(g->x(), g->y(), g->w() , g->h() - 100, NULL);
   sb->type(FL_HOLD_BROWSER);
-  Fl_Input *in = new Fl_Input(g->x(), g->h() - 80, g->w()-10, 20);
+  Fl_Input *in = new Fl_Input(g->x()+50, g->h()-80, g->w()-80, 20, "Search");
   in->callback((Fl_Callback*) input_cb, this);
   in->when(FL_WHEN_CHANGED);
   Fl_Button *cancel_b = new Fl_Button(g->w()-200, g->h()-30, 80, 20, "Cancel");
   cancel_b->callback((Fl_Callback*) cancel_cb, this);
   Fl_Button *ok_b = new Fl_Button(g->w()-100, g->h()-30, 80, 20, "Ok");
   ok_b->callback((Fl_Callback*) ok_cb, this);
+  Fl::focus(in);
   g->end();
   w->end();
 }
-- 
cgit v1.2.3


From ab1525fe2636193e4365bb64a75ea7a6e812aab8 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Mon, 15 Aug 2005 12:17:47 +0100
Subject: remove debug output

---
 src/gipfel.cxx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/gipfel.cxx b/src/gipfel.cxx
index dc53fd3..8d7d98a 100644
--- a/src/gipfel.cxx
+++ b/src/gipfel.cxx
@@ -327,7 +327,6 @@ int main(int argc, char** argv) {
     exit(1);
   }
 
-fprintf(stderr, "%s\n", data_file);
   control_win = create_control_window();
 
   view_win = new Fl_Window(800, 600);
-- 
cgit v1.2.3


From f716b3111ee6ea482449c54829acf82fbf6495fc Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Mon, 15 Aug 2005 12:25:42 +0100
Subject: popup "choose viewpoint" window, if no viewpoint is given

---
 src/gipfel.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/gipfel.cxx b/src/gipfel.cxx
index 8d7d98a..37eaaf4 100644
--- a/src/gipfel.cxx
+++ b/src/gipfel.cxx
@@ -340,9 +340,6 @@ int main(int argc, char** argv) {
   }
 
   gipf->load_data(data_file);
-  if (view_point) {
-    gipf->set_viewpoint(view_point);
-  }
   scroll->end();  
 
   set_values();
@@ -352,6 +349,12 @@ int main(int argc, char** argv) {
   view_win->end();
   view_win->show(1, argv); 
   control_win->show(1, argv); 
+
+  if (view_point) {
+    gipf->set_viewpoint(view_point);
+  } else if (gipf->get_view_lat() == 0.0 && gipf->get_view_long() == 0.0) {
+    viewpoint_cb(NULL, NULL);
+  }
   
   return Fl::run();
 }
-- 
cgit v1.2.3