diff --git a/iPDC/Makefile b/iPDC/Makefile
index cddb40d..989288c 100755
--- a/iPDC/Makefile
+++ b/iPDC/Makefile
@@ -46,8 +46,8 @@ FILE6 = iPDC.desktop
CC = gcc
LIBS = -lpthread
-LDLIBS=`pkg-config --cflags --libs gtk+-3.0`
-CFLAGS=-g -fcommon `pkg-config --cflags --libs gtk+-3.0`
+LDLIBS=`pkg-config --cflags --libs gtk+-3.0 osmgpsmap-1.0`
+CFLAGS=-g -fcommon `pkg-config --cflags --libs gtk+-3.0 osmgpsmap-1.0`
SOURCES = \
ipdc.c \
diff --git a/iPDC/iPDC.ui b/iPDC/iPDC.ui
index 0397977..91ab0ee 100644
--- a/iPDC/iPDC.ui
+++ b/iPDC/iPDC.ui
@@ -415,23 +415,6 @@ sends data frames.
560
-
-
-
- 320
- 165
-
-
diff --git a/iPDC/ipdc.c b/iPDC/ipdc.c
index a814ea3..73be721 100755
--- a/iPDC/ipdc.c
+++ b/iPDC/ipdc.c
@@ -261,7 +261,7 @@ int main(int argc, char **argv)
/* Signals Definitions*/
g_signal_connect (data->add_pmu_button, "clicked", G_CALLBACK(add_pmu), NULL);
g_signal_connect (data->menu_add_source, "activate", G_CALLBACK(add_pmu), NULL);
- g_signal_connect(data->utility_tools, "activate", G_CALLBACK(utility_tools), NULL);
+ g_signal_connect(data->utility_tools, "clicked", G_CALLBACK(utility_tools), NULL);
g_signal_connect (data->remove_pmu_button, "clicked", G_CALLBACK(cmd_or_remove_pmu), (gpointer) "1");
g_signal_connect (data->menu_remove_source, "activate", G_CALLBACK(cmd_or_remove_pmu), (gpointer) "1");
diff --git a/iPDC/ipdcGui.c b/iPDC/ipdcGui.c
index e0a0c38..4cf498b 100755
--- a/iPDC/ipdcGui.c
+++ b/iPDC/ipdcGui.c
@@ -37,6 +37,9 @@
#include
#include
#include
+
+#include
+
#include "ipdcGui.h"
#include "global.h"
#include "connections.h"
diff --git a/iPDC/utility_tools.c b/iPDC/utility_tools.c
index 9eb91b0..e7dae6b 100644
--- a/iPDC/utility_tools.c
+++ b/iPDC/utility_tools.c
@@ -1,18 +1,15 @@
#include
#include
-void utility_tools()
+void utility_tools(GtkButton *but, gpointer udata)
{
GtkWidget *new_window;
- new_window = gtk_dialog_new();
+ new_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title(GTK_WINDOW(new_window), "Utility Tools");
+ gtk_window_set_default_size(GTK_WINDOW(new_window), 600, 400);
+ gtk_window_set_position(GTK_WINDOW(new_window), GTK_WIN_POS_CENTER);
+ gtk_container_set_border_width(GTK_CONTAINER(new_window), 10);
+ g_signal_connect (new_window, "destroy", G_CALLBACK(gtk_widget_destroy), new_window);
- //gtk_window_fullscreen(GTK_WINDOW(new_window));
- // gtk_window_set_default_size(GTK_WINDOW(new_window), 800, 600);
- // gtk_window_set_resizable(GTK_WINDOW(new_window), FALSE);
- // gtk_window_set_position(GTK_WINDOW(new_window), GTK_WIN_POS_CENTER);
-
- // /* Set the Title of Main Window */
- // gtk_window_set_title (GTK_WINDOW (new_window), "iPDC utility tools");
- // g_signal_connect (new_window, "destroy", G_CALLBACK(gtk_widget_destroy), new_window);
- gtk_widget_show(new_window);
+ gtk_widget_show_all(new_window);
}
\ No newline at end of file
diff --git a/iPDC/utility_tools.h b/iPDC/utility_tools.h
index 76f8c1d..c5c224c 100644
--- a/iPDC/utility_tools.h
+++ b/iPDC/utility_tools.h
@@ -1,2 +1,2 @@
#include
-void utility_tools();
\ No newline at end of file
+void utility_tools(GtkButton *but, gpointer udata);
\ No newline at end of file
diff --git a/iPDC/utility_tools.ui b/iPDC/utility_tools.ui
new file mode 100644
index 0000000..d9039c3
--- /dev/null
+++ b/iPDC/utility_tools.ui
@@ -0,0 +1,161 @@
+
+
+
+
+
+
diff --git a/iPDC/utility_tools.ui~ b/iPDC/utility_tools.ui~
new file mode 100644
index 0000000..6b8e689
--- /dev/null
+++ b/iPDC/utility_tools.ui~
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/test-examples/editable_track.c b/test-examples/editable_track.c
new file mode 100644
index 0000000..d51eef3
--- /dev/null
+++ b/test-examples/editable_track.c
@@ -0,0 +1,43 @@
+#include
+#include "osm-gps-map.h"
+
+int
+main (int argc,
+ char *argv[])
+{
+ OsmGpsMap *map;
+ GtkWidget *window;
+
+ gtk_init (&argc, &argv);
+
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title (GTK_WINDOW (window), "Window");
+ g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
+
+
+ map = g_object_new (OSM_TYPE_GPS_MAP,
+ "map-source", OSM_GPS_MAP_SOURCE_OPENSTREETMAP,
+ "tile-cache", "/tmp/",
+ NULL);
+ gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(map));
+
+ OsmGpsMapTrack* track = osm_gps_map_track_new();
+
+ OsmGpsMapPoint* p1, *p2;
+ p1 = osm_gps_map_point_new_radians(1.25663706, -0.488692191);
+ p2 = osm_gps_map_point_new_radians(1.06465084, -0.750491578);
+
+ osm_gps_map_track_add_point(track, p1);
+ osm_gps_map_track_add_point(track, p2);
+
+ g_object_set(track, "editable", TRUE, NULL);
+
+ osm_gps_map_track_add(map, track);
+
+ gtk_widget_show (GTK_WIDGET(map));
+ gtk_widget_show (window);
+
+ gtk_main ();
+
+ return 0;
+}
\ No newline at end of file
diff --git a/test-examples/osm-gps-map b/test-examples/osm-gps-map
new file mode 100755
index 0000000..ec830be
Binary files /dev/null and b/test-examples/osm-gps-map differ
diff --git a/test-examples/osm-gps-map.c b/test-examples/osm-gps-map.c
new file mode 100644
index 0000000..2e7b833
--- /dev/null
+++ b/test-examples/osm-gps-map.c
@@ -0,0 +1,30 @@
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+int main (int argc, char **argv)
+{
+ g_thread_init(NULL);
+ gtk_init (&argc, &argv);
+ OsmGpsMapSource_t source = OSM_GPS_MAP_SOURCE_OPENSTREETMAP;
+
+ if ( !osm_gps_map_source_is_valid(source) )
+ return 1;
+
+ GtkWidget *map = g_object_new (OSM_TYPE_GPS_MAP,
+ "map-source", source,
+ "tile-cache", "/tmp/",
+ NULL);
+ GtkWidget *w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_container_add (GTK_CONTAINER(w), map);
+ gtk_widget_show_all (w);
+
+ gtk_main ();
+ return 0;
+}
\ No newline at end of file