[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25272 - gnunet-gtk/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25272 - gnunet-gtk/src/fs |
Date: |
Wed, 5 Dec 2012 22:38:06 +0100 |
Author: grothoff
Date: 2012-12-05 22:38:06 +0100 (Wed, 05 Dec 2012)
New Revision: 25272
Modified:
gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
Log:
-visualize active probes
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2012-12-05 21:37:50 UTC
(rev 25271)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2012-12-05 21:38:06 UTC
(rev 25272)
@@ -123,8 +123,14 @@
/**
* A GdkPixbuf.
*/
- SEARCH_TAB_MC_STATUS_ICON = 17
+ SEARCH_TAB_MC_STATUS_ICON = 17,
+ /**
+ * A guint.
+ */
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY = 18
+
+
};
@@ -1437,6 +1443,7 @@
GdkPixbuf *preview;
guint percent_progress;
guint percent_availability;
+ gint unknown_availability;
gchar *filename;
gchar *uri_as_string;
gchar *status_colour;
@@ -1461,6 +1468,8 @@
SEARCH_TAB_MC_PERCENT_PROGRESS, &percent_progress,
SEARCH_TAB_MC_PERCENT_AVAILABILITY,
&percent_availability,
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY,
+ &unknown_availability,
SEARCH_TAB_MC_FILENAME, &filename,
SEARCH_TAB_MC_URI_AS_STRING, &uri_as_string,
SEARCH_TAB_MC_STATUS_COLOUR, &status_colour,
@@ -1495,6 +1504,8 @@
percent_progress,
SEARCH_TAB_MC_PERCENT_AVAILABILITY,
percent_availability,
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY,
+ unknown_availability,
SEARCH_TAB_MC_FILENAME, filename,
SEARCH_TAB_MC_URI_AS_STRING,
uri_as_string,
@@ -1552,6 +1563,7 @@
guint64 completed;
guint percent_progress;
guint percent_availability;
+ gint unknown_availability;
gchar *filename;
gchar *status_colour;
guint applicability_rank;
@@ -1576,6 +1588,7 @@
SEARCH_TAB_MC_URI, &uri,
SEARCH_TAB_MC_PERCENT_PROGRESS, &percent_progress,
SEARCH_TAB_MC_PERCENT_AVAILABILITY,
&percent_availability,
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, &unknown_availability,
SEARCH_TAB_MC_FILENAME, &filename,
SEARCH_TAB_MC_STATUS_COLOUR, &status_colour,
SEARCH_TAB_MC_APPLICABILITY_RANK, &applicability_rank,
@@ -1612,6 +1625,7 @@
gtk_tree_store_set (de->sr->tab->ts, &iter,
SEARCH_TAB_MC_PERCENT_PROGRESS, percent_progress,
SEARCH_TAB_MC_PERCENT_AVAILABILITY, percent_availability,
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, unknown_availability,
SEARCH_TAB_MC_FILENAME, filename,
SEARCH_TAB_MC_STATUS_COLOUR, status_colour,
SEARCH_TAB_MC_APPLICABILITY_RANK, applicability_rank,
@@ -2071,13 +2085,15 @@
* @param availability_rank updated availability information
* @param availability_certainty updated availability certainty
* @param applicability_rank updated applicability information
+ * @param probe_time how long has the search been running
*/
static void
update_search_result (struct SearchResult *sr,
const struct GNUNET_CONTAINER_MetaData *meta,
uint32_t applicability_rank,
int32_t availability_rank,
- uint32_t availability_certainty)
+ uint32_t availability_certainty,
+ struct GNUNET_TIME_Relative probe_time)
{
GtkTreeIter iter;
struct GNUNET_CONTAINER_MetaData *ometa;
@@ -2119,11 +2135,15 @@
percent_avail = 50 + (gint) (availability_rank * 50.0 /
availability_certainty);
else
percent_avail = 50;
+ fprintf (stderr, "avail-rank: %d, avail-cert: %d => %d\n", (int)
availability_rank,
+ (unsigned int) availability_certainty,
+ (int) percent_avail);
gtk_tree_store_set (ts, &iter,
SEARCH_TAB_MC_METADATA,
GNUNET_CONTAINER_meta_data_duplicate (meta),
SEARCH_TAB_MC_PREVIEW, pixbuf,
SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint)
percent_avail,
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, (0 ==
availability_certainty) ? (gint) (probe_time.rel_value /
GNUNET_FS_PROBE_UPDATE_FREQUENCY.rel_value) : -1,
SEARCH_TAB_MC_FILENAME, desc,
SEARCH_TAB_MC_MIMETYPE, mime,
SEARCH_TAB_MC_APPLICABILITY_RANK,
@@ -2258,7 +2278,9 @@
SEARCH_TAB_MC_PREVIEW, pixbuf,
SEARCH_TAB_MC_PERCENT_PROGRESS, 0,
SEARCH_TAB_MC_PERCENT_AVAILABILITY,
- (fsize == 0) ? 100 : 0,
+ (fsize == 0) ? 100 : 50,
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY,
+ (fsize == 0) ? -1 : 0,
SEARCH_TAB_MC_FILENAME, desc,
SEARCH_TAB_MC_URI_AS_STRING, uris,
SEARCH_TAB_MC_STATUS_COLOUR,
status_colour,
@@ -2723,8 +2745,6 @@
gtk_tree_store_set (de->sr->tab->ts, &iter,
SEARCH_TAB_MC_PERCENT_PROGRESS,
(guint) ((size > 0) ? (100 * completed / size) : 100),
- SEARCH_TAB_MC_PERCENT_AVAILABILITY,
- (guint) ((size > 0) ? (100 * completed / size) : 100),
SEARCH_TAB_MC_COMPLETED, completed,
-1);
if (completed < size)
@@ -2833,6 +2853,7 @@
gtk_tree_store_set (de->sr->tab->ts, &iter,
SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) 100,
SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint) 100,
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, -1,
SEARCH_TAB_MC_STATUS_ICON,
GNUNET_GTK_animation_context_get_pixbuf
(animation_downloaded),
-1);
@@ -3704,7 +3725,8 @@
info->value.search.specifics.resume_result.
availability_rank,
info->value.search.specifics.resume_result.
- availability_certainty);
+ availability_certainty,
+ GNUNET_TIME_UNIT_ZERO);
return ret;
case GNUNET_FS_STATUS_SEARCH_SUSPEND:
close_search_tab (info->value.search.cctx);
@@ -3728,7 +3750,9 @@
info->value.search.specifics.update.
availability_rank,
info->value.search.specifics.update.
- availability_certainty);
+ availability_certainty,
+ info->value.search.specifics.update.
+ current_probe_time);
return info->value.search.specifics.update.cctx;
case GNUNET_FS_STATUS_SEARCH_ERROR:
handle_search_error (info->value.search.cctx,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25272 - gnunet-gtk/src/fs,
gnunet <=