From 476930b45769b2822ff918f75bcd6cfa0f80fa40 Mon Sep 17 00:00:00 2001 From: karthikmurakonda Date: Sat, 12 Nov 2022 12:13:59 +0530 Subject: [PATCH] refractor2 --- iPDC/Makefile | 3 +- iPDC/assets/iPDC.ui | 8 - iPDC/assets/iPDC.ui~ | 663 +++++++++++++++++++++++++++++++++++++++ iPDC/inc/map_vis.h | 2 +- iPDC/src/ipdc.c | 4 +- iPDC/src/map_vis.c | 2 +- iPDC/src/utility_tools.c | 2 +- 7 files changed, 668 insertions(+), 16 deletions(-) create mode 100644 iPDC/assets/iPDC.ui~ diff --git a/iPDC/Makefile b/iPDC/Makefile index 7de094c..4703c95 100755 --- a/iPDC/Makefile +++ b/iPDC/Makefile @@ -71,8 +71,7 @@ bin/%.o: src/%.c install: $(PROGRAM) - gtk-builder-convert assets/iPDC.glade assets/iPDC.xml - mkdir -p $(CREATE_DIR)iPDC/$ + mkdir -p $(CREATE_DIR)iPDC/ cp -f assets/$(FILE1) $(CREATE_DIR)iPDC/$(FILE1) cp -f assets/$(FILE2) $(CREATE_DIR)iPDC/$(FILE2) cp -f assets/$(FILE3) $(CREATE_DIR)iPDC/$(FILE3) diff --git a/iPDC/assets/iPDC.ui b/iPDC/assets/iPDC.ui index 606e2e5..a17403c 100644 --- a/iPDC/assets/iPDC.ui +++ b/iPDC/assets/iPDC.ui @@ -322,14 +322,6 @@ sends data frames. True False - - - True - False - Attack Detection - True - - True diff --git a/iPDC/assets/iPDC.ui~ b/iPDC/assets/iPDC.ui~ new file mode 100644 index 0000000..606e2e5 --- /dev/null +++ b/iPDC/assets/iPDC.ui~ @@ -0,0 +1,663 @@ + + + + + + + + True + False + gtk-properties + + + True + False + gtk-go-up + 10 + 1 + + + True + False + gtk-go-down + 1 + + + True + False + gtk-select-color + 1 + + + True + False + gtk-close + 1 + + + True + False + gtk-add + 1 + + + True + False + gtk-about + 1 + + + True + False + gtk-missing-image + + + True + False + gtk-quit + 10 + 1 + + + True + False + gtk-open + 1 + + + True + False + gtk-properties + 1 + + + True + False + gtk-new + 1 + + + True + False + gtk-sort-ascending + 1 + + + True + False + gtk-remove + 1 + + + True + False + gtk-media-stop + 1 + + + 800 + 600 + False + iPDC - A Free Phasor Data Concentrator. +Supportive IEEE C37.118 Synchrophasor std. + iPDC - v1.3 + center-on-parent + 710 + 590 + gnome-obex-server + False + center + + + 800 + 600 + True + False + + + EXIT + 0 + 0 + True + True + True + Click to exit the iPDC Software. + + + 700 + 555 + + + + + 710 + 40 + True + False + True + True + immediate + + + True + False + _File + True + + + True + False + + + New iPDC Setup + True + False + GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_STRUCTURE_MASK + Click to create a new iPDC setup file. + image6 + False + True + + + + + Open iPDC Setup + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_STRUCTURE_MASK + Click to open the saved iPDC setup file. + image4 + False + True + + + + + iPDC Properties + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_STRUCTURE_MASK + Click to view the iPDC setup informations. + image5 + False + True + + + + + Connection Table + True + False + Display source and destination devices connection tables. + image12 + False + True + + + + + Quit + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_STRUCTURE_MASK + Click to exit the iPDC Software. + image3 + False + True + + + + + + + + + True + False + Edit + True + + + True + False + + + Add Source + True + False + GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_STRUCTURE_MASK + PMU/PDC device from which configuration +and data frames would be received. + image7 + False + True + + + + + Remove Source + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_STRUCTURE_MASK + Remove PMU/PDC device from which +data frames are being received. + image8 + False + True + + + + + Data OFF + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_STRUCTURE_MASK + Turn OFF data transmission of PMU/PDC device from +which data frames are being received. + image9 + False + True + + + + + Data ON + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_STRUCTURE_MASK + Turn ON data transmission of PMU/PDC device whose +data transmission is put OFF. + image10 + False + True + + + + + Request CFG + True + False + Send Command frame to PMU/PDC device +to get configuration frame. + image11 + False + True + + + + + Add Destination + True + False + PDC device to whom iPDC sends +configuration and data frames. + image14 + False + True + + + + + Remove Destination + True + False + Remove PDC device to whom iPDC +sends data frames. + image13 + False + True + + + + + + + + + True + False + service tools + Tools + + + True + False + + + True + False + Attack Detection + True + + + + + True + False + Data Visualization + True + + + + + + + + + True + False + _Help + True + + + True + False + + + About + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_STRUCTURE_MASK + Click to see the publisher, licensing, and version details. + image15 + False + True + + + + + + + + + + + Go online + 100 + 35 + True + True + True + True + For more information visit the iPDC official web +'https://github.com/karthikmurakonda/iPDC-suite/discussions'. + image1 + none + https://github.com/karthikmurakonda/iPDC-suite/discussions + + + 500 + 555 + + + + + 284 + 40 + True + False + + + 20 + 137 + + + + + 180 + 28 + True + False + True + + + 335 + 560 + + + + + 800 + 70 + True + False + False + False + fill + False + + + 40 + + + + + 162 + 20 + True + False + False + Local Time of System + right + False + 0 + 0 + + + + + + + + + 545 + 115 + + + + + 800 + 1 + True + False + + + 536 + + + + + + 100 + 80 + True + False + 8 + vertical + 9 + True + + + Add a Source Device + 284 + 35 + True + True + True + PMU/PDC device from which configuration +and data frames would be received. + 0 + + + 0 + 0 + + + + + Utility tools + 284 + 35 + True + True + True + 0 + + + 0 + 8 + + + + + iPDC Connection Table + 284 + 35 + True + True + True + Display source and destination devices connection tables. + 0 + + + 0 + 7 + + + + + Remove a Destination Device + 284 + 35 + True + True + True + Remove PDC device to whom iPDC +sends data frames. + 0 + + + 0 + 6 + + + + + Add a Destination Device + 284 + 35 + True + True + True + PDC device to whom iPDC sends +configuration and data frames. + 0 + + + 0 + 5 + + + + + Request Configuration Frame + 284 + 35 + True + True + True + Send Command frame to PMU/PDC device +to get configuration frame. + 0 + + + 0 + 4 + + + + + Turn ON Data Transmission + 284 + 35 + True + True + True + Turn ON data transmission of PMU/PDC device whose +data transmission is put OFF. + 0 + + + 0 + 3 + + + + + Remove a Source Device + 284 + 35 + True + True + True + Remove PMU/PDC device from which +data frames are being received. + 0 + + + 0 + 1 + + + + + Turn OFF Data Transmission + 284 + 35 + True + True + True + Turn OFF data transmission of PMU/PDC device from +which data frames are being received. + 0 + + + 0 + 2 + + + + + 20 + 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/inc/map_vis.h b/iPDC/inc/map_vis.h index 9c533d7..1a1ecab 100644 --- a/iPDC/inc/map_vis.h +++ b/iPDC/inc/map_vis.h @@ -25,4 +25,4 @@ struct vis_data{ struct vis_data *vis_data_head; -gboolean update_images(gpointer* pars); \ No newline at end of file +gboolean update_vis(gpointer* pars); \ No newline at end of file diff --git a/iPDC/src/ipdc.c b/iPDC/src/ipdc.c index 5e8d0ac..9c44e01 100755 --- a/iPDC/src/ipdc.c +++ b/iPDC/src/ipdc.c @@ -124,7 +124,6 @@ int main(int argc, char **argv) GW(menuitem3); GW(attack_detection); GW(data_vis); - GW(utility_tools); #undef GW /* Connect signals */ @@ -292,8 +291,7 @@ int main(int argc, char **argv) g_signal_connect (data->about_menuitem, "activate", G_CALLBACK(about_ipdc), NULL); g_signal_connect (data->ipdc, "destroy", G_CALLBACK(destroy), NULL); - g_signal_connect(data->attack_detection,"activate",G_CALLBACK(attack_detection_window),NULL); - g_signal_connect(data->data_vis, "activate", G_CALLBACK(data_vis_window), NULL); + g_signal_connect(data->data_vis, "activate", G_CALLBACK(utility_tools), NULL); /* Destroy builder, since we don't need it anymore */ diff --git a/iPDC/src/map_vis.c b/iPDC/src/map_vis.c index 40b8e5c..2d0a47f 100644 --- a/iPDC/src/map_vis.c +++ b/iPDC/src/map_vis.c @@ -19,7 +19,7 @@ int loops = 0; -gboolean update_images(gpointer* pars){ +gboolean update_vis(gpointer* pars){ int match=0,id, cfg_match=0; myParameters* parameters = (myParameters*) pars; struct cfg_frame* temp_cfg; diff --git a/iPDC/src/utility_tools.c b/iPDC/src/utility_tools.c index 10b7048..c8231fb 100644 --- a/iPDC/src/utility_tools.c +++ b/iPDC/src/utility_tools.c @@ -454,7 +454,7 @@ void utility_tools(GtkButton *but, gpointer udata) } temp_visptr->next = NULL; - guint pid = g_timeout_add(20, (GSourceFunc)update_images, data); + guint pid = g_timeout_add(20, (GSourceFunc)update_vis, data); // gtk_widget_set_hexpand(GTK_WIDGET(chart), TRUE);