diff --git a/iPDC/assets/utility_tools.ui b/iPDC/assets/utility_tools.ui
index 11f8c53..51cb0b5 100644
--- a/iPDC/assets/utility_tools.ui
+++ b/iPDC/assets/utility_tools.ui
@@ -296,18 +296,6 @@
0
-
-
-
- 1
- 0
-
-
-
-
- 600
- 500
- True
- False
-
-
- 1
- 0
-
-
150
@@ -324,6 +312,7 @@
True
False
+ 16
False
@@ -495,7 +484,8 @@
True
False
- >6900V
+ >65600V or
+< 65300
1
@@ -530,8 +520,8 @@
True
False
- <6800V
-<6300V
+ <65600V
+>65300V
1
@@ -761,6 +751,7 @@
True
False
+ > 0.5
1
@@ -795,7 +786,7 @@
True
False
- Normal
+ < 0.5
1
@@ -1109,6 +1100,59 @@
3
+
+
+
+ True
+ False
+
+
+ 600
+ 500
+ True
+ False
+
+
+ 0
+ 1
+
+
+
+
+ True
+ False
+ 3
+ 3
+ Voltage Magnitude
+
+
+
+
+
+ 0
+ 0
+
+
+
+
+ True
+ False
+ Voltage Magnitude
+
+
+
+
+
+ 0
+ 2
+
+
+
+
+ 1
+ 0
+
+
diff --git a/iPDC/inc/utility_tools.h b/iPDC/inc/utility_tools.h
index d0d7741..456aa81 100644
--- a/iPDC/inc/utility_tools.h
+++ b/iPDC/inc/utility_tools.h
@@ -39,6 +39,8 @@ struct _UtData
GtkWidget *swfreq;
GtkWidget *swdfreq;
GtkWidget *swad;
+ GtkWidget *maplabel;
+ GtkWidget *graphlabel;
};
UtData *utdata;
diff --git a/iPDC/src/map_vis.c b/iPDC/src/map_vis.c
index bbe9f75..5c18853 100644
--- a/iPDC/src/map_vis.c
+++ b/iPDC/src/map_vis.c
@@ -145,7 +145,11 @@ gboolean update_images(gpointer* pars){
vis_ptr->last_image = osm_gps_map_image_add(parameters->util_map,lat, lon, parameters->g_green_image);
}
}else if (algorithm==1 && dimmension == 0){
-
+ if(!kmeans(df)){
+ vis_ptr->last_image = osm_gps_map_image_add(parameters->util_map,lat, lon, parameters->g_red_image);
+ }else{
+ vis_ptr->last_image = osm_gps_map_image_add(parameters->util_map,lat, lon, parameters->g_green_image);
+ }
}else if (algorithm==1 && dimmension == 1){
}else if (algorithm==1 && dimmension == 2){
diff --git a/iPDC/src/utility_tools.c b/iPDC/src/utility_tools.c
index 2a46c5c..218cd72 100644
--- a/iPDC/src/utility_tools.c
+++ b/iPDC/src/utility_tools.c
@@ -138,6 +138,10 @@ void on_voltage_clicked(GtkButton *but, gpointer udata)
gtk_widget_show(utdata->ml_vol);
gtk_widget_show(utdata->graph_layoutvol);
gtk_widget_show(utdata->swvol);
+ gtk_widget_show(utdata->graphlabel);
+
+ gtk_label_set_label(utdata->maplabel, "Voltage Magnitude");
+ gtk_label_set_label(utdata->graphlabel, "Voltage Magnitude");
gtk_widget_hide(utdata->ml_freq);
gtk_widget_hide(utdata->ml_dfreq);
@@ -166,6 +170,10 @@ void on_frequency_clicked(GtkButton *but, gpointer udata)
gtk_widget_show(utdata->ml_freq);
gtk_widget_show(utdata->graph_layoutfreq);
gtk_widget_show(utdata->swfreq);
+ gtk_widget_show(utdata->graphlabel);
+
+ gtk_label_set_label(utdata->maplabel, "Frequency");
+ gtk_label_set_label(utdata->graphlabel, "Frequency");
gtk_widget_hide(utdata->ml_vol);
gtk_widget_hide(utdata->ml_dfreq);
@@ -196,6 +204,10 @@ void on_dfreq_clicked(GtkButton *but, gpointer udata)
gtk_widget_show(utdata->ml_dfreq);
gtk_widget_show(utdata->graph_layoutdfreq);
gtk_widget_show(utdata->swdfreq);
+ gtk_widget_show(utdata->graphlabel);
+
+ gtk_label_set_label(utdata->maplabel, "Frequency Rate");
+ gtk_label_set_label(utdata->graphlabel, "Frequency Rate");
gtk_widget_hide(utdata->ml_vol);
gtk_widget_hide(utdata->ml_freq);
@@ -233,6 +245,8 @@ void on_attack_detection_clicked(GtkButton *but, gpointer udata)
gtk_widget_show(utdata->dimm_label);
gtk_widget_show(utdata->ml_ad);
+ gtk_label_set_label(utdata->maplabel, "Attack Detection");
+
gtk_widget_hide(utdata->ml_vol);
gtk_widget_hide(utdata->ml_freq);
gtk_widget_hide(utdata->ml_dfreq);
@@ -242,6 +256,7 @@ void on_attack_detection_clicked(GtkButton *but, gpointer udata)
gtk_widget_hide(utdata->graph_layoutdfreq);
gtk_widget_hide(utdata->graph_layoutfreq);
gtk_widget_hide(utdata->graph_layoutvol);
+ gtk_widget_hide(utdata->graphlabel);
printf("Attack Detection\n");
}
@@ -305,6 +320,8 @@ void utility_tools(GtkButton *but, gpointer udata)
utdata->swvol = GTK_WIDGET(gtk_builder_get_object(builder, "swvol"));
utdata->swfreq = GTK_WIDGET(gtk_builder_get_object(builder, "swfreq"));
utdata->swdfreq = GTK_WIDGET(gtk_builder_get_object(builder, "swdfreq"));
+ utdata->maplabel = GTK_WIDGET(gtk_builder_get_object(builder, "maplabel"));
+ utdata->graphlabel = GTK_WIDGET(gtk_builder_get_object(builder, "graphlabel"));
gtk_widget_set_sensitive(utdata->voltage, FALSE);
gtk_widget_set_visible(utdata->algorithm, FALSE);