/[xlog]/xlog/src/dxcc.c
ViewVC logotype

Diff of /xlog/src/dxcc.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.14 by pa4tu, Sat Nov 23 18:11:08 2002 UTC revision 1.15 by pa4tu, Sat Nov 23 18:30:51 2002 UTC
# Line 90  readctydata (void) Line 90  readctydata (void)
90    dxcc[0].waz = -1;    dxcc[0].waz = -1;
91    dxcc[0].itu = -1;    dxcc[0].itu = -1;
92    dxcc[0].continent = g_strdup ("--");    dxcc[0].continent = g_strdup ("--");
93      dxcc[0].latitude = 0;
94      dxcc[0].longitude = 0;
95      dxcc[0].timezone = 0;
96    dxcc[0].exceptions = NULL;    dxcc[0].exceptions = NULL;
97    
98    state.countries = 1;    state.countries = 1;
# Line 120  readctydata (void) Line 123  readctydata (void)
123        dxcc[state.countries].waz = atoi (split[1]);        dxcc[state.countries].waz = atoi (split[1]);
124        dxcc[state.countries].itu = atoi (split[2]);        dxcc[state.countries].itu = atoi (split[2]);
125        dxcc[state.countries].continent = g_strdup (split[3]);        dxcc[state.countries].continent = g_strdup (split[3]);
126          dxcc[state.countries].latitude = (gint)(atof(split[4]) * 100);
127          dxcc[state.countries].longitude = (gint)(atof(split[5]) * 100);
128          dxcc[state.countries].timezone = (gint)(atof(split[6]) * 10);
129        dxcc[state.countries].exceptions = g_strdup (split[8]);        dxcc[state.countries].exceptions = g_strdup (split[8]);
130    
131        for (ipfx = 0;; ipfx++)        for (ipfx = 0;; ipfx++)
# Line 307  updatedxccframe (gchar * callsign) Line 313  updatedxccframe (gchar * callsign)
313        labeltext2 = g_strdup_printf ("%s - ITU %d - CQ %d",        labeltext2 = g_strdup_printf ("%s - ITU %d - CQ %d",
314          dxcc[country].continent, dxcc[country].itu, dxcc[country].waz);          dxcc[country].continent, dxcc[country].itu, dxcc[country].waz);
315    
316  /*      labeltext3 = g_strdup_printf (_("Timezone: %s"), dxccsplit[5]);        labeltext3 = g_strdup_printf (_("Timezone: %+1.1f"), (gdouble)dxcc[country].timezone/10);
317        labeltext4 =        labeltext4 = g_strdup_printf (_("Location: %+1.2f, %+1.2f"),
318          g_strdup_printf (_("Location: %s, %s"), dxccsplit[6], dxccsplit[7]);          (gdouble)dxcc[country].latitude/100, (gdouble)dxcc[country].longitude/100);
319        gcresult =  /*      gcresult =
320          g_strdup (gc          g_strdup (gc
321                    (preferences.units, state.mylocation,                    (preferences.units, state.mylocation,
322                     g_strconcat (dxccsplit[6], dxccsplit[7], NULL)));*/                     g_strconcat (dxccsplit[6], dxccsplit[7], NULL)));*/
# Line 325  updatedxccframe (gchar * callsign) Line 331  updatedxccframe (gchar * callsign)
331    g_free (labeltext1);    g_free (labeltext1);
332    g_free (labeltext2);    g_free (labeltext2);
333    
334  /*  gtk_label_set_text (GTK_LABEL (dxcclabel3), labeltext3);    gtk_label_set_text (GTK_LABEL (dxcclabel3), labeltext3);
335    gtk_label_set_text (GTK_LABEL (dxcclabel4), labeltext4);    gtk_label_set_text (GTK_LABEL (dxcclabel4), labeltext4);
336    gtk_label_set_text (GTK_LABEL (dxcclabel5), gcresult);*/  /*  gtk_label_set_text (GTK_LABEL (dxcclabel5), gcresult);*/
337  /*  g_free (labeltext3);    g_free (labeltext3);
338    g_free (labeltext4);    g_free (labeltext4);
339    g_free (gcresult);*/  /*  g_free (gcresult);*/
340  }  }

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26