ham-ref/gpredict
1
0
Fork 0
mirror of https://github.com/csete/gpredict synced 2026-08-13 17:39:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update progress bar calculation for tle update.

Browse source 
git-svn-id: https://gpredict.svn.sourceforge.net/svnroot/gpredict/trunk@896 ab6734ba-2843-0410-b83b-99c217ef6c0f
This commit is contained in:
aa1vs 2011-09-07 23:31:58 +00:00
parent b3274063d2
commit 2bfc4eeea0
2 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-09-07 Charles Suprin <hamaa1vs at gmail.com>
* ChangeLog
* src/tle-update.c
Update progress bar calculation for tle update.
2011-09-07 Charles Suprin <hamaa1vs at gmail.com>
* ChangeLog

36
src/tle-update.c
View file

@ -296,15 +296,31 @@ void tle_update_from_files (const gchar *dir, const gchar *filter,
}
if (progress != NULL) {
/* calculate and saturate fraction
(number of sats in TLE files is greater
than the number of sats in link table)
*/
fraction = start + (1.0-start) * ((gdouble) total) / ((gdouble) num);
if (fraction >= 0.95)
fraction = 0.98;
/* two different calculations for completeness depending on whether
we are adding new satellites or not. */
if (sat_cfg_get_bool (SAT_CFG_BOOL_TLE_ADD_NEW)) {
/* In this case we are possibly processing more than num satellites
How many more? We do not know yet. Worst case is g_hash_table_size more.
As we update skipped and updated we can reduce the denominator count
as those are in both pools (files and hash table). When we have processed
all the files, updated and skipped are completely correct and the progress
is correct. It may be correct sooner if the missed satellites are the
last files to process.
Until then, if we eliminate the ones that are updated and skipped from being
double counted, our progress will shown will always be less or equal to our
true progress since the denominator will be larger than is correct.
Advantages to this are that the progress bar does not stall close to
finished when there are a large number of new satellites.
*/
fraction = start + (1.0-start) * ((gdouble) total) /
((gdouble) num + g_hash_table_size(data) - updated - skipped);
} else {
/* here we only process satellites we have have files for so divide by num */
fraction = start + (1.0-start) * ((gdouble) total) / ((gdouble) num);
}
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress),
fraction);
@ -644,7 +660,7 @@ void tle_update_from_network (gboolean silent,
if (!silent && (progress != NULL)) {
/* complete download corresponds to 50% */
fraction = start + (0.5-start) * i / (2.0 * numfiles);
fraction = start + (0.5-start) * i / (1.0 * numfiles);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), fraction);
/* Force the drawing queue to be processed otherwise there will