From 7b80e543ecab11039e85e000f874c42ad48fc0e4 Mon Sep 17 00:00:00 2001 From: karthikmv Date: Tue, 23 Aug 2022 13:05:44 +0530 Subject: [PATCH] added utility tools ui --- iPDC/Makefile | 4 +- iPDC/iPDC.ui | 46 ++++++---- iPDC/ipdc.c | 2 +- iPDC/ipdcGui.c | 3 + iPDC/utility_tools.c | 19 ++-- iPDC/utility_tools.h | 2 +- iPDC/utility_tools.ui | 161 +++++++++++++++++++++++++++++++++ iPDC/utility_tools.ui~ | 5 + test-examples/editable_track.c | 43 +++++++++ test-examples/osm-gps-map | Bin 0 -> 16728 bytes test-examples/osm-gps-map.c | 30 ++++++ 11 files changed, 282 insertions(+), 33 deletions(-) create mode 100644 iPDC/utility_tools.ui create mode 100644 iPDC/utility_tools.ui~ create mode 100644 test-examples/editable_track.c create mode 100755 test-examples/osm-gps-map create mode 100644 test-examples/osm-gps-map.c 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 - - - 475 - 375 - True - False - False - iPDC - A Free Phasor Data Concentrator. -Supportive IEEE C37.118 Synchrophasor std. - False - fill - - - 320 - 165 - - 800 @@ -490,7 +473,9 @@ Supportive IEEE C37.118 Synchrophasor std. True False 8 + vertical 9 + True Add a Source Device @@ -509,7 +494,7 @@ and data frames would be received. - + Utility tools 284 35 @@ -647,6 +632,31 @@ which data frames are being received. 163 + + + 100 + 80 + True + False + + + 475 + 375 + True + False + False + iPDC - A Free Phasor Data Concentrator. +Supportive IEEE C37.118 Synchrophasor std. + False + fill + + + + + 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 @@ + + + + + + False + + + True + False + start + + + True + False + _File + True + + + True + False + + + gtk-new + True + False + True + True + + + + + gtk-open + True + False + True + True + + + + + gtk-save + True + False + True + True + + + + + gtk-save-as + True + False + True + True + + + + + True + False + + + + + gtk-quit + True + False + True + True + + + + + + + + + True + False + _Edit + True + + + True + False + + + gtk-cut + True + False + True + True + + + + + gtk-copy + True + False + True + True + + + + + gtk-paste + True + False + True + True + + + + + gtk-delete + True + False + True + True + + + + + + + + + True + False + _View + True + + + + + True + False + _Help + True + + + True + False + + + gtk-about + True + False + True + True + + + + + + + + + + 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 0000000000000000000000000000000000000000..ec830be00e9976ef05df075fbbcdd533c5cc6db8 GIT binary patch literal 16728 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 literal 0 HcmV?d00001 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