Thread: [Gpredict-svn] SF.net SVN: gpredict:[57] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
gpredict-svn
|
From: <cs...@us...> - 2008-08-20 14:35:53
|
Revision: 57
http://gpredict.svn.sourceforge.net/gpredict/?rev=57&view=rev
Author: csete
Date: 2008-08-20 14:36:00 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
Changed from hamlib C API to TCP interface.
Modified Paths:
--------------
trunk/ChangeLog
trunk/goocanv8/Makefile.in
trunk/goocanv8/aclocal.m4
trunk/goocanv8/config.guess
trunk/goocanv8/config.sub
trunk/goocanv8/configure
trunk/goocanv8/ltmain.sh
trunk/goocanv8/src/Makefile.in
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rig-editor.h
trunk/src/sat-pref-rig.c
trunk/src/sat-pref-rig.h
trunk/src/sat-pref-rot-editor.c
trunk/src/sat-pref-rot-editor.h
trunk/src/sat-pref-rot.c
trunk/src/sat-pref-rot.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/ChangeLog 2008-08-20 14:36:00 UTC (rev 57)
@@ -1,3 +1,24 @@
+2008-08-20; Alexandru Csete <oz...@gm...>
+
+ * configure.ac:
+ Disabled Hamlib checks since we will be using the TCP interface
+ that does not have any build dependencies.
+
+ * src/sat-pref-rig.[ch]:
+ * src/sat-pref-rot.[ch]:
+ * src/sat-pref-rig-editor.[ch]:
+ * src/sat-pref-rot-editor.[ch]:
+ Removed Hamlib dependencies.
+
+ * src/radio-conf.[ch]:
+ * src/rotor-conf.[ch]:
+ * src/sat-pref-rig-c:
+ * src/sat-pref-rot.c:
+ * src/sat-pref-rig-editor.c:
+ * src/sat-pref-rot-editor.c:
+ Changed from hamlib C API to TCP based configuration.
+
+
2008-05-01; Alexandru Csete <oz...@gm...>
* src/gtk-rot-knob.[ch]:
Modified: trunk/goocanv8/Makefile.in
===================================================================
--- trunk/goocanv8/Makefile.in 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/goocanv8/Makefile.in 2008-08-20 14:36:00 UTC (rev 57)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -93,6 +93,7 @@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -127,6 +128,7 @@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -352,8 +354,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -378,8 +380,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -389,13 +391,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -466,6 +467,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -492,6 +497,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -643,8 +650,8 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
+ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
Modified: trunk/goocanv8/aclocal.m4
===================================================================
--- trunk/goocanv8/aclocal.m4 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/goocanv8/aclocal.m4 2008-08-20 14:36:00 UTC (rev 57)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,13 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -119,8 +122,7 @@
#-----------------
glib_DEFUN([GLIB_WITH_NLS],
dnl NLS is obligatory
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- USE_NLS=yes
+ [USE_NLS=yes
AC_SUBST(USE_NLS)
gt_cv_have_gettext=no
@@ -452,7 +454,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -540,7 +542,6 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
-
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@ -642,6 +643,8 @@
;;
esac
+_LT_REQUIRED_DARWIN_CHECKS
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@ -721,10 +724,81 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
])# _LT_LINKER_BOILERPLATE
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+ case $host_os in
+ rhapsody* | darwin*)
+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi])
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[0123]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+])
+
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
@@ -1048,7 +1122,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
esac
;;
esac
@@ -1141,7 +1219,7 @@
$2=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
])
@@ -1412,7 +1490,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
@@ -1420,7 +1498,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
])
])
])
@@ -1737,7 +1815,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[[4-9]]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2270,6 +2348,13 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -2769,7 +2854,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3205,7 +3290,7 @@
fi
;;
-aix4* | aix5*)
+aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -3262,6 +3347,7 @@
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -3371,7 +3457,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aix4* | aix5*)
+ aix[[4-9]]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -3384,7 +3470,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -3530,52 +3616,24 @@
fi
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ if test "$GXX" = yes ; then
output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -3825,7 +3883,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -4260,7 +4318,8 @@
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
@@ -4385,6 +4444,11 @@
$rm -f confest.$objext
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
@@ -4441,7 +4505,6 @@
;;
esac
])
-
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@ -4526,7 +4589,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4* | aix5*)
+aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -4703,6 +4766,7 @@
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4765,7 +4829,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -5002,6 +5066,10 @@
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -5351,7 +5419,7 @@
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -5408,7 +5476,8 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -5445,7 +5514,7 @@
esac
else
case $host_os in
- aix4* | aix5*)
+ aix[[4-9]]*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -5541,7 +5610,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -5692,7 +5761,8 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
@@ -5762,7 +5832,8 @@
mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
hpux9* | hpux10* | hpux11*)
@@ -5899,7 +5970,7 @@
#
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
@@ -5923,7 +5994,7 @@
#
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5939,7 +6010,7 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix4* | aix5*)
+ aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -5961,6 +6032,7 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5991,12 +6063,14 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
@@ -6046,7 +6120,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -6266,7 +6340,7 @@
fi
;;
- aix4* | aix5*)
+ aix[[4-9]]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -6286,7 +6360,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -6446,11 +6520,10 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
@@ -7189,7 +7262,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7204,7 +7277,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -7220,8 +7293,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -7493,7 +7568,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -7541,13 +7616,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -7652,16 +7727,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -7962,7 +8038,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
Modified: trunk/goocanv8/config.guess
===================================================================
--- trunk/goocanv8/config.guess 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/goocanv8/config.guess 2008-08-20 14:36:00 UTC (rev 57)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-03-06'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
Modified: trunk/goocanv8/config.sub
===================================================================
--- trunk/goocanv8/config.sub 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/goocanv8/config.sub 2008-08-20 14:36:00 UTC (rev 57)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-01-18'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -683,6 +683,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
Modified: trunk/goocanv8/configure
===================================================================
--- trunk/goocanv8/configure 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/goocanv8/configure 2008-08-20 14:36:00 UTC (rev 57)
@@ -862,6 +862,8 @@
ECHO
AR
RANLIB
+DSYMUTIL
+NMEDIT
CXX
CXXFLAGS
ac_ct_CXX
@@ -5444,7 +5446,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5659,7 +5661,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5662 "configure"' > conftest.$ac_ext
+ echo '#line 5664 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5831,7 +5833,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
esac
;;
esac
@@ -7023,7 +7029,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
@@ -7338,7 +7343,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -7898,6 +7903,318 @@
;;
esac
+
+ case $host_os in
+ rhapsody* | darwin*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$DSYMUTIL"; then
+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+echo "${ECHO_T}$DSYMUTIL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+ ac_ct_DSYMUTIL=$DSYMUTIL
+ # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_DSYMUTIL"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_DSYMUTIL" = x; then
+ DSYMUTIL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ DSYMUTIL=$ac_ct_DSYMUTIL
+ fi
+else
+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$NMEDIT"; then
+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
+echo "${ECHO_T}$NMEDIT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+ ac_ct_NMEDIT=$NMEDIT
+ # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_NMEDIT" = x; then
+ NMEDIT=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ NMEDIT=$ac_ct_NMEDIT
+ fi
+else
+ NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+
+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ lt_cv_ld_exported_symbols_list=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ lt_cv_ld_exported_symbols_list=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[0123])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[012]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+
+
enable_dlopen=no
enable_win32_dll=no
@@ -7963,7 +8280,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
@@ -7991,11 +8308,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7994: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8311: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7998: \$? = $ac_status" >&5
+ echo "$as_me:8315: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8265,10 +8582,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works=no
+ lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
@@ -8281,27 +8598,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8284: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8601: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8288: \$? = $ac_status" >&5
+ echo "$as_me:8605: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works=yes
+ lt_cv_prog_compiler_pic_works=yes
fi
fi
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -8328,10 +8645,10 @@
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_static_works=no
+ lt_cv_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -8344,20 +8661,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works=yes
+ lt_cv_prog_compiler_static_works=yes
fi
else
- lt_prog_compiler_static_works=yes
+ lt_cv_prog_compiler_static_works=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-if test x"$lt_prog_compiler_static_works" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
:
else
lt_prog_compiler_static=
@@ -8385,11 +8702,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8705: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8392: \$? = $ac_status" >&5
+ echo "$as_me:8709: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8469,12 +8786,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
@@ -8533,7 +8851,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
@@ -8753,7 +9071,7 @@
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -8773,7 +9091,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -9045,11 +9363,10 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
@@ -9569,7 +9886,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -10103,6 +10420,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -10422,7 +10754,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
@@ -10698,7 +11030,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -10747,7 +11079,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10750 "configure"
+#line 11082 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10847,7 +11179,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10850 "configure"
+#line 11182 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10974,7 +11306,7 @@
fi
;;
-aix4* | aix5*)
+aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -11030,6 +11362,7 @@
predeps \
postdeps \
compiler_lib_search_path \
+ compiler_lib_search_dirs \
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
@@ -11090,7 +11423,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -11326,6 +11659,10 @@
# shared library.
postdeps=$lt_postdeps
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -11574,6 +11911,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
+compiler_lib_search_dirs_CXX=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -11611,7 +11949,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
# Allow CC to be a program name with arguments.
@@ -11818,7 +12156,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -11831,7 +12169,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -12089,52 +12427,24 @@
fi
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[...
[truncated message content] |
|
From: <cs...@us...> - 2008-08-22 12:24:14
|
Revision: 65
http://gpredict.svn.sourceforge.net/gpredict/?rev=65&view=rev
Author: csete
Date: 2008-08-22 12:24:22 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-rot-ctrl.c
trunk/src/sat-pref-rot.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-08-22 09:38:44 UTC (rev 64)
+++ trunk/ChangeLog 2008-08-22 12:24:22 UTC (rev 65)
@@ -1,3 +1,14 @@
+2008-08-22; Alexandru Csete <oz...@gm...>
+
+ * src/sat-pref-rig.c:
+ * src/sat-pref-rig-editor.c:
+ * src/sat-pref-rig-data.h:
+ * src/sat-pref-rot.c:
+ * src/sat-pref-rot-editor.c:
+ * src/sat-pref-rot-data.h:
+ Removed unnecessary data fields.
+
+
2008-08-20; Alexandru Csete <oz...@gm...>
* configure.ac:
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-08-22 09:38:44 UTC (rev 64)
+++ trunk/src/gtk-rot-ctrl.c 2008-08-22 12:24:22 UTC (rev 65)
@@ -240,6 +240,9 @@
frame = gtk_frame_new (_("Azimuth"));
+ ctrl->AzSet = gtk_rot_knob_new (0.0, 360.0, 180.0);
+ gtk_container_add (GTK_CONTAINER (frame), ctrl->AzSet);
+
return frame;
}
Modified: trunk/src/sat-pref-rot.c
===================================================================
--- trunk/src/sat-pref-rot.c 2008-08-22 09:38:44 UTC (rev 64)
+++ trunk/src/sat-pref-rot.c 2008-08-22 12:24:22 UTC (rev 65)
@@ -118,38 +118,14 @@
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
- /* Model */
+ /* Host */
renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Model"), renderer,
- "text", ROT_LIST_COL_MODEL,
+ column = gtk_tree_view_column_new_with_attributes (_("Host"), renderer,
+ "text", ROT_LIST_COL_HOST,
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
- /* Type */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Type"), renderer,
- "text", ROT_LIST_COL_TYPE,
- NULL);
- gtk_tree_view_column_set_cell_data_func (column, renderer,
- render_rot_type,
- GUINT_TO_POINTER(ROT_LIST_COL_TYPE),
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
- /* Port */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Port"), renderer,
- "text", ROT_LIST_COL_PORT,
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
-
- /* Speed */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Speed"), renderer,
- "text", ROT_LIST_COL_SPEED,
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
-
/* Az and el limits */
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Min Az"), renderer,
@@ -209,11 +185,7 @@
/* create a new list store */
liststore = gtk_list_store_new (ROT_LIST_COL_NUM,
G_TYPE_STRING, // name
- G_TYPE_STRING, // model
- G_TYPE_INT, // hamlib id
- G_TYPE_INT, // radio type
- G_TYPE_STRING, // port
- G_TYPE_INT, // speed
+ G_TYPE_STRING, // host
G_TYPE_INT, // Min Az
G_TYPE_INT, // Max Az
G_TYPE_INT, // Min El
@@ -241,11 +213,7 @@
gtk_list_store_append (liststore, &item);
gtk_list_store_set (liststore, &item,
ROT_LIST_COL_NAME, conf.name,
- ROT_LIST_COL_MODEL, conf.model,
- ROT_LIST_COL_ID, conf.id,
- ROT_LIST_COL_TYPE, conf.type,
- ROT_LIST_COL_PORT, conf.port,
- ROT_LIST_COL_SPEED, conf.speed,
+ ROT_LIST_COL_HOST, conf.host,
ROT_LIST_COL_MINAZ, conf.minaz,
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
@@ -259,11 +227,9 @@
if (conf.name)
g_free (conf.name);
- if (conf.model)
- g_free (conf.model);
+ if (conf.host)
+ g_free (conf.host);
- if (conf.port)
- g_free (conf.port);
}
else {
/* there was an error */
@@ -357,11 +323,7 @@
rotor_conf_t conf = {
.name = NULL,
- .model = NULL,
- .id = 0,
- .type = ROTOR_TYPE_AZEL,
- .port = NULL,
- .speed = 0,
+ .host = NULL,
.minaz = 0,
.maxaz = 360,
.minel = 0,
@@ -403,11 +365,7 @@
/* store conf */
gtk_tree_model_get (model, &iter,
ROT_LIST_COL_NAME, &conf.name,
- ROT_LIST_COL_MODEL, &conf.model,
- ROT_LIST_COL_ID, &conf.id,
- ROT_LIST_COL_TYPE, &conf.type,
- ROT_LIST_COL_PORT, &conf.port,
- ROT_LIST_COL_SPEED, &conf.speed,
+ ROT_LIST_COL_HOST, &conf.host,
ROT_LIST_COL_MINAZ, &conf.minaz,
ROT_LIST_COL_MAXAZ, &conf.maxaz,
ROT_LIST_COL_MINEL, &conf.minel,
@@ -419,11 +377,9 @@
if (conf.name)
g_free (conf.name);
- if (conf.model)
- g_free (conf.model);
+ if (conf.host)
+ g_free (conf.host);
- if (conf.port)
- g_free (conf.port);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -448,12 +404,7 @@
rotor_conf_t conf = {
.name = NULL,
- .model = NULL,
- .id = 0,
- .type = ROTOR_TYPE_AZEL,
- .port = NULL,
- .speed = 0,
- .speed = 0,
+ .host = NULL,
.minaz = 0,
.maxaz = 360,
.minel = 0,
@@ -469,11 +420,7 @@
gtk_list_store_append (liststore, &item);
gtk_list_store_set (liststore, &item,
ROT_LIST_COL_NAME, conf.name,
- ROT_LIST_COL_MODEL, conf.model,
- ROT_LIST_COL_ID, conf.id,
- ROT_LIST_COL_TYPE, conf.type,
- ROT_LIST_COL_PORT, conf.port,
- ROT_LIST_COL_SPEED, conf.speed,
+ ROT_LIST_COL_HOST, conf.host,
ROT_LIST_COL_MINAZ, conf.minaz,
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
@@ -482,11 +429,9 @@
g_free (conf.name);
- if (conf.model != NULL)
- g_free (conf.model);
+ if (conf.host != NULL)
+ g_free (conf.host);
- if (conf.port != NULL)
- g_free (conf.port);
}
}
@@ -507,11 +452,7 @@
rotor_conf_t conf = {
.name = NULL,
- .model = NULL,
- .id = 0,
- .type = ROTOR_TYPE_AZEL,
- .port = NULL,
- .speed = 0,
+ .host = NULL,
.minaz = 0,
.maxaz = 360,
.minel = 0,
@@ -538,11 +479,7 @@
if (gtk_tree_selection_get_selected(selection, &selmod, &iter)) {
gtk_tree_model_get (model, &iter,
ROT_LIST_COL_NAME, &conf.name,
- ROT_LIST_COL_MODEL, &conf.model,
- ROT_LIST_COL_ID, &conf.id,
- ROT_LIST_COL_TYPE, &conf.type,
- ROT_LIST_COL_PORT, &conf.port,
- ROT_LIST_COL_SPEED, &conf.speed,
+ ROT_LIST_COL_HOST, &conf.host,
ROT_LIST_COL_MINAZ, &conf.minaz,
ROT_LIST_COL_MAXAZ, &conf.maxaz,
ROT_LIST_COL_MINEL, &conf.minel,
@@ -572,11 +509,7 @@
if (conf.name != NULL) {
gtk_list_store_set (GTK_LIST_STORE(model), &iter,
ROT_LIST_COL_NAME, conf.name,
- ROT_LIST_COL_MODEL, conf.model,
- ROT_LIST_COL_ID, conf.id,
- ROT_LIST_COL_TYPE, conf.type,
- ROT_LIST_COL_PORT, conf.port,
- ROT_LIST_COL_SPEED, conf.speed,
+ ROT_LIST_COL_HOST, conf.host,
ROT_LIST_COL_MINAZ, conf.minaz,
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
@@ -589,11 +522,9 @@
if (conf.name)
g_free (conf.name);
- if (conf.model != NULL)
- g_free (conf.model);
+ if (conf.host != NULL)
+ g_free (conf.host);
- if (conf.port != NULL)
- g_free (conf.port);
}
@@ -692,7 +623,7 @@
gtk_tree_model_get (model, iter, coli, &number, -1);
- switch (number) {
+/* switch (number) {
case ROTOR_TYPE_AZ:
g_object_set (renderer, "text", "AZ", NULL);
@@ -713,7 +644,7 @@
g_object_set (renderer, "text", "AZ", NULL);
break;
- }
+ }*/
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-07 10:17:40
|
Revision: 98
http://gpredict.svn.sourceforge.net/gpredict/?rev=98&view=rev
Author: csete
Date: 2008-09-07 10:17:50 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-07 10:16:41 UTC (rev 97)
+++ trunk/ChangeLog 2008-09-07 10:17:50 UTC (rev 98)
@@ -1,3 +1,10 @@
+2008-09-07; Alexandru Csete <oz...@gm...>
+
+ * src/gtk-rig-ctrl.c:
+ * src/gtk-rot-ctrl.[ch]:
+ Implemented AOS/LOS count down.
+
+
2008-09-06; Alexandru Csete <oz...@gm...>
* src/gtk-freq-knob.[ch]:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-09-07 10:16:41 UTC (rev 97)
+++ trunk/NEWS 2008-09-07 10:17:50 UTC (rev 98)
@@ -1,7 +1,7 @@
Changes in version 1.0 (TBD):
-x Radio doppler tuning via hamlibs rigctld.
+- Radio doppler tuning via hamlibs rigctld.
x Antenna rotator control via hamlibs rotctld.
x New layout engine allowing any number of views per module.
x SpaceView: New view show the satellites using a movable camera in space.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-07 10:49:52
|
Revision: 99
http://gpredict.svn.sourceforge.net/gpredict/?rev=99&view=rev
Author: csete
Date: 2008-09-07 10:49:56 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
Updated project URLs.
Modified Paths:
--------------
trunk/README
trunk/src/about.c
trunk/src/about.h
trunk/src/compat.c
trunk/src/compat.h
trunk/src/config-keys.h
trunk/src/defaults.h
trunk/src/first-time.c
trunk/src/first-time.h
trunk/src/gpredict-help.c
trunk/src/gpredict-help.h
trunk/src/gpredict-url-hook.c
trunk/src/gpredict-url-hook.h
trunk/src/gpredict-utils.c
trunk/src/gpredict-utils.h
trunk/src/gtk-azel-plot.c
trunk/src/gtk-azel-plot.h
trunk/src/gtk-freq-knob.c
trunk/src/gtk-freq-knob.h
trunk/src/gtk-met.c
trunk/src/gtk-met.h
trunk/src/gtk-polar-plot.c
trunk/src/gtk-polar-plot.h
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-polar-view-popup.h
trunk/src/gtk-polar-view.c
trunk/src/gtk-polar-view.h
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rig-ctrl.h
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
trunk/src/gtk-rot-knob.c
trunk/src/gtk-rot-knob.h
trunk/src/gtk-sat-data.c
trunk/src/gtk-sat-data.h
trunk/src/gtk-sat-list-col-sel.c
trunk/src/gtk-sat-list-col-sel.h
trunk/src/gtk-sat-list.c
trunk/src/gtk-sat-list.h
trunk/src/gtk-sat-map-ground-track.c
trunk/src/gtk-sat-map-ground-track.h
trunk/src/gtk-sat-map-popup.c
trunk/src/gtk-sat-map-popup.h
trunk/src/gtk-sat-map.c
trunk/src/gtk-sat-map.h
trunk/src/gtk-sat-module-popup.c
trunk/src/gtk-sat-module-popup.h
trunk/src/gtk-sat-module-tmg.c
trunk/src/gtk-sat-module-tmg.h
trunk/src/gtk-sat-module.c
trunk/src/gtk-sat-module.h
trunk/src/gtk-sat-tree.c
trunk/src/gtk-sat-tree.h
trunk/src/gtk-single-sat.c
trunk/src/gtk-single-sat.h
trunk/src/gtk-sky-glance.c
trunk/src/gtk-sky-glance.h
trunk/src/gui.c
trunk/src/gui.h
trunk/src/loc-tree.c
trunk/src/loc-tree.h
trunk/src/locator.h
trunk/src/main.c
trunk/src/map-selector.c
trunk/src/map-selector.h
trunk/src/menubar.c
trunk/src/menubar.h
trunk/src/mod-cfg-get-param.c
trunk/src/mod-cfg-get-param.h
trunk/src/mod-cfg.c
trunk/src/mod-cfg.h
trunk/src/mod-mgr.c
trunk/src/mod-mgr.h
trunk/src/orbit-tools.c
trunk/src/orbit-tools.h
trunk/src/pass-popup-menu.c
trunk/src/pass-popup-menu.h
trunk/src/pass-to-txt.c
trunk/src/pass-to-txt.h
trunk/src/predict-tools.c
trunk/src/predict-tools.h
trunk/src/qth-editor.c
trunk/src/qth-editor.h
trunk/src/radio-conf.c
trunk/src/radio-conf.h
trunk/src/rdv.c
trunk/src/rdv.h
trunk/src/rig-io.c
trunk/src/rig-io.h
trunk/src/rotor-conf.c
trunk/src/rotor-conf.h
trunk/src/sat-cfg.c
trunk/src/sat-cfg.h
trunk/src/sat-log-browser.c
trunk/src/sat-log-browser.h
trunk/src/sat-log.c
trunk/src/sat-log.h
trunk/src/sat-monitor.c
trunk/src/sat-monitor.h
trunk/src/sat-pass-dialogs.c
trunk/src/sat-pass-dialogs.h
trunk/src/sat-popup-menu.c
trunk/src/sat-popup-menu.h
trunk/src/sat-pref-conditions.c
trunk/src/sat-pref-conditions.h
trunk/src/sat-pref-debug.c
trunk/src/sat-pref-debug.h
trunk/src/sat-pref-formats.c
trunk/src/sat-pref-formats.h
trunk/src/sat-pref-general.c
trunk/src/sat-pref-general.h
trunk/src/sat-pref-help.c
trunk/src/sat-pref-help.h
trunk/src/sat-pref-interfaces.c
trunk/src/sat-pref-interfaces.h
trunk/src/sat-pref-layout.c
trunk/src/sat-pref-layout.h
trunk/src/sat-pref-list-view.c
trunk/src/sat-pref-list-view.h
trunk/src/sat-pref-map-view.c
trunk/src/sat-pref-map-view.h
trunk/src/sat-pref-modules.c
trunk/src/sat-pref-modules.h
trunk/src/sat-pref-multi-pass.c
trunk/src/sat-pref-multi-pass.h
trunk/src/sat-pref-polar-view.c
trunk/src/sat-pref-polar-view.h
trunk/src/sat-pref-predict.c
trunk/src/sat-pref-predict.h
trunk/src/sat-pref-qth-data.h
trunk/src/sat-pref-qth-editor.c
trunk/src/sat-pref-qth-editor.h
trunk/src/sat-pref-qth.c
trunk/src/sat-pref-qth.h
trunk/src/sat-pref-refresh.c
trunk/src/sat-pref-refresh.h
trunk/src/sat-pref-rig-data.h
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rig-editor.h
trunk/src/sat-pref-rig.c
trunk/src/sat-pref-rig.h
trunk/src/sat-pref-rot-data.h
trunk/src/sat-pref-rot-editor.c
trunk/src/sat-pref-rot-editor.h
trunk/src/sat-pref-rot.c
trunk/src/sat-pref-rot.h
trunk/src/sat-pref-single-pass.c
trunk/src/sat-pref-single-pass.h
trunk/src/sat-pref-single-sat.c
trunk/src/sat-pref-single-sat.h
trunk/src/sat-pref-sky-at-glance.c
trunk/src/sat-pref-sky-at-glance.h
trunk/src/sat-pref-tle.c
trunk/src/sat-pref-tle.h
trunk/src/sat-pref.c
trunk/src/sat-pref.h
trunk/src/sat-vis.c
trunk/src/sat-vis.h
trunk/src/save-pass.c
trunk/src/save-pass.h
trunk/src/sgpsdp/sgp_in.c
trunk/src/sgpsdp/test-001.c
trunk/src/sgpsdp/test-002.c
trunk/src/time-tools.c
trunk/src/time-tools.h
trunk/src/tle-lookup.c
trunk/src/tle-lookup.h
trunk/src/tle-tools.c
trunk/src/tle-tools.h
trunk/src/tle-update.c
trunk/src/tle-update.h
Modified: trunk/README
===================================================================
--- trunk/README 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/README 2008-09-07 10:49:56 UTC (rev 99)
@@ -49,8 +49,7 @@
* Very detailed information about both the real time data and the
predicted passes.
-Visit the gpredict homepage at http://groundstation.sourceforge.net/gpredict/
-for more info.
+Visit the gpredict homepage at http://gpredcit.oz9aec.net/ for more info.
@@ -93,7 +92,7 @@
a new module (Menubar->File->New Module). You are highly encouraged to have a look
at the user manual available at
-http://groundstation.sourceforge.net/gpredict/documents.php
+http://gpredict.oz9aec.net/documents.php
@@ -115,9 +114,11 @@
Gpredict is released under the GNU General Public License and comes with
NO WARRANTY whatsoever (well, maybe except that it works for us). See the
COPYING file for details. If you have problems installing or using Gpredict,
-feel free to ask for support. Comments and bugreports are also welcome. Please
-refer to the project page at SourceForge:
-http://sourceforge.net/projects/groundstation
+feel free to ask for support. There is a web based forum at
+http://forum.oz9aec.net/
+Bug trackers, mailing lists, etc, can be accessed at the project page
+at sourceforge:
+http://sourceforge.net/projects/gpredict
Happy Tracking!
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/about.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/about.h
===================================================================
--- trunk/src/about.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/about.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/compat.c
===================================================================
--- trunk/src/compat.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/compat.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/compat.h
===================================================================
--- trunk/src/compat.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/compat.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/config-keys.h
===================================================================
--- trunk/src/config-keys.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/config-keys.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/defaults.h
===================================================================
--- trunk/src/defaults.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/defaults.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/first-time.c
===================================================================
--- trunk/src/first-time.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/first-time.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/first-time.h
===================================================================
--- trunk/src/first-time.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/first-time.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gpredict-help.c
===================================================================
--- trunk/src/gpredict-help.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gpredict-help.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gpredict-help.h
===================================================================
--- trunk/src/gpredict-help.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gpredict-help.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gpredict-url-hook.c
===================================================================
--- trunk/src/gpredict-url-hook.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gpredict-url-hook.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gpredict-url-hook.h
===================================================================
--- trunk/src/gpredict-url-hook.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gpredict-url-hook.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gpredict-utils.c
===================================================================
--- trunk/src/gpredict-utils.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gpredict-utils.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gpredict-utils.h
===================================================================
--- trunk/src/gpredict-utils.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gpredict-utils.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-azel-plot.c
===================================================================
--- trunk/src/gtk-azel-plot.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-azel-plot.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-azel-plot.h
===================================================================
--- trunk/src/gtk-azel-plot.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-azel-plot.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-freq-knob.c
===================================================================
--- trunk/src/gtk-freq-knob.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-freq-knob.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-freq-knob.h
===================================================================
--- trunk/src/gtk-freq-knob.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-freq-knob.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-met.c
===================================================================
--- trunk/src/gtk-met.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-met.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-met.h
===================================================================
--- trunk/src/gtk-met.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-met.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-polar-plot.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-polar-plot.h
===================================================================
--- trunk/src/gtk-polar-plot.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-polar-plot.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-polar-view-popup.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-polar-view-popup.h
===================================================================
--- trunk/src/gtk-polar-view-popup.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-polar-view-popup.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-polar-view.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-polar-view.h
===================================================================
--- trunk/src/gtk-polar-view.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-polar-view.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-rig-ctrl.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-rig-ctrl.h
===================================================================
--- trunk/src/gtk-rig-ctrl.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-rig-ctrl.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-rot-ctrl.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-rot-knob.c
===================================================================
--- trunk/src/gtk-rot-knob.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-rot-knob.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-rot-knob.h
===================================================================
--- trunk/src/gtk-rot-knob.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-rot-knob.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-data.c
===================================================================
--- trunk/src/gtk-sat-data.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-data.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-data.h
===================================================================
--- trunk/src/gtk-sat-data.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-data.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-list-col-sel.c
===================================================================
--- trunk/src/gtk-sat-list-col-sel.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-list-col-sel.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-list-col-sel.h
===================================================================
--- trunk/src/gtk-sat-list-col-sel.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-list-col-sel.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-list.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-list.h
===================================================================
--- trunk/src/gtk-sat-list.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-list.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-map-ground-track.c
===================================================================
--- trunk/src/gtk-sat-map-ground-track.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-map-ground-track.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-map-ground-track.h
===================================================================
--- trunk/src/gtk-sat-map-ground-track.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-map-ground-track.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -8,10 +8,10 @@
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-map-popup.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-map-popup.h
===================================================================
--- trunk/src/gtk-sat-map-popup.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-map-popup.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-map.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -9,10 +9,10 @@
William J Beksi <wj...@us...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-map.h
===================================================================
--- trunk/src/gtk-sat-map.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-map.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -9,10 +9,10 @@
William J Beksi <wj...@us...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-module-popup.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-module-popup.h
===================================================================
--- trunk/src/gtk-sat-module-popup.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-module-popup.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-module-tmg.c
===================================================================
--- trunk/src/gtk-sat-module-tmg.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-module-tmg.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-module-tmg.h
===================================================================
--- trunk/src/gtk-sat-module-tmg.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-module-tmg.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-module.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-module.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-tree.c
===================================================================
--- trunk/src/gtk-sat-tree.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-tree.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sat-tree.h
===================================================================
--- trunk/src/gtk-sat-tree.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sat-tree.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-single-sat.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-single-sat.h
===================================================================
--- trunk/src/gtk-single-sat.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-single-sat.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sky-glance.c
===================================================================
--- trunk/src/gtk-sky-glance.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sky-glance.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gtk-sky-glance.h
===================================================================
--- trunk/src/gtk-sky-glance.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gtk-sky-glance.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gui.c
===================================================================
--- trunk/src/gui.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gui.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/gui.h
===================================================================
--- trunk/src/gui.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/gui.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/loc-tree.c
===================================================================
--- trunk/src/loc-tree.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/loc-tree.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/loc-tree.h
===================================================================
--- trunk/src/loc-tree.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/loc-tree.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/locator.h
===================================================================
--- trunk/src/locator.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/locator.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -8,10 +8,10 @@
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/main.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/map-selector.c
===================================================================
--- trunk/src/map-selector.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/map-selector.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/map-selector.h
===================================================================
--- trunk/src/map-selector.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/map-selector.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/menubar.c
===================================================================
--- trunk/src/menubar.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/menubar.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/menubar.h
===================================================================
--- trunk/src/menubar.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/menubar.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/mod-cfg-get-param.c
===================================================================
--- trunk/src/mod-cfg-get-param.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/mod-cfg-get-param.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/mod-cfg-get-param.h
===================================================================
--- trunk/src/mod-cfg-get-param.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/mod-cfg-get-param.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/mod-cfg.c
===================================================================
--- trunk/src/mod-cfg.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/mod-cfg.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/mod-cfg.h
===================================================================
--- trunk/src/mod-cfg.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/mod-cfg.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/mod-mgr.c
===================================================================
--- trunk/src/mod-mgr.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/mod-mgr.c 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/mod-mgr.h
===================================================================
--- trunk/src/mod-mgr.h 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/mod-mgr.h 2008-09-07 10:49:56 UTC (rev 99)
@@ -7,10 +7,10 @@
Authors: Alexandru Csete <oz...@gm...>
Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
+ http://sourceforge.net/projects/gpredict/
More details can be found at the project home page:
- http://groundstation.sourceforge.net/
+ http://gpredict.oz9aec.net/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/src/orbit-tools.c
===================================================================
--- trunk/src/orbit-tools.c 2008-09-07 10:17:50 UTC (rev 98)
+++ trunk/src/orb...
[truncated message content] |
|
From: <cs...@us...> - 2008-09-09 17:58:20
|
Revision: 102
http://gpredict.svn.sourceforge.net/gpredict/?rev=102&view=rev
Author: csete
Date: 2008-09-09 17:58:31 +0000 (Tue, 09 Sep 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-09 17:57:54 UTC (rev 101)
+++ trunk/ChangeLog 2008-09-09 17:58:31 UTC (rev 102)
@@ -1,3 +1,12 @@
+2008-09-09; Alexandru Csete <oz...@gm...>
+
+ * src/sat-pref-conditions.c:
+ * src/sat-cfg.[ch]:
+ * src/sat-vis.c:
+ Added support for variable twilight threshold in prediction of
+ satellite visibility.
+
+
2008-09-07; Alexandru Csete <oz...@gm...>
* src/gtk-rig-ctrl.c:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-09-09 17:57:54 UTC (rev 101)
+++ trunk/NEWS 2008-09-09 17:58:31 UTC (rev 102)
@@ -10,6 +10,7 @@
the selected satellite.
x The satellite map can show day/night side of Earh.
x Track the Sun and the Moon as if they were satellites.
+- User defined twilight threshold for predicting satellite visibility.
x Define obstacles for ground stations.
x Feature request 1613758: Command Line Interface to Gpredict.
- Feature request 1705375: Restore main window position and size.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-10 23:52:50
|
Revision: 106
http://gpredict.svn.sourceforge.net/gpredict/?rev=106&view=rev
Author: csete
Date: 2008-09-10 23:53:00 +0000 (Wed, 10 Sep 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-polar-plot.c
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-10 23:24:10 UTC (rev 105)
+++ trunk/ChangeLog 2008-09-10 23:53:00 UTC (rev 106)
@@ -1,3 +1,14 @@
+2008-09-10; Alexandru Csete <oz...@gm...>
+
+ * src/gtk-polar-plot.[ch]:
+ Added API to add/modify/delete the pass.
+ Changed to create local copy of the pass data.
+
+ * src/gtk-rot-ctrl.c:
+ Use new polar plot widget for showing status of target satellite
+ and rotator. However, this part has been disabled for now.
+
+
2008-09-09; Alexandru Csete <oz...@gm...>
* src/sat-pref-conditions.c:
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2008-09-10 23:24:10 UTC (rev 105)
+++ trunk/src/gtk-polar-plot.c 2008-09-10 23:53:00 UTC (rev 106)
@@ -241,8 +241,8 @@
{
GooCanvasItemModel *root;
gint idx,i;
-
-#if 0
+
+
/* remove sky track, time ticks and the pass itself */
if (plot->pass != NULL) {
/* remove sat from canvas */
@@ -263,9 +263,10 @@
}
if (pass != NULL) {
- create_track (GTK_POLAR_PLOT (plot));
+ plot->pass = copy_pass (pass);
+ create_track (plot);
}
-#endif
+
}
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-10 23:24:10 UTC (rev 105)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-10 23:53:00 UTC (rev 106)
@@ -41,6 +41,7 @@
#include "compat.h"
#include "sat-log.h"
#include "predict-tools.h"
+#include "gtk-polar-plot.h"
#include "gtk-rot-knob.h"
#include "gtk-rot-ctrl.h"
#ifdef HAVE_CONFIG_H
@@ -139,6 +140,7 @@
ctrl->target = NULL;
ctrl->pass = NULL;
ctrl->qth = NULL;
+ ctrl->plot = NULL;
ctrl->tracking = FALSE;
ctrl->busy = FALSE;
@@ -196,21 +198,21 @@
gdk_rgb_find_color (gtk_widget_get_colormap (widget), &ColGreen);
/* create contents */
- table = gtk_table_new (3, 2, TRUE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 5);
- gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+ table = gtk_table_new (2, 3, FALSE);
+ gtk_table_set_row_spacings (GTK_TABLE (table), 0);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 0);
gtk_container_set_border_width (GTK_CONTAINER (table), 10);
gtk_table_attach (GTK_TABLE (table), create_az_widgets (GTK_ROT_CTRL (widget)),
- 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ 0, 1, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0);
gtk_table_attach (GTK_TABLE (table), create_el_widgets (GTK_ROT_CTRL (widget)),
- 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ 1, 2, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0);
gtk_table_attach (GTK_TABLE (table), create_target_widgets (GTK_ROT_CTRL (widget)),
- 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+ 0, 1, 1, 2, GTK_FILL, GTK_SHRINK, 0, 0);
gtk_table_attach (GTK_TABLE (table), create_conf_widgets (GTK_ROT_CTRL (widget)),
- 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
- gtk_table_attach (GTK_TABLE (table), create_plot_widget (GTK_ROT_CTRL (widget)),
- 1, 2, 1, 3, GTK_FILL, GTK_FILL, 0, 0);
-
+ 1, 2, 1, 2, GTK_FILL, GTK_SHRINK, 0, 0);
+/* gtk_table_attach (GTK_TABLE (table), create_plot_widget (GTK_ROT_CTRL (widget)),
+ 2, 3, 0, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0);
+*/
gtk_container_add (GTK_CONTAINER (widget), table);
GTK_ROT_CTRL (widget)->timerid = g_timeout_add (GTK_ROT_CTRL (widget)->delay,
@@ -528,7 +530,10 @@
{
GtkWidget *frame;
+ ctrl->plot = gtk_polar_plot_new (ctrl->qth, ctrl->pass);
+
frame = gtk_frame_new (NULL);
+ gtk_container_add (GTK_CONTAINER (frame), ctrl->plot);
return frame;
}
@@ -579,6 +584,10 @@
}
}
+
+ /* in either case, we set the new pass (even if NULL) on the polar plot */
+ if (ctrl->plot != NULL)
+ gtk_polar_plot_set_pass (GTK_POLAR_PLOT (ctrl->plot), ctrl->pass);
}
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-09-10 23:24:10 UTC (rev 105)
+++ trunk/src/gtk-rot-ctrl.h 2008-09-10 23:53:00 UTC (rev 106)
@@ -71,6 +71,7 @@
/* other widgets */
GtkWidget *SatCnt;
GtkWidget *DevSel;
+ GtkWidget *plot; /*!< Polar plot widget */
/* satellites */
GSList *sats; /*!< List of sats in parent module */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-16 23:28:04
|
Revision: 115
http://gpredict.svn.sourceforge.net/gpredict/?rev=115&view=rev
Author: csete
Date: 2008-09-16 23:28:12 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
Finished implementation of the controller.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-rot-ctrl.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-16 20:38:57 UTC (rev 114)
+++ trunk/ChangeLog 2008-09-16 23:28:12 UTC (rev 115)
@@ -1,3 +1,10 @@
+2008-09-16; Alexandru Csete <oz...@gm...>
+
+ * src/gtk-rot-ctrl.[ch]:
+ Implemented correct management of next pass taking into account
+ that we may run in simulated time mode.
+
+
2008-09-10; Alexandru Csete <oz...@gm...>
* src/gtk-polar-plot.[ch]:
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-16 20:38:57 UTC (rev 114)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-16 23:28:12 UTC (rev 115)
@@ -544,8 +544,8 @@
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
- toler = gtk_spin_button_new_with_range (0.0, 10.0, 0.1);
- gtk_spin_button_set_digits (GTK_SPIN_BUTTON (toler), 1);
+ toler = gtk_spin_button_new_with_range (0.01, 10.0, 0.01);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (toler), 2);
gtk_widget_set_tooltip_text (toler,
_("This parameter controls the tolerance between "\
"the target and rotator values for the rotator.\n"\
@@ -729,6 +729,10 @@
sat_log_log (SAT_LOG_LEVEL_MSG,
_("Loaded new rotator configuration %s"),
ctrl->conf->name);
+
+ /* update new ranges of the Az and El controller widgets */
+ gtk_rot_knob_set_range (GTK_ROT_KNOB (ctrl->AzSet), ctrl->conf->minaz, ctrl->conf->maxaz);
+ gtk_rot_knob_set_range (GTK_ROT_KNOB (ctrl->ElSet), ctrl->conf->minel, ctrl->conf->maxel);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -785,6 +789,7 @@
{
GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
gdouble rotaz=0.0, rotel=0.0;
+ gdouble setaz,setel;
gchar *text;
@@ -833,7 +838,14 @@
g_free (text);
/* if tolerance exceeded */
- /* TODO: send controller values to rotator device */
+ setaz = gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->AzSet));
+ setel = gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->ElSet));
+ if ((fabs(setaz-rotaz) > ctrl->tolerance) ||
+ (fabs(setel-rotel) > ctrl->tolerance)) {
+ /* send controller values to rotator device */
+ set_pos (ctrl, setaz, setel);
+ }
+
/* TODO: update polar plot */
}
@@ -956,9 +968,85 @@
}
+/** \brief Send new position to rotator device
+ * \param ctrl Poitner to the GtkRotCtrl widget
+ * \param az The new Azimuth
+ * \param el The new Elevation
+ *
+ * \note The function does not perform any range check since the GtkRotKnob
+ * should always keep its value within range.
+ */
static void set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el)
{
+ gchar *buff;
+ gchar azstr[8],elstr[8];
+ gint written,size;
+ gint status;
+ struct hostent *h;
+ struct sockaddr_in ServAddr;
+ gint sock; /*!< Network socket */
+
+ /* create socket */
+ sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (sock < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to create socket"),
+ __FILE__, __LINE__);
+ return;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%d Network socket created successfully"),
+ __FILE__, __LINE__);
+ }
+
+ memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
+ ServAddr.sin_family = AF_INET; /* Internet address family */
+ h = gethostbyname(ctrl->conf->host);
+ memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
+ ServAddr.sin_port = htons(ctrl->conf->port); /* Server port */
+
+ /* establish connection */
+ status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
+ if (status < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to connect to %s:%d"),
+ __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
+ return;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%d: Connection opened to %s:%d"),
+ __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
+ }
+
+ /* send command */
+ g_ascii_formatd (azstr, 8, "%7.2f", az);
+ g_ascii_formatd (elstr, 8, "%7.2f", el);
+ buff = g_strdup_printf ("P %s %s\n", azstr, elstr);
+
+ /* number of bytes to write depends on platform (EOL) */
+#ifdef G_OS_WIN32
+ size = 19;
+#else
+ size = 18;
+#endif
+ written = send(sock, buff, size, 0);
+ if (written != size) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: SIZE ERROR %d / %d"),
+ __FILE__, __LINE__, written, size);
+ }
+
+ g_print ("SZ:%d WR:%d AZ:%s EL:%s STR:%s", size, written, azstr, elstr, buff);
+
+ g_free (buff);
+
+ shutdown (sock, SHUT_RDWR);
+ close (sock);
+
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-18 12:04:31
|
Revision: 138
http://gpredict.svn.sourceforge.net/gpredict/?rev=138&view=rev
Author: csete
Date: 2008-09-18 19:04:42 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/um/gpredict-user-manual.odt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-18 19:04:00 UTC (rev 137)
+++ trunk/ChangeLog 2008-09-18 19:04:42 UTC (rev 138)
@@ -1,5 +1,16 @@
-2008-09-19; Alexandru Csete <oz...@gm...>
+2008-09-18; Alexandru Csete <oz...@gm...>
+ * src/gtk-rig-ctrl.[ch]:
+ Implemented active feedback to take into account frequency changes made
+ via radio dial. Removed newline from the end of hamlib commands.
+ Improved controller algorithm to only set frequency if it has changed.
+
+ * src/gtk-rot-ctrl.c:
+ Removed newline from the end of hamlib commands.
+
+
+2008-09-18; Alexandru Csete <oz...@gm...>
+
* src/rotor-conf.[ch]:
Added field for storing rotator azimuth type, i.e. whether the rotator
azimuth goes 0..360 or -180..+180.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-25 22:30:50
|
Revision: 161
http://gpredict.svn.sourceforge.net/gpredict/?rev=161&view=rev
Author: csete
Date: 2008-10-25 22:30:41 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
Uodated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/src/sat-pref-conditions.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-25 22:07:53 UTC (rev 160)
+++ trunk/ChangeLog 2008-10-25 22:30:41 UTC (rev 161)
@@ -1,3 +1,20 @@
+2008-10-25; Alexandru Csete <oz...@gm...>
+
+ * src/gtk-sky-glance.[ch]:
+ Added start time as parameter.
+
+ * src/gtk-sat-module-popup.c:
+ Use real time or simulated time for sky at glance start depending
+ on user settings.
+
+ * src/gtk-single-sat.[ch]:
+ * src/gtk-sat-module.c:
+ * src/gtk-polar-view-popup.c:
+ * src/gtk-sat-map-popup.c:
+ Use real or simulated time for pass predictions. Enabled tooltips for
+ labels in GtkSingleSat.
+
+
2008-10-24; Alexandru Csete <oz...@gm...>
* src/sat-cfg.[ch]:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-10-25 22:07:53 UTC (rev 160)
+++ trunk/NEWS 2008-10-25 22:30:41 UTC (rev 161)
@@ -1,10 +1,11 @@
+Changes in version 1.0 (beta):
-Changes in version 1.0 (TBD):
-
- Radio doppler tuning via hamlibs rigctld.
- Antenna rotator control via hamlibs rotctld.
- User defined twilight threshold for predicting satellite visibility.
- Feature request 1705375: Restore main window position and size.
+* Feature request 2192404: Starting time for pass predictions.
+* Feature request 2194621: Data recorder.
- Fixed bug 1752908: New satellites in TLE files.
- Fixed bug 1818144: No log file created at first execution.
- Fixed bug 1839140: Sky at a glance axis incorrectly labelled.
Modified: trunk/src/sat-pref-conditions.c
===================================================================
--- trunk/src/sat-pref-conditions.c 2008-10-25 22:07:53 UTC (rev 160)
+++ trunk/src/sat-pref-conditions.c 2008-10-25 22:30:41 UTC (rev 161)
@@ -339,7 +339,7 @@
G_CALLBACK (spin_changed_cb), NULL);
gtk_table_attach (GTK_TABLE (table), tzero, 0, 3, 13, 14,
- GTK_FILL, GTK_SHRINK,
+ GTK_FILL | GTK_EXPAND, GTK_SHRINK,
0, 0);
/* create vertical box */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-03-17 21:41:17
|
Revision: 200
http://gpredict.svn.sourceforge.net/gpredict/?rev=200&view=rev
Author: csete
Date: 2009-03-17 21:41:06 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
Applied new patch removing proxy configuration.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/src/sat-cfg.c
trunk/src/sat-cfg.h
trunk/src/sat-pref-tle.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-16 20:32:52 UTC (rev 199)
+++ trunk/ChangeLog 2009-03-17 21:41:06 UTC (rev 200)
@@ -1,5 +1,12 @@
2009-03-16 Bruce Cowan <bc...@fa...>
+ * src/sat-cfg.[ch]:
+ * src/sat-pref-tle.c:
+ Remove proxy configuration item, taken care by GVFS.
+
+
+2009-03-16 Bruce Cowan <bc...@fa...>
+
* src/menubar.c:
* src/tle-update.c:
Port TLE download to GIO.
@@ -15,6 +22,7 @@
* NEWS:
Updated.
+
2009-03-01; Alexandru Csete <oz...@gm...>
* configure.ac:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-03-16 20:32:52 UTC (rev 199)
+++ trunk/NEWS 2009-03-17 21:41:06 UTC (rev 200)
@@ -18,6 +18,7 @@
- Fixed bug 2130912: Crash when no rig or no rotator are defined.
- Fixed bug 2170642: Small error in user manual.
- Applied patch 2688135: Use GIO instead of libcurl for TLE download.
+ Note: This removes proxy management from gpredict.
x Windows: New installer instead of ZIP distribution.
- Updated PDF user manual.
- French translation.
Modified: trunk/src/sat-cfg.c
===================================================================
--- trunk/src/sat-cfg.c 2009-03-16 20:32:52 UTC (rev 199)
+++ trunk/src/sat-cfg.c 2009-03-17 21:41:06 UTC (rev 200)
@@ -130,7 +130,6 @@
{ "MODULES", "POLAR_CURSOR_TRACK", TRUE},
{ "MODULES", "POLAR_EXTRA_AZ_TICKS", FALSE},
{ "TLE", "SERVER_AUTH", FALSE},
- { "TLE", "PROXY_AUTH", FALSE},
{ "TLE", "ADD_NEW_SATS", TRUE},
{ "LOG", "KEEP_LOG_FILES", FALSE},
{ "PREDICT", "USE_REAL_T0", FALSE}
@@ -215,7 +214,6 @@
{ "TLE", "SERVER", "http://www.celestrak.com/NORAD/elements/"},
{ "TLE", "FILES", "amateur.txt;cubesat.txt;galileo.txt;geo.txt;gps-ops.txt;"\
"iridium.txt;military.txt;radar.txt;science.txt;weather.txt"},
- { "TLE", "PROXY", NULL},
{ "TLE", "FILE_DIR", NULL},
{ "TLE", "EXTENSION", "*.*"},
{ "PREDICT", "SAVE_DIR", NULL}
Modified: trunk/src/sat-cfg.h
===================================================================
--- trunk/src/sat-cfg.h 2009-03-16 20:32:52 UTC (rev 199)
+++ trunk/src/sat-cfg.h 2009-03-17 21:41:06 UTC (rev 200)
@@ -52,7 +52,6 @@
SAT_CFG_BOOL_POL_SHOW_CURS_TRACK, /*!< Track mouse cursor on polar plot. */
SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS, /*!< Extra Az ticks at every 30 deg. */
SAT_CFG_BOOL_TLE_SERVER_AUTH, /*!< TLE server requires authentication. */
- SAT_CFG_BOOL_TLE_PROXY_AUTH, /*!< Proxy requires authentication. */
SAT_CFG_BOOL_TLE_ADD_NEW, /*!< Add new satellites to database. */
SAT_CFG_BOOL_KEEP_LOG_FILES, /*!< Whether to keep old log files */
SAT_CFG_BOOL_PRED_USE_REAL_T0, /*!< Whether to use current time as T0 fro predictions */
@@ -139,7 +138,6 @@
SAT_CFG_STR_POL_FONT, /*!< Polar view font. */
SAT_CFG_STR_TLE_SERVER, /*!< Server for TLE updates. */
SAT_CFG_STR_TLE_FILES, /*!< ; separated list of files on server. */
- SAT_CFG_STR_TLE_PROXY, /*!< Proxy server. */
SAT_CFG_STR_TLE_FILE_DIR, /*!< Local directory from which tle were last updated. */
SAT_CFG_STR_TLE_FILE_EXT, /*!< File extensions. */
SAT_CFG_STR_PRED_SAVE_DIR, /*!< Last used save directory for pass predictions */
Modified: trunk/src/sat-pref-tle.c
===================================================================
--- trunk/src/sat-pref-tle.c 2009-03-16 20:32:52 UTC (rev 199)
+++ trunk/src/sat-pref-tle.c 2009-03-17 21:41:06 UTC (rev 200)
@@ -42,7 +42,7 @@
static GtkWidget *warn,*autom;
/* internet updates */
-static GtkWidget *server,*proxy,*files;
+static GtkWidget *server,*files;
/* add new sats */
static GtkWidget *addnew;
@@ -134,10 +134,6 @@
sat_cfg_set_str (SAT_CFG_STR_TLE_SERVER,
gtk_entry_get_text (GTK_ENTRY (server)));
- /* proxy */
- sat_cfg_set_str (SAT_CFG_STR_TLE_PROXY,
- gtk_entry_get_text (GTK_ENTRY (proxy)));
-
/* files */
sat_cfg_set_str (SAT_CFG_STR_TLE_FILES,
gtk_entry_get_text (GTK_ENTRY (files)));
@@ -154,7 +150,6 @@
sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ);
sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION);
sat_cfg_reset_str (SAT_CFG_STR_TLE_SERVER);
- sat_cfg_reset_str (SAT_CFG_STR_TLE_PROXY);
sat_cfg_reset_str (SAT_CFG_STR_TLE_FILES);
sat_cfg_reset_bool (SAT_CFG_BOOL_TLE_ADD_NEW);
@@ -255,24 +250,7 @@
g_signal_connect (server, "changed", G_CALLBACK (value_changed_cb), NULL);
gtk_table_attach (GTK_TABLE (table), server, 1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
- /* proxy */
- label = gtk_label_new (_("Proxy server:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
- proxy = gtk_entry_new ();
- if (sat_cfg_get_str (SAT_CFG_STR_TLE_PROXY))
- gtk_entry_set_text (GTK_ENTRY (proxy), sat_cfg_get_str (SAT_CFG_STR_TLE_PROXY));
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, proxy,
- _("Enter URL for local proxy server. e.g.\n"\
- "http://my.proxy.com"),
- NULL);
- g_signal_connect (proxy, "changed", G_CALLBACK (value_changed_cb), NULL);
- gtk_table_attach (GTK_TABLE (table), proxy, 1, 2, 1, 2,
- GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
/* Files */
label = gtk_label_new (_("Files to fetch:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
@@ -396,9 +374,6 @@
/* server */
gtk_entry_set_text (GTK_ENTRY (server), sat_cfg_get_str_def (SAT_CFG_STR_TLE_SERVER));
- /* proxy */
- gtk_entry_set_text (GTK_ENTRY (proxy), "");
-
/* files */
gtk_entry_set_text (GTK_ENTRY (files), sat_cfg_get_str_def (SAT_CFG_STR_TLE_FILES));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-03-21 12:51:25
|
Revision: 208
http://gpredict.svn.sourceforge.net/gpredict/?rev=208&view=rev
Author: csete
Date: 2009-03-21 12:51:22 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Make LO values optional.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/radio-conf.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-21 11:47:36 UTC (rev 207)
+++ trunk/ChangeLog 2009-03-21 12:51:22 UTC (rev 208)
@@ -1,7 +1,7 @@
2009-03-21 Alexandru Csete <oz...@gm...>
* src/radio-conf.[ch]:
- Added config field for uplink transverter LO.
+ Added config field for uplink transverter LO. LO values are now optional.
2009-03-21 Stephane Fillod <fi...@us...>
Modified: trunk/src/radio-conf.c
===================================================================
--- trunk/src/radio-conf.c 2009-03-21 11:47:36 UTC (rev 207)
+++ trunk/src/radio-conf.c 2009-03-21 12:51:22 UTC (rev 208)
@@ -110,25 +110,37 @@
return FALSE;
}
- conf->lo = g_key_file_get_double (cfg, GROUP, KEY_LO, &error);
- if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error reading radio conf from %s (%s)."),
- __FUNCTION__, conf->name, error->message);
- g_clear_error (&error);
- g_key_file_free (cfg);
- return FALSE;
+ /* KEY_LO is optional */
+ if (g_key_file_has_key (cfg, GROUP, KEY_LO, NULL)) {
+ conf->lo = g_key_file_get_double (cfg, GROUP, KEY_LO, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading radio conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
}
+ else {
+ conf->lo = 0.0;
+ }
- conf->loup = g_key_file_get_double (cfg, GROUP, KEY_LOUP, &error);
- if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error reading radio conf from %s (%s)."),
- __FUNCTION__, conf->name, error->message);
- g_clear_error (&error);
- g_key_file_free (cfg);
- return FALSE;
+ /* KEY_LOUP is optional */
+ if (g_key_file_has_key (cfg, GROUP, KEY_LOUP, NULL)) {
+ conf->loup = g_key_file_get_double (cfg, GROUP, KEY_LOUP, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading radio conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
}
+ else {
+ conf->loup = 0.0;
+ }
conf->type = g_key_file_get_integer (cfg, GROUP, KEY_TYPE, &error);
if (error != NULL) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-03-21 13:09:27
|
Revision: 209
http://gpredict.svn.sourceforge.net/gpredict/?rev=209&view=rev
Author: csete
Date: 2009-03-21 13:09:10 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Update code to include upconverter LO frequency.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/sat-pref-rig-data.h
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rig.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-21 12:51:22 UTC (rev 208)
+++ trunk/ChangeLog 2009-03-21 13:09:10 UTC (rev 209)
@@ -3,6 +3,11 @@
* src/radio-conf.[ch]:
Added config field for uplink transverter LO. LO values are now optional.
+ * src/sat-pref-rig-data.h:
+ * src/sat-pref-rig.c:
+ * src/sat-pref-rig-editor.c:
+ Update code to include upconverter LO frequency.
+
2009-03-21 Stephane Fillod <fi...@us...>
Modified: trunk/src/sat-pref-rig-data.h
===================================================================
--- trunk/src/sat-pref-rig-data.h 2009-03-21 12:51:22 UTC (rev 208)
+++ trunk/src/sat-pref-rig-data.h 2009-03-21 13:09:10 UTC (rev 209)
@@ -35,7 +35,8 @@
RIG_LIST_COL_PORT, /*!< Port number */
RIG_LIST_COL_TYPE, /*!< Radio type */
RIG_LIST_COL_PTT, /*!< PTT */
- RIG_LIST_COL_LO, /*!< Local oscillator freq */
+ RIG_LIST_COL_LO, /*!< Local oscillator freq (downlink) */
+ RIG_LIST_COL_LOUP, /*!< Local oscillato freq (uplink) */
RIG_LIST_COL_NUM /*!< The number of fields in the list. */
} rig_list_col_t;
Modified: trunk/src/sat-pref-rig-editor.c
===================================================================
--- trunk/src/sat-pref-rig-editor.c 2009-03-21 12:51:22 UTC (rev 208)
+++ trunk/src/sat-pref-rig-editor.c 2009-03-21 13:09:10 UTC (rev 209)
@@ -56,7 +56,8 @@
static GtkWidget *port; /* port number */
static GtkWidget *type; /* rig type */
static GtkWidget *ptt; /* PTT */
-static GtkWidget *lo; /* local oscillator */
+static GtkWidget *lo; /* local oscillator of downconverter */
+static GtkWidget *loup; /* local oscillator of upconverter */
static GtkWidget *create_editor_widgets (radio_conf_t *conf);
@@ -144,7 +145,7 @@
- table = gtk_table_new (6, 4, FALSE);
+ table = gtk_table_new (7, 4, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
gtk_table_set_row_spacings (GTK_TABLE (table), 5);
@@ -212,7 +213,7 @@
"<b>TX only:</b> The radio shall only be used for uplink. "\
"If <i>Monitor PTT status</i> is checked the doppler tuning "\
"will be suspended while PTT is OFF (manual RX).\n"\
- "<b>RX/TX:</b> The radio should be used for both up- and downlink "\
+ "<b>Simplex TRX:</b> The radio should be used for both up- and downlink "\
"but in simplex mode only. This option requires that the PTT status "\
"is monitored (otherwise gpredict cannot know whether to tune the "\
"RX or the TX).\n"\
@@ -232,8 +233,8 @@
gtk_table_attach_defaults (GTK_TABLE (table), ptt, 1, 4, 4, 5);
- /* LO frequency */
- label = gtk_label_new (_("LO"));
+ /* Downconverter LO frequency */
+ label = gtk_label_new (_("LO Down:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 5, 6);
@@ -241,13 +242,32 @@
gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), 0);
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (lo), 0);
gtk_widget_set_tooltip_text (lo,
- _("Enter the frequency of the local oscillator, if any."));
+ _("Enter the frequency of the local oscillator "\
+ " of the downconverter, if any."));
gtk_table_attach_defaults (GTK_TABLE (table), lo, 1, 3, 5, 6);
label = gtk_label_new (_("MHz"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 5, 6);
+ /* Upconverter LO frequency */
+ label = gtk_label_new (_("LO Up:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 6, 7);
+
+ loup = gtk_spin_button_new_with_range (-10000, 10000, 1);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (loup), 0);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (loup), 0);
+ gtk_widget_set_tooltip_text (loup,
+ _("Enter the frequency of the local oscillator "\
+ "of the upconverter, if any."));
+ gtk_table_attach_defaults (GTK_TABLE (table), loup, 1, 3, 6, 7);
+
+ label = gtk_label_new (_("MHz"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 6, 7);
+
+
if (conf->name != NULL)
update_widgets (conf);
@@ -310,8 +330,12 @@
}
- /* lo in MHz */
+ /* lo down in MHz */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), conf->lo / 1000000.0);
+
+ /* lo up in MHz */
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (loup), conf->loup / 1000000.0);
+
}
@@ -328,6 +352,7 @@
gtk_entry_set_text (GTK_ENTRY (host), "");
gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4532); /* hamlib default? */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), 0);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (loup), 0);
gtk_combo_box_set_active (GTK_COMBO_BOX (type), RIG_TYPE_RX);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ptt), FALSE);
}
@@ -358,9 +383,12 @@
/* port */
conf->port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (port));
- /* lo freq */
+ /* lo down freq */
conf->lo = 1000000.0*gtk_spin_button_get_value (GTK_SPIN_BUTTON (lo));
+ /* lo up freq */
+ conf->loup = 1000000.0*gtk_spin_button_get_value (GTK_SPIN_BUTTON (loup));
+
/* rig type */
conf->type = gtk_combo_box_get_active (GTK_COMBO_BOX (type));
Modified: trunk/src/sat-pref-rig.c
===================================================================
--- trunk/src/sat-pref-rig.c 2009-03-21 12:51:22 UTC (rev 208)
+++ trunk/src/sat-pref-rig.c 2009-03-21 13:09:10 UTC (rev 209)
@@ -168,9 +168,9 @@
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
- /* lo */
+ /* transverter down */
renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("LO Freq. (MHz)"), renderer,
+ column = gtk_tree_view_column_new_with_attributes (_("Downconverter LO"), renderer,
"text", RIG_LIST_COL_LO,
NULL);
gtk_tree_view_column_set_cell_data_func (column, renderer,
@@ -179,6 +179,17 @@
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
+ /* transverter up */
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Upconverter LO"), renderer,
+ "text", RIG_LIST_COL_LOUP,
+ NULL);
+ gtk_tree_view_column_set_cell_data_func (column, renderer,
+ render_lo,
+ GUINT_TO_POINTER(RIG_LIST_COL_LOUP),
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
+
}
@@ -202,7 +213,8 @@
G_TYPE_INT, // port
G_TYPE_INT, // type
G_TYPE_BOOLEAN, // PTT
- G_TYPE_DOUBLE // LO
+ G_TYPE_DOUBLE, // LO DOWN
+ G_TYPE_DOUBLE // LO UO
);
/* open configuration directory */
@@ -231,6 +243,7 @@
RIG_LIST_COL_TYPE, conf.type,
RIG_LIST_COL_PTT, conf.ptt,
RIG_LIST_COL_LO, conf.lo,
+ RIG_LIST_COL_LOUP, conf.loup,
-1);
sat_log_log (SAT_LOG_LEVEL_DEBUG,
@@ -342,6 +355,7 @@
.type = RIG_TYPE_RX,
.ptt = FALSE,
.lo = 0.0,
+ .loup = 0.0,
};
@@ -384,6 +398,7 @@
RIG_LIST_COL_TYPE, &conf.type,
RIG_LIST_COL_PTT, &conf.ptt,
RIG_LIST_COL_LO, &conf.lo,
+ RIG_LIST_COL_LOUP, &conf.loup,
-1);
radio_conf_save (&conf);
@@ -424,6 +439,7 @@
.type = RIG_TYPE_RX,
.ptt = FALSE,
.lo = 0.0,
+ .loup = 0.0,
};
/* run rig conf editor */
@@ -440,6 +456,7 @@
RIG_LIST_COL_TYPE, conf.type,
RIG_LIST_COL_PTT, conf.ptt,
RIG_LIST_COL_LO, conf.lo,
+ RIG_LIST_COL_LOUP, conf.loup,
-1);
g_free (conf.name);
@@ -472,6 +489,7 @@
.type = RIG_TYPE_RX,
.ptt = FALSE,
.lo = 0.0,
+ .loup = 0.0,
};
@@ -499,6 +517,7 @@
RIG_LIST_COL_TYPE, &conf.type,
RIG_LIST_COL_PTT, &conf.ptt,
RIG_LIST_COL_LO, &conf.lo,
+ RIG_LIST_COL_LOUP, &conf.loup,
-1);
}
@@ -529,6 +548,7 @@
RIG_LIST_COL_TYPE, conf.type,
RIG_LIST_COL_PTT, conf.ptt,
RIG_LIST_COL_LO, conf.lo,
+ RIG_LIST_COL_LOUP, conf.loup,
-1);
}
@@ -717,7 +737,7 @@
/* convert to MHz */
number /= 1000000.0;
- buff = g_strdup_printf ("%.0f", number);
+ buff = g_strdup_printf ("%.0f MHz", number);
g_object_set (renderer, "text", buff, NULL);
g_free (buff);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-03-29 20:00:50
|
Revision: 214
http://gpredict.svn.sourceforge.net/gpredict/?rev=214&view=rev
Author: csete
Date: 2009-03-29 20:00:44 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
Added files for transpoder data file I/O.
Modified Paths:
--------------
trunk/po/POTFILES.in
trunk/src/Makefile.am
Added Paths:
-----------
trunk/src/trsp-conf.c
trunk/src/trsp-conf.h
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2009-03-22 11:48:22 UTC (rev 213)
+++ trunk/po/POTFILES.in 2009-03-29 20:00:44 UTC (rev 214)
@@ -103,3 +103,4 @@
src/save-pass.c
src/tle-tools.c
src/tle-update.c
+src/trsp-conf.c
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-03-22 11:48:22 UTC (rev 213)
+++ trunk/src/Makefile.am 2009-03-29 20:00:44 UTC (rev 214)
@@ -71,6 +71,7 @@
qth-editor.c qth-editor.h \
radio-conf.c radio-conf.h \
rotor-conf.c rotor-conf.h \
+ trsp-conf.c trsp-conf.h \
sat-cfg.c sat-cfg.h \
sat-info.c sat-info.h \
sat-log.c sat-log.h \
Added: trunk/src/trsp-conf.c
===================================================================
--- trunk/src/trsp-conf.c (rev 0)
+++ trunk/src/trsp-conf.c 2009-03-29 20:00:44 UTC (rev 214)
@@ -0,0 +1,78 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ Gpredict: Real-time satellite tracking and orbit prediction program
+
+ Copyright (C) 2001-2008 Alexandru Csete.
+
+ Authors: Alexandru Csete <oz...@gm...>
+
+ Comments, questions and bugreports should be submitted via
+ http://sourceforge.net/projects/gpredict/
+ More details can be found at the project home page:
+
+ http://gpredict.oz9aec.net/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, visit http://www.fsf.org/
+
+*/
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include "sat-log.h"
+#include "compat.h"
+
+#include "trsp-conf.h"
+
+#define KEY_UP_LOW "UP_LOW"
+#define KEY_UP_HIGH "UP_HIGH"
+#define KEY_DOWN_LOW "DOWN_LOW"
+#define KEY_DOWN_HIGH "DOWN_HIGH"
+#define KEY_INV "INVERT"
+
+
+GSList *read_tranponders (guint catnum)
+{
+ GKeyFile *cfg = NULL;
+ GError *error = NULL;
+ gchar *name,*fname,*confdir;
+
+ name = g_strdup_printf ("%d.tsrp", catnum);
+ confdir = get_conf_dir();
+ fname = g_strconcat (confdir, G_DIR_SEPARATOR_S,
+ "trsp", G_DIR_SEPARATOR_S,
+ name, NULL);
+
+ cfg = g_key_file_new ();
+ if (!g_key_file_load_from_file (cfg, fname, G_KEY_FILE_KEEP_COMMENTS, &error)) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading %s: %s"),
+ __FILE__, fname, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ }
+
+ g_key_file_free (cfg);
+ g_free (name);
+ g_free (confdir);
+ g_free (fname);
+
+
+ return NULL;
+}
+
+void write_transponders (guint catnum, GSList *transp)
+{
+
+}
+
Added: trunk/src/trsp-conf.h
===================================================================
--- trunk/src/trsp-conf.h (rev 0)
+++ trunk/src/trsp-conf.h 2009-03-29 20:00:44 UTC (rev 214)
@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ Gpredict: Real-time satellite tracking and orbit prediction program
+
+ Copyright (C) 2001-2008 Alexandru Csete.
+
+ Authors: Alexandru Csete <oz...@gm...>
+
+ Comments, questions and bugreports should be submitted via
+ http://sourceforge.net/projects/gpredict/
+ More details can be found at the project home page:
+
+ http://gpredict.oz9aec.net/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, visit http://www.fsf.org/
+
+
+*/
+#ifndef TRSP_CONF_H
+#define TRSP_CONF_H 1
+
+#include <glib.h>
+
+/* NOTE For beacons uplow=uphigh=0 and downlow=downhigh */
+typedef struct {
+ gchar *name; /*!< The name of the transponder (same as config group) */
+ gdouble uplow; /*!< Lower limit of uplink. */
+ gdouble uphigh; /*!< Upper limit of uplink. */
+ gdouble downlow; /*!< Lower limit of downlink. */
+ gdouble downhigh; /*!< Upper limit of donlink. */
+ gboolean invert; /*!< Flag indicating whether transponder is inverting. */
+} trsp_t;
+
+/* The actual data would then be a singly linked list with pointers to transponder_t structures */
+
+GSList *read_tranponders (guint catnum);
+void write_transponders (guint catnum, GSList *transp);
+
+
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-04-13 11:20:38
|
Revision: 267
http://gpredict.svn.sourceforge.net/gpredict/?rev=267&view=rev
Author: csete
Date: 2009-04-13 11:20:28 +0000 (Mon, 13 Apr 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/README
trunk/TODO
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-04-13 10:53:28 UTC (rev 266)
+++ trunk/ChangeLog 2009-04-13 11:20:28 UTC (rev 267)
@@ -1,3 +1,9 @@
+2009-04-13 Alexandru Csete <oz...@gm...>
+
+ * src/predict-tools.c:
+ Fixed a bug that could cause find_aos() to go into infinite loop.
+
+
2009-04-12 Alexandru Csete <oz...@gm...>
* src/gtk-rig-ctrl.c:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-04-13 10:53:28 UTC (rev 266)
+++ trunk/NEWS 2009-04-13 11:20:28 UTC (rev 267)
@@ -14,6 +14,7 @@
- Feature request 2192404: Starting time for pass predictions.
- Feature request 2347471: Use system goocanvas.
- Feature request 2130940: Transponder info in gpredict.
+- Fixed a bug that could cause gpredict to hang during pass predictions.
- Fixed bug 2139102: rigctld port.
- Fixed bug 2130912: Crash when no rig or no rotator are defined.
- Fixed bug 2130914: Gpredict doesn't handle PTT.
Modified: trunk/README
===================================================================
--- trunk/README 2009-04-13 10:53:28 UTC (rev 266)
+++ trunk/README 2009-04-13 11:20:28 UTC (rev 267)
@@ -1,9 +1,4 @@
-
-TO BE UPDATED BEFORE NEXT RELEASE
-
-
-
WHAT IS GPREDICT?
=================
@@ -49,10 +44,13 @@
for successful compilation of Gpredict:
- Gtk+ 2.12 or later
+- GLib 2.16 or later
+- Gio 2.16 or later (including gvfs)
+- GooCanvas 0.9 or later
- Hamlib (runtime only, not required for build)
If you compile Gpredict from source you will also need the development parts
-of the above mentioned libraries, i.e. gtk+-dev or gtk+-devel and so on.
+of the above mentioned libraries, e.g. gtk+-dev or gtk+-devel and so on.
To install gpredict from source unpack the source package with:
@@ -67,8 +65,12 @@
The last step usually requires you to become root, otherwise you may not have
the required permissions to install gpredict. If you can not or do not want to
install gpredict as root, you can install gpredict into a custom directory by
- adding --prefix=somedir to the ./configure step.
+adding --prefix=somedir to the ./configure step. For example
+ ./configure --prefix=/home/alexc/predict
+
+will configure the build to install the files into /home/alexc/gpredict folder.
+
If the configure step fails with an error, examine the output. It will usually
tell you which package or libraries you need in order to build gpredict. Please
note, that you also need the so-called development packages. In many GNU/Linux
@@ -96,10 +98,11 @@
====================
Gpredict is released under the GNU General Public License and comes with
-NO WARRANTY whatsoever (well, maybe except that it works for us). See the
+NO WARRANTY whatsoever (well, maybe except that it works for me). See the
COPYING file for details. If you have problems installing or using Gpredict,
feel free to ask for support. There is a web based forum at
http://forum.oz9aec.net/
+
Bug trackers, mailing lists, etc, can be accessed at the project page
at sourceforge:
http://sourceforge.net/projects/gpredict
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2009-04-13 10:53:28 UTC (rev 266)
+++ trunk/TODO 2009-04-13 11:20:28 UTC (rev 267)
@@ -1,7 +1,6 @@
Future plans for gpredict development include:
* Show day/night on satmap.
-* Optionally, use simulated time as T0 for predictions.
* TLE editor.
* Advanced pass predictor.
* Predict communication windows between two ground stations.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-04-14 21:06:58
|
Revision: 268
http://gpredict.svn.sourceforge.net/gpredict/?rev=268&view=rev
Author: csete
Date: 2009-04-14 21:06:51 +0000 (Tue, 14 Apr 2009)
Log Message:
-----------
Reverted TLE updater to libcurl instead of GIO (was patch 2688135, see reason in comments).
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/README
trunk/configure.ac
trunk/src/sat-cfg.c
trunk/src/sat-cfg.h
trunk/src/sat-pref-tle.c
trunk/src/tle-update.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/ChangeLog 2009-04-14 21:06:51 UTC (rev 268)
@@ -1,3 +1,14 @@
+2009-04-14 Alexandru Csete <oz...@gm...>
+
+ * configure.ac:
+ Require libcur 7.16.0 or later as mandatory dependency.
+
+ * src/tle-update.c:
+ * src/sat-cfg.[ch]:
+ * src/sat-pref-tle.c:
+ Reverted TLE update to libcurl version.
+
+
2009-04-13 Alexandru Csete <oz...@gm...>
* src/predict-tools.c:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/NEWS 2009-04-14 21:06:51 UTC (rev 268)
@@ -20,8 +20,6 @@
- Fixed bug 2130914: Gpredict doesn't handle PTT.
- Fixed bug 2170642: Small error in user manual.
- Fixed bug 2750119: Unable to set the time correctly in Time Controller.
-- Applied patch 2688135: Use GIO instead of libcurl for TLE download.
- Note: This removes proxy management from gpredict.
- Updated PDF user manual.
- French translation.
Modified: trunk/README
===================================================================
--- trunk/README 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/README 2009-04-14 21:06:51 UTC (rev 268)
@@ -45,7 +45,7 @@
- Gtk+ 2.12 or later
- GLib 2.16 or later
-- Gio 2.16 or later (including gvfs)
+- Libcurl 7.16.0 or later
- GooCanvas 0.9 or later
- Hamlib (runtime only, not required for build)
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/configure.ac 2009-04-14 21:06:51 UTC (rev 268)
@@ -21,11 +21,12 @@
fi
dnl check for glib, gtk, and goocanvas libraries
-pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.16.0 gio-2.0 >= 2.16.0 gthread-2.0 >= 2.14.0 goocanvas >= 0.9"
+pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.16.0 gthread-2.0 >= 2.14.0 goocanvas >= 0.9 libcurl >= 7.16.0"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
+
dnl Hamlib not needed if we go for the TCP based I/F
dnl check for hamlib
dnl PKG_CHECK_MODULES(HAMLIB, hamlib, [
@@ -65,6 +66,7 @@
GDK_V=`pkg-config --modversion gdk-2.0`
GTK_V=`pkg-config --modversion gtk+-2.0`
GOOC_V=`pkg-config --modversion goocanvas`
+CURL_V=`pkg-config --modversion libcurl`
dnl SQL_V=`pkg-config --modversion sqlite3`
dnl if test "$havehamlib" = true ; then
dnl HAML_V=`pkg-config --modversion hamlib`
@@ -100,6 +102,7 @@
echo Gdk version........ : $GDK_V
echo Gtk+ version....... : $GTK_V
echo GooCanvas version.. : $GOOC_V
+echo Liburl version..... : $CURL_V
dnl echo SQLite version..... : $SQL_V
dnl if test "$havehamlib" = true ; then
dnl echo Hamlib version..... : $HAML_V
Modified: trunk/src/sat-cfg.c
===================================================================
--- trunk/src/sat-cfg.c 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/src/sat-cfg.c 2009-04-14 21:06:51 UTC (rev 268)
@@ -47,176 +47,178 @@
#define LIST_COLUMNS_DEFAULTS (SAT_LIST_FLAG_NAME |\
- SAT_LIST_FLAG_AZ |\
- SAT_LIST_FLAG_EL |\
- SAT_LIST_FLAG_RANGE |\
- SAT_LIST_FLAG_DIR |\
- SAT_LIST_FLAG_NEXT_EVENT |\
- SAT_LIST_FLAG_ALT |\
- SAT_LIST_FLAG_ORBIT)
+ SAT_LIST_FLAG_AZ |\
+ SAT_LIST_FLAG_EL |\
+ SAT_LIST_FLAG_RANGE |\
+ SAT_LIST_FLAG_DIR |\
+ SAT_LIST_FLAG_NEXT_EVENT |\
+ SAT_LIST_FLAG_ALT |\
+ SAT_LIST_FLAG_ORBIT)
#define SINGLE_PASS_COL_DEFAULTS (SINGLE_PASS_FLAG_TIME |\
- SINGLE_PASS_FLAG_AZ |\
- SINGLE_PASS_FLAG_EL |\
- SINGLE_PASS_FLAG_RANGE |\
- SINGLE_PASS_FLAG_FOOTPRINT)
+ SINGLE_PASS_FLAG_AZ |\
+ SINGLE_PASS_FLAG_EL |\
+ SINGLE_PASS_FLAG_RANGE |\
+ SINGLE_PASS_FLAG_FOOTPRINT)
#define MULTI_PASS_COL_DEFAULTS (MULTI_PASS_FLAG_AOS_TIME |\
- MULTI_PASS_FLAG_LOS_TIME |\
- MULTI_PASS_FLAG_DURATION |\
- MULTI_PASS_FLAG_AOS_AZ |\
- MULTI_PASS_FLAG_MAX_EL |\
- MULTI_PASS_FLAG_LOS_AZ)
+ MULTI_PASS_FLAG_LOS_TIME |\
+ MULTI_PASS_FLAG_DURATION |\
+ MULTI_PASS_FLAG_AOS_AZ |\
+ MULTI_PASS_FLAG_MAX_EL |\
+ MULTI_PASS_FLAG_LOS_AZ)
#define SINGLE_SAT_FIELD_DEF (SINGLE_SAT_FLAG_AZ |\
SINGLE_SAT_FLAG_EL |\
- SINGLE_SAT_FLAG_RANGE |\
- SINGLE_SAT_FLAG_RANGE_RATE |\
- SINGLE_SAT_FLAG_NEXT_EVENT |\
- SINGLE_SAT_FLAG_SSP |\
- SINGLE_SAT_FLAG_FOOTPRINT |\
- SINGLE_SAT_FLAG_ALT |\
- SINGLE_SAT_FLAG_VEL |\
- SINGLE_SAT_FLAG_DOPPLER |\
- SINGLE_SAT_FLAG_LOSS |\
- SINGLE_SAT_FLAG_DELAY |\
- SINGLE_SAT_FLAG_MA |\
- SINGLE_SAT_FLAG_PHASE |\
- SINGLE_SAT_FLAG_ORBIT |\
- SINGLE_SAT_FLAG_VISIBILITY)
+ SINGLE_SAT_FLAG_RANGE |\
+ SINGLE_SAT_FLAG_RANGE_RATE |\
+ SINGLE_SAT_FLAG_NEXT_EVENT |\
+ SINGLE_SAT_FLAG_SSP |\
+ SINGLE_SAT_FLAG_FOOTPRINT |\
+ SINGLE_SAT_FLAG_ALT |\
+ SINGLE_SAT_FLAG_VEL |\
+ SINGLE_SAT_FLAG_DOPPLER |\
+ SINGLE_SAT_FLAG_LOSS |\
+ SINGLE_SAT_FLAG_DELAY |\
+ SINGLE_SAT_FLAG_MA |\
+ SINGLE_SAT_FLAG_PHASE |\
+ SINGLE_SAT_FLAG_ORBIT |\
+ SINGLE_SAT_FLAG_VISIBILITY)
/** \brief Structure representing a boolean value */
typedef struct {
- gchar *group; /*!< The configration group */
- gchar *key; /*!< The configuration key */
- gboolean defval; /*!< The default value */
+ gchar *group; /*!< The configration group */
+ gchar *key; /*!< The configuration key */
+ gboolean defval; /*!< The default value */
} sat_cfg_bool_t;
/** \brief Structure representing an integer value */
typedef struct {
- gchar *group; /*!< The configration group */
- gchar *key; /*!< The configuration key */
- gint defval; /*!< The default value */
+ gchar *group; /*!< The configration group */
+ gchar *key; /*!< The configuration key */
+ gint defval; /*!< The default value */
} sat_cfg_int_t;
/** \brief Structure representing a string value */
typedef struct {
- gchar *group; /*!< The configration group */
- gchar *key; /*!< The configuration key */
- gchar *defval; /*!< The default value */
+ gchar *group; /*!< The configration group */
+ gchar *key; /*!< The configuration key */
+ gchar *defval; /*!< The default value */
} sat_cfg_str_t;
/** \brief Array containing the boolean configuration values */
sat_cfg_bool_t sat_cfg_bool[SAT_CFG_BOOL_NUM] = {
- { "GLOBAL", "USE_LOCAL_TIME", FALSE},
- { "GLOBAL", "USE_NSEW", FALSE},
- { "GLOBAL", "USE_IMPERIAL", FALSE},
- { "GLOBAL", "MAIN_WIN_POS", FALSE},
- { "GLOBAL", "MOD_WIN_POS", FALSE},
+ { "GLOBAL", "USE_LOCAL_TIME", FALSE},
+ { "GLOBAL", "USE_NSEW", FALSE},
+ { "GLOBAL", "USE_IMPERIAL", FALSE},
+ { "GLOBAL", "MAIN_WIN_POS", FALSE},
+ { "GLOBAL", "MOD_WIN_POS", FALSE},
{ "GLOBAL", "MOD_STATE", FALSE},
- { "MODULES", "RULES_HINT", TRUE},
- { "MODULES", "MAP_QTH_INFO", TRUE},
- { "MODULES", "MAP_NEXT_EVENT", TRUE},
- { "MODULES", "MAP_CURSOR_TRACK", FALSE},
- { "MODULES", "MAP_SHOW_GRID", FALSE},
- { "MODULES", "MAP_KEEP_RATIO", FALSE},
- { "MODULES", "POLAR_QTH_INFO", TRUE},
- { "MODULES", "POLAR_NEXT_EVENT", TRUE},
- { "MODULES", "POLAR_CURSOR_TRACK", TRUE},
+ { "MODULES", "RULES_HINT", TRUE},
+ { "MODULES", "MAP_QTH_INFO", TRUE},
+ { "MODULES", "MAP_NEXT_EVENT", TRUE},
+ { "MODULES", "MAP_CURSOR_TRACK", FALSE},
+ { "MODULES", "MAP_SHOW_GRID", FALSE},
+ { "MODULES", "MAP_KEEP_RATIO", FALSE},
+ { "MODULES", "POLAR_QTH_INFO", TRUE},
+ { "MODULES", "POLAR_NEXT_EVENT", TRUE},
+ { "MODULES", "POLAR_CURSOR_TRACK", TRUE},
{ "MODULES", "POLAR_EXTRA_AZ_TICKS", FALSE},
{ "TLE", "SERVER_AUTH", FALSE},
+ { "TLE", "PROXY_AUTH", FALSE},
{ "TLE", "ADD_NEW_SATS", TRUE},
- { "LOG", "KEEP_LOG_FILES", FALSE},
+ { "LOG", "KEEP_LOG_FILES", FALSE},
{ "PREDICT", "USE_REAL_T0", FALSE}
};
/** \brief Array containing the integer configuration parameters */
sat_cfg_int_t sat_cfg_int[SAT_CFG_INT_NUM] = {
- { "MODULES", "DATA_TIMEOUT", 300},
- { "MODULES", "LAYOUT", GTK_SAT_MOD_LAYOUT_3},
- { "MODULES", "VIEW_1", GTK_SAT_MOD_VIEW_MAP},
- { "MODULES", "VIEW_2", GTK_SAT_MOD_VIEW_POLAR},
- { "MODULES", "VIEW_3", GTK_SAT_MOD_VIEW_SINGLE},
- { "GLOBAL", "WARP", 1},
- { "MODULES", "LIST_REFRESH", 1},
- { "MODULES", "LIST_COLUMNS", LIST_COLUMNS_DEFAULTS},
- { "MODULES", "MAP_REFRESH", 10},
- { "MODULES", "MAP_INFO_COLOUR", 0x00FF00FF},
- { "MODULES", "MAP_INFO_BGD_COLOUR", 0x000000FF},
- { "MODULES", "MAP_QTH_COLOUR", 0x00FFFFFF},
- { "MODULES", "MAP_SAT_COLOUR", 0xF0F000FF},
- { "MODULES", "MAP_SELECTED_SAT_COLOUR", 0xFFFFFFFF},
- { "MODULES", "MAP_COV_AREA_COLOUR", 0xFFFFFF1F},
- { "MODULES", "MAP_GRID_COLOUR", 0x7F7F7F7F},
- { "MODULES", "MAP_TICK_COLOUR", 0x7F7F7F7F},
- { "MODULES", "MAP_TRACK_COLOUR", 0x00FFFFFF},
- { "MODULES", "MAP_TRACK_NUM", 1},
- { "MODULES", "POLAR_REFRESH", 3},
- { "MODULES", "POLAR_CHART_ORIENT", POLAR_VIEW_NESW},
- { "MODULES", "POLAR_BGD_COLOUR", 0xFFFFFFFF},
- { "MODULES", "POLAR_AXIS_COLOUR", 0x0F0F0F7F},
- { "MODULES", "POLAR_TICK_COLOUR", 0x007F00FF},
- { "MODULES", "POLAR_SAT_COLOUR", 0x8F0000FF},
- { "MODULES", "POLAR_SELECTED_SAT_COL", 0xFF0D0BFF},
- { "MODULES", "POLAR_TRACK_COLOUR", 0x0000FFFF},
- { "MODULES", "POLAR_INFO_COLOUR", 0x00007FFF},
- { "MODULES", "SINGLE_SAT_REFRESH", 1},
- { "MODULES", "SINGLE_SAT_FIELDS", SINGLE_SAT_FIELD_DEF},
- { "PREDICT", "MINIMUM_ELEV", 5},
- { "PREDICT", "NUMBER_OF_PASSES", 10},
- { "PREDICT", "LOOK_AHEAD", 3},
- { "PREDICT", "TIME_RESOLUTION", 10},
- { "PREDICT", "NUMBER_OF_ENTRIES", 20},
- { "PREDICT", "SINGLE_PASS_COL", SINGLE_PASS_COL_DEFAULTS},
- { "PREDICT", "MULTI_PASS_COL", MULTI_PASS_COL_DEFAULTS},
- { "PREDICT", "SAVE_FORMAT", 0},
- { "PREDICT", "SAVE_CONTENTS", 0},
+ { "MODULES", "DATA_TIMEOUT", 300},
+ { "MODULES", "LAYOUT", GTK_SAT_MOD_LAYOUT_3},
+ { "MODULES", "VIEW_1", GTK_SAT_MOD_VIEW_MAP},
+ { "MODULES", "VIEW_2", GTK_SAT_MOD_VIEW_POLAR},
+ { "MODULES", "VIEW_3", GTK_SAT_MOD_VIEW_SINGLE},
+ { "GLOBAL", "WARP", 1},
+ { "MODULES", "LIST_REFRESH", 1},
+ { "MODULES", "LIST_COLUMNS", LIST_COLUMNS_DEFAULTS},
+ { "MODULES", "MAP_REFRESH", 10},
+ { "MODULES", "MAP_INFO_COLOUR", 0x00FF00FF},
+ { "MODULES", "MAP_INFO_BGD_COLOUR", 0x000000FF},
+ { "MODULES", "MAP_QTH_COLOUR", 0x00FFFFFF},
+ { "MODULES", "MAP_SAT_COLOUR", 0xF0F000FF},
+ { "MODULES", "MAP_SELECTED_SAT_COLOUR", 0xFFFFFFFF},
+ { "MODULES", "MAP_COV_AREA_COLOUR", 0xFFFFFF1F},
+ { "MODULES", "MAP_GRID_COLOUR", 0x7F7F7F7F},
+ { "MODULES", "MAP_TICK_COLOUR", 0x7F7F7F7F},
+ { "MODULES", "MAP_TRACK_COLOUR", 0x00FFFFFF},
+ { "MODULES", "MAP_TRACK_NUM", 1},
+ { "MODULES", "POLAR_REFRESH", 3},
+ { "MODULES", "POLAR_CHART_ORIENT", POLAR_VIEW_NESW},
+ { "MODULES", "POLAR_BGD_COLOUR", 0xFFFFFFFF},
+ { "MODULES", "POLAR_AXIS_COLOUR", 0x0F0F0F7F},
+ { "MODULES", "POLAR_TICK_COLOUR", 0x007F00FF},
+ { "MODULES", "POLAR_SAT_COLOUR", 0x8F0000FF},
+ { "MODULES", "POLAR_SELECTED_SAT_COL", 0xFF0D0BFF},
+ { "MODULES", "POLAR_TRACK_COLOUR", 0x0000FFFF},
+ { "MODULES", "POLAR_INFO_COLOUR", 0x00007FFF},
+ { "MODULES", "SINGLE_SAT_REFRESH", 1},
+ { "MODULES", "SINGLE_SAT_FIELDS", SINGLE_SAT_FIELD_DEF},
+ { "PREDICT", "MINIMUM_ELEV", 5},
+ { "PREDICT", "NUMBER_OF_PASSES", 10},
+ { "PREDICT", "LOOK_AHEAD", 3},
+ { "PREDICT", "TIME_RESOLUTION", 10},
+ { "PREDICT", "NUMBER_OF_ENTRIES", 20},
+ { "PREDICT", "SINGLE_PASS_COL", SINGLE_PASS_COL_DEFAULTS},
+ { "PREDICT", "MULTI_PASS_COL", MULTI_PASS_COL_DEFAULTS},
+ { "PREDICT", "SAVE_FORMAT", 0},
+ { "PREDICT", "SAVE_CONTENTS", 0},
{ "PREDICT", "TWILIGHT_THRESHOLD", -6},
- { "SKY_AT_GLANCE", "TIME_SPAN_HOURS", 8},
- { "SKY_AT_GLANCE", "COLOUR_01", 0x3c46c8},
- { "SKY_AT_GLANCE", "COLOUR_02", 0x00500a},
- { "SKY_AT_GLANCE", "COLOUR_03", 0xd5472b},
- { "SKY_AT_GLANCE", "COLOUR_04", 0xd06b38},
- { "SKY_AT_GLANCE", "COLOUR_05", 0xcf477a},
- { "SKY_AT_GLANCE", "COLOUR_06", 0xbf041f},
- { "SKY_AT_GLANCE", "COLOUR_07", 0x04bf20},
- { "SKY_AT_GLANCE", "COLOUR_08", 0x0420bf},
- { "SKY_AT_GLANCE", "COLOUR_09", 0xa304bf},
- { "SKY_AT_GLANCE", "COLOUR_10", 0x04bdbf},
- { "GLOBAL", "WINDOW_POS_X", 0},
- { "GLOBAL", "WINDOW_POS_Y", 0},
- { "GLOBAL", "WINDOW_WIDTH", 700},
- { "GLOBAL", "WINDOW_HEIGHT", 700},
- { "GLOBAL", "HTML_BROWSER_TYPE", 0},
- { "TLE", "AUTO_UPDATE_FREQ", 2},
- { "TLE", "AUTO_UPDATE_ACTION", 1},
- { "TLE", "LAST_UPDATE", 0},
- { "LOG", "CLEAN_AGE", 0}, /* 0 = Never clean */
- { "LOG", "LEVEL", 4}
+ { "SKY_AT_GLANCE", "TIME_SPAN_HOURS", 8},
+ { "SKY_AT_GLANCE", "COLOUR_01", 0x3c46c8},
+ { "SKY_AT_GLANCE", "COLOUR_02", 0x00500a},
+ { "SKY_AT_GLANCE", "COLOUR_03", 0xd5472b},
+ { "SKY_AT_GLANCE", "COLOUR_04", 0xd06b38},
+ { "SKY_AT_GLANCE", "COLOUR_05", 0xcf477a},
+ { "SKY_AT_GLANCE", "COLOUR_06", 0xbf041f},
+ { "SKY_AT_GLANCE", "COLOUR_07", 0x04bf20},
+ { "SKY_AT_GLANCE", "COLOUR_08", 0x0420bf},
+ { "SKY_AT_GLANCE", "COLOUR_09", 0xa304bf},
+ { "SKY_AT_GLANCE", "COLOUR_10", 0x04bdbf},
+ { "GLOBAL", "WINDOW_POS_X", 0},
+ { "GLOBAL", "WINDOW_POS_Y", 0},
+ { "GLOBAL", "WINDOW_WIDTH", 700},
+ { "GLOBAL", "WINDOW_HEIGHT", 700},
+ { "GLOBAL", "HTML_BROWSER_TYPE", 0},
+ { "TLE", "AUTO_UPDATE_FREQ", 2},
+ { "TLE", "AUTO_UPDATE_ACTION", 1},
+ { "TLE", "LAST_UPDATE", 0},
+ { "LOG", "CLEAN_AGE", 0}, /* 0 = Never clean */
+ { "LOG", "LEVEL", 4}
};
/** \brief Array containing the string configuration values */
sat_cfg_str_t sat_cfg_str[SAT_CFG_STR_NUM] = {
- { "GLOBAL", "TIME_FORMAT", "%Y/%m/%d %H:%M:%S"},
- { "GLOBAL", "DEFAULT_QTH", "sample.qth"},
- { "GLOBAL", "OPEN_MODULES", "Amateur"},
- { "GLOBAL", "HTML_BROWSER", NULL},
- { "MODULES", "MAP_FILE", "nasa-topo_800.png"},
- { "MODULES", "MAP_FONT", "Sans 10"},
- { "MODULES", "POLAR_FONT", "Sans 10"},
- { "TLE", "SERVER", "http://www.celestrak.com/NORAD/elements/"},
- { "TLE", "FILES", "amateur.txt;cubesat.txt;galileo.txt;geo.txt;gps-ops.txt;"\
- "iridium.txt;military.txt;radar.txt;science.txt;weather.txt"},
- { "TLE", "FILE_DIR", NULL},
- { "TLE", "EXTENSION", "*.*"},
- { "PREDICT", "SAVE_DIR", NULL}
+ { "GLOBAL", "TIME_FORMAT", "%Y/%m/%d %H:%M:%S"},
+ { "GLOBAL", "DEFAULT_QTH", "sample.qth"},
+ { "GLOBAL", "OPEN_MODULES", "Amateur"},
+ { "GLOBAL", "HTML_BROWSER", NULL},
+ { "MODULES", "MAP_FILE", "nasa-topo_800.png"},
+ { "MODULES", "MAP_FONT", "Sans 10"},
+ { "MODULES", "POLAR_FONT", "Sans 10"},
+ { "TLE", "SERVER", "http://www.celestrak.com/NORAD/elements/"},
+ { "TLE", "FILES", "amateur.txt;cubesat.txt;galileo.txt;geo.txt;gps-ops.txt;"\
+ "iridium.txt;military.txt;radar.txt;science.txt;weather.txt"},
+ { "TLE", "PROXY", NULL},
+ { "TLE", "FILE_DIR", NULL},
+ { "TLE", "EXTENSION", "*.*"},
+ { "PREDICT", "SAVE_DIR", NULL}
};
@@ -239,42 +241,42 @@
guint
sat_cfg_load ()
{
- gchar *keyfile;
- GError *error = NULL;
+ gchar *keyfile;
+ GError *error = NULL;
- if (config != NULL)
- sat_cfg_close ();
+ if (config != NULL)
+ sat_cfg_close ();
- /* load the configuration file */
- config = g_key_file_new ();
- keyfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
- ".gpredict2", G_DIR_SEPARATOR_S,
- "gpredict.cfg", NULL);
+ /* load the configuration file */
+ config = g_key_file_new ();
+ keyfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
+ ".gpredict2", G_DIR_SEPARATOR_S,
+ "gpredict.cfg", NULL);
- g_key_file_load_from_file (config, keyfile, G_KEY_FILE_KEEP_COMMENTS, &error);
+ g_key_file_load_from_file (config, keyfile, G_KEY_FILE_KEEP_COMMENTS, &error);
- g_free (keyfile);
+ g_free (keyfile);
- if (error != NULL) {
+ if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_WARN,
- _("%s: Error reading config file (%s)"),
- __FUNCTION__, error->message);
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Error reading config file (%s)"),
+ __FUNCTION__, error->message);
- sat_log_log (SAT_LOG_LEVEL_WARN,
- _("%s: Using built-in defaults"),
- __FUNCTION__);
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Using built-in defaults"),
+ __FUNCTION__);
- g_clear_error (&error);
+ g_clear_error (&error);
- return 1;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Everything OK."), __FUNCTION__);
- }
-
- return 0;
+ return 1;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s: Everything OK."), __FUNCTION__);
+ }
+
+ return 0;
}
@@ -287,84 +289,84 @@
guint
sat_cfg_save ()
{
- gsize length;
- gsize written;
- GError *error = NULL;
- gchar *cfgstr;
- gchar *keyfile;
- GIOChannel *cfgfile;
- guint err = 0;
+ gsize length;
+ gsize written;
+ GError *error = NULL;
+ gchar *cfgstr;
+ gchar *keyfile;
+ GIOChannel *cfgfile;
+ guint err = 0;
- /* convert configuration data struct to charachter string */
- cfgstr = g_key_file_to_data (config, &length, &error);
+ /* convert configuration data struct to charachter string */
+ cfgstr = g_key_file_to_data (config, &length, &error);
- if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not create config data (%s)."),
- __FUNCTION__, error->message);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not create config data (%s)."),
+ __FUNCTION__, error->message);
- g_clear_error (&error);
+ g_clear_error (&error);
- err = 1;
- }
- else {
+ err = 1;
+ }
+ else {
- /* create and open a file for writing */
- keyfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
- ".gpredict2", G_DIR_SEPARATOR_S,
- "gpredict.cfg", NULL);
- cfgfile = g_io_channel_new_file (keyfile, "w", &error);
- g_free (keyfile);
+ /* create and open a file for writing */
+ keyfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
+ ".gpredict2", G_DIR_SEPARATOR_S,
+ "gpredict.cfg", NULL);
+ cfgfile = g_io_channel_new_file (keyfile, "w", &error);
+ g_free (keyfile);
- if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not create config file (%s)."),
- __FUNCTION__, error->message);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not create config file (%s)."),
+ __FUNCTION__, error->message);
- g_clear_error (&error);
+ g_clear_error (&error);
- err = 1;
- }
- else {
- g_io_channel_write_chars (cfgfile,
- cfgstr,
- length,
- &written,
- &error);
+ err = 1;
+ }
+ else {
+ g_io_channel_write_chars (cfgfile,
+ cfgstr,
+ length,
+ &written,
+ &error);
- g_io_channel_shutdown (cfgfile, TRUE, NULL);
- g_io_channel_unref (cfgfile);
+ g_io_channel_shutdown (cfgfile, TRUE, NULL);
+ g_io_channel_unref (cfgfile);
- if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error writing config data (%s)."),
- __FUNCTION__, error->message);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error writing config data (%s)."),
+ __FUNCTION__, error->message);
- g_clear_error (&error);
+ g_clear_error (&error);
- err = 1;
- }
- else if (length != written) {
- sat_log_log (SAT_LOG_LEVEL_WARN,
- _("%s: Wrote only %d out of %d chars."),
- __FUNCTION__, written, length);
+ err = 1;
+ }
+ else if (length != written) {
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Wrote only %d out of %d chars."),
+ __FUNCTION__, written, length);
- err = 1;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Configuration saved."),
- __FUNCTION__);
+ err = 1;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Configuration saved."),
+ __FUNCTION__);
- err = 0;
- }
- }
+ err = 0;
+ }
+ }
- g_free (cfgstr);
- }
+ g_free (cfgstr);
+ }
- return err;
+ return err;
}
@@ -379,10 +381,10 @@
void
sat_cfg_close ()
{
- if (config != NULL) {
- g_key_file_free (config);
- config = NULL;
- }
+ if (config != NULL) {
+ g_key_file_free (config);
+ config = NULL;
+ }
}
@@ -390,60 +392,59 @@
gboolean
sat_cfg_get_bool (sat_cfg_bool_e param)
{
- gboolean value = FALSE;
- GError *error = NULL;
+ gboolean value = FALSE;
+ GError *error = NULL;
- if (param < SAT_CFG_BOOL_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
+ if (param < SAT_CFG_BOOL_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
- /* return default value */
- value = sat_cfg_bool[param].defval;
- }
- else {
- /* fetch value */
- value = g_key_file_get_boolean (config,
- sat_cfg_bool[param].group,
- sat_cfg_bool[param].key,
- &error);
+ /* return default value */
+ value = sat_cfg_bool[param].defval;
+ }
+ else {
+ /* fetch value */
+ value = g_key_file_get_boolean (config,
+ sat_cfg_bool[param].group,
+ sat_cfg_bool[param].key,
+ &error);
- if (error != NULL) {
- g_clear_error (&error);
+ if (error != NULL) {
+ g_clear_error (&error);
- value = sat_cfg_bool[param].defval;
- }
- }
+ value = sat_cfg_bool[param].defval;
+ }
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown BOOL param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown BOOL param index (%d)\n"),
+ __FUNCTION__, param);
+ }
- return value;
+ return value;
}
/** \brief Get default value of boolean parameter */
gboolean
sat_cfg_get_bool_def (sat_cfg_bool_e param)
{
- gboolean value = FALSE;
+ gboolean value = FALSE;
- if (param < SAT_CFG_BOOL_NUM) {
- value = sat_cfg_bool[param].defval;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown BOOL param index (%d)\n"),
- __FUNCTION__, param);
- }
+ if (param < SAT_CFG_BOOL_NUM) {
+ value = sat_cfg_bool[param].defval;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown BOOL param index (%d)\n"),
+ __FUNCTION__, param);
+ }
-
- return value;
+ return value;
}
/** \brief Store a boolean configuration value.
@@ -457,52 +458,52 @@
sat_cfg_set_bool (sat_cfg_bool_e param, gboolean value)
{
- if (param < SAT_CFG_BOOL_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- g_key_file_set_boolean (config,
- sat_cfg_bool[param].group,
- sat_cfg_bool[param].key,
- value);
- }
+ if (param < SAT_CFG_BOOL_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ g_key_file_set_boolean (config,
+ sat_cfg_bool[param].group,
+ sat_cfg_bool[param].key,
+ value);
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown BOOL param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown BOOL param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
void
sat_cfg_reset_bool (sat_cfg_bool_e param)
{
- if (param < SAT_CFG_BOOL_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- g_key_file_remove_key (config,
- sat_cfg_bool[param].group,
- sat_cfg_bool[param].key,
- NULL);
- }
+ if (param < SAT_CFG_BOOL_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ g_key_file_remove_key (config,
+ sat_cfg_bool[param].group,
+ sat_cfg_bool[param].key,
+ NULL);
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown BOOL param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown BOOL param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
@@ -513,43 +514,43 @@
gchar *
sat_cfg_get_str (sat_cfg_str_e param)
{
- gchar *value;
- GError *error = NULL;
+ gchar *value;
+ GError *error = NULL;
- if (param < SAT_CFG_STR_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
+ if (param < SAT_CFG_STR_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
- /* return default value */
- value = g_strdup (sat_cfg_str[param].defval);
- }
- else {
- /* fetch value */
- value = g_key_file_get_string (config,
- sat_cfg_str[param].group,
- sat_cfg_str[param].key,
- &error);
+ /* return default value */
+ value = g_strdup (sat_cfg_str[param].defval);
+ }
+ else {
+ /* fetch value */
+ value = g_key_file_get_string (config,
+ sat_cfg_str[param].group,
+ sat_cfg_str[param].key,
+ &error);
- if (error != NULL) {
- g_clear_error (&error);
+ if (error != NULL) {
+ g_clear_error (&error);
- value = g_strdup (sat_cfg_str[param].defval);
- }
- }
+ value = g_strdup (sat_cfg_str[param].defval);
+ }
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown STR param index (%d)\n"),
- __FUNCTION__, param);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown STR param index (%d)\n"),
+ __FUNCTION__, param);
- value = g_strdup ("ERROR");
- }
+ value = g_strdup ("ERROR");
+ }
- return value;
+ return value;
}
/** \brief Get default value of string parameter
@@ -559,21 +560,20 @@
gchar *
sat_cfg_get_str_def (sat_cfg_str_e param)
{
- gchar *value;
+ gchar *value;
- if (param < SAT_CFG_STR_NUM) {
- value = g_strdup (sat_cfg_str[param].defval);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown STR param index (%d)\n"),
- __FUNCTION__, param);
+ if (param < SAT_CFG_STR_NUM) {
+ value = g_strdup (sat_cfg_str[param].defval);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown STR param index (%d)\n"),
+ __FUNCTION__, param);
- value = g_strdup ("ERROR");
- }
+ value = g_strdup ("ERROR");
+ }
-
- return value;
+ return value;
}
/** \brief Store a str configuration value.
@@ -582,35 +582,35 @@
sat_cfg_set_str (sat_cfg_str_e param, const gchar *value)
{
- if (param < SAT_CFG_STR_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- if (value) {
- g_key_file_set_string (config,
- sat_cfg_str[param].group,
- sat_cfg_str[param].key,
- value);
- }
- else {
- /* remove key from config */
- g_key_file_remove_key (config,
- sat_cfg_str[param].group,
- sat_cfg_str[param].key,
- NULL);
- }
- }
+ if (param < SAT_CFG_STR_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ if (value) {
+ g_key_file_set_string (config,
+ sat_cfg_str[param].group,
+ sat_cfg_str[param].key,
+ value);
+ }
+ else {
+ /* remove key from config */
+ g_key_file_remove_key (config,
+ sat_cfg_str[param].group,
+ sat_cfg_str[param].key,
+ NULL);
+ }
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown STR param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown STR param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
@@ -618,136 +618,136 @@
sat_cfg_reset_str (sat_cfg_str_e param)
{
- if (param < SAT_CFG_STR_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- g_key_file_remove_key (config,
- sat_cfg_str[param].group,
- sat_cfg_str[param].key,
- NULL);
- }
+ if (param < SAT_CFG_STR_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ g_key_file_remove_key (config,
+ sat_cfg_str[param].group,
+ sat_cfg_str[param].key,
+ NULL);
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown STR param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown STR param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
gint
sat_cfg_get_int (sat_cfg_int_e param)
{
- gint value = 0;
- GError *error = NULL;
+ gint value = 0;
+ GError *error = NULL;
- if (param < SAT_CFG_INT_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
+ if (param < SAT_CFG_INT_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
- /* return default value */
- value = sat_cfg_int[param].defval;
- }
- else {
- /* fetch value */
- value = g_key_file_get_integer (config,
- sat_cfg_int[param].group,
- sat_cfg_int[param].key,
- &error);
+ /* return default value */
+ value = sat_cfg_int[param].defval;
+ }
+ else {
+ /* fetch value */
+ value = g_key_file_get_integer (config,
+ sat_cfg_int[param].group,
+ sat_cfg_int[param].key,
+ &error);
- if (error != NULL) {
- g_clear_error (&error);
+ if (error != NULL) {
+ g_clear_error (&error);
- value = sat_cfg_int[param].defval;
- }
- }
+ value = sat_cfg_int[param].defval;
+ }
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown INT param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown INT param index (%d)\n"),
+ __FUNCTION__, param);
+ }
- return value;
+ return value;
}
gint
sat_cfg_get_int_def (sat_cfg_int_e param)
{
- gint value = 0;
+ gint value = 0;
- if (param < SAT_CFG_INT_NUM) {
- value = sat_cfg_int[param].defval;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown INT param index (%d)\n"),
- __FUNCTION__, param);
- }
+ if (param < SAT_CFG_INT_NUM) {
+ value = sat_cfg_int[param].defval;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown INT param index (%d)\n"),
+ __FUNCTION__, param);
+ }
- return value;
+ return value;
}
void
sat_cfg_set_int (sat_cfg_int_e param, gint value)
{
- if (param < SAT_CFG_INT_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- g_key_file_set_integer (config,
- sat_cfg_int[param].group,
- sat_cfg_int[param].key,
- value);
- }
+ if (param < SAT_CFG_INT_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ g_key_file_set_integer (config,
+ sat_cfg_int[param].group,
+ sat_cfg_int[param].key,
+ value);
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown INT param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown INT param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
void
sat_cfg_reset_int (sat_cfg_int_e param)
{
- if (param < SAT_CFG_INT_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- g_key_file_remove_key (config,
- sat_cfg_int[param].group,
- sat_cfg_int[param].key,
- NULL);
- }
+ if (param < SAT_CFG_INT_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ g_key_file_remove_key (config,
+ sat_cfg_int[param].group,
+ sat_cfg_int[param].key,
+ NULL);
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown INT param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown INT param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
Modified: trunk/src/sat-cfg.h
===================================================================
--- trunk/src/sat-cfg.h 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/src/sat-cfg.h 2009-04-14 21:06:51 UTC (rev 268)
@@ -35,113 +35,115 @@
/** \brief Symbolic references for boolean config values. */
typedef enum {
- SAT_CFG_BOOL_USE_LOCAL_TIME = 0, /*!< Display local time instead of UTC. */
- SAT_CFG_BOOL_USE_NSEW, /*!< Use N, S, E and W instead of sign */
- SAT_CFG_BOOL_USE_IMPERIAL, /*!< Use Imperial units instead of Metric */
- SAT_CFG_BOOL_MAIN_WIN_POS, /*!< Restore position of main window */
- SAT_CFG_BOOL_MOD_WIN_POS, /*!< Restore size and position of module windows */
+ SAT_CFG_BOOL_USE_LOCAL_TIME = 0, /*!< Display local time instead of UTC. */
+ SAT_CFG_BOOL_USE_NSEW, /*!< Use N, S, E and W instead of sign */
+ SAT_CFG_BOOL_USE_IMPERIAL, /*!< Use Imperial units instead of Metric */
+ SAT_CFG_BOOL_MAIN_WIN_POS, /*!< Restore position of main window */
+ SAT_CFG_BOOL_MOD_WIN_POS, /*!< Restore size and position of module windows */
SAT_CFG_BOOL_MOD_STATE, /*!< Restore module state */
- SAT_CFG_BOOL_RULES_HINT, /*!< Enable rules hint in GtkSatList. */
- SAT_CFG_BOOL_MAP_SHOW_QTH_INFO, /*!< Show QTH info on map */
- SAT_CFG_BOOL_MAP_SHOW_NEXT_EV, /*!< Show next event on map */
- SAT_CFG_BOOL_MAP_SHOW_CURS_TRACK, /*!< Track mouse cursor on map. */
- SAT_CFG_BOOL_MAP_SHOW_GRID, /*!< Show grid on map. */
- SAT_CFG_BOOL_MAP_KEEP_RATIO, /*!< Keep original aspect ratio */
- SAT_CFG_BOOL_POL_SHOW_QTH_INFO, /*!< Show QTH info on polar plot */
- SAT_CFG_BOOL_POL_SHOW_NEXT_EV, /*!< Show next event on polar plot */
- SAT_CFG_BOOL_POL_SHOW_CURS_TRACK, /*!< Track mouse cursor on polar plot. */
- SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS, /*!< Extra Az ticks at every 30 deg. */
- SAT_CFG_BOOL_TLE_SERVER_AUTH, /*!< TLE server requires authentication. */
+ SAT_CFG_BOOL_RULES_HINT, /*!< Enable rules hint in GtkSatList. */
+ SAT_CFG_BOOL_MAP_SHOW_QTH_INFO, /*!< Show QTH info on map */
+ SAT_CFG_BOOL_MAP_SHOW_NEXT_EV, /*!< Show next event on map */
+ SAT_CFG_BOOL_MAP_SHOW_CURS_TRACK, /*!< Track mouse cursor on map. */
+ SAT_CFG_BOOL_MAP_SHOW_GRID, /*!< Show grid on map. */
+ SAT_CFG_BOOL_MAP_KEEP_RATIO, /*!< Keep original aspect ratio */
+ SAT_CFG_BOOL_POL_SHOW_QTH_INFO, /*!< Show QTH info on polar plot */
+ SAT_CFG_BOOL_POL_SHOW_NEXT_EV, /*!< Show next event on polar plot */
+ SAT_CFG_BOOL_POL_SHOW_CURS_TRACK, /*!< Track mouse cursor on polar plot. */
+ SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS, /*!< Extra Az ticks at every 30 deg. */
+ SAT_CFG_BOOL_TLE_SERVER_AUTH, /*!< TLE server requires authentication. */
+ SAT_CFG_BOOL_TLE_PROXY_AUTH, /*!< Proxy requires authentication. */
SAT_CFG_BOOL_TLE_ADD_NEW, /*!< Add new satellites to database. */
SAT_CFG_BOOL_KEEP_LOG_FILES, /*!< Whether to keep old log files */
SAT_CFG_BOOL_PRED_USE_REAL_T0, /*!< Whether to use current time as T0 fro predictions */
- SAT_CFG_BOOL_NUM /*!< Number of boolean parameters */
+ SAT_CFG_BOOL_NUM /*!< Number of boolean parameters */
} sat_cfg_bool_e;
/** \brief Symbolic references for integer config values. */
typedef enum {
- SAT_CFG_INT_MODULE_TIMEOUT = 0, /*!< Module refresh rate */
- SAT_CFG_INT_MODULE_LAYOUT, /*!< Module layout */
- SAT_CFG_INT_MODULE_VIEW_1, /*!< Type of view 1 */
- SAT_CFG_INT_MODULE_VIEW_2, /*!< Type of view 2 */
- SAT_CFG_INT_MODULE_VIEW_3, /*!< Type of view 3 */
- SAT_CFG_INT_WARP_FACTOR, /*!< Time compression factor. */
- SAT_CFG_INT_LIST_REFRESH, /*!< List refresh rate (cycle). */
- SAT_CFG_INT_LIST_COLUMNS, /*!< List column visibility. */
- SAT_CFG_INT_MAP_REFRESH, /*!< Map refresh rate (cycle). */
- SAT_CFG_INT_MAP_INFO_COL, /*!< Info text colour on maps. */
- SAT_CFG_INT_MAP_INFO_BGD_COL, /*!< Info text bgd colour on maps. */
- SAT_CFG_INT_MAP_QTH_COL, /*!< QTH mark colour on map. */
- SAT_CFG_INT_MAP_SAT_COL, /*!< Satellite colour on maps */
- SAT_CFG_INT_MAP_SAT_SEL_COL, /*!< Selected satellite colour */
- SAT_CFG_INT_MAP_SAT_COV_COL, /*!< Map coverage area colour */
- SAT_CFG_INT_MAP_GRID_COL, /*!< Grid colour. */
- SAT_CFG_INT_MAP_TICK_COL, /*!< Tick labels colour. */
- SAT_CFG_INT_MAP_TRACK_COL, /*!< Ground Track colour. */
- SAT_CFG_INT_MAP_TRACK_NUM, /*!< Number of orbits to show ground track for */
- SAT_CFG_INT_POLAR_REFRESH, /*!< Polar refresh rate (cycle). */
- SAT_CFG_INT_POLAR_ORIENTATION, /*!< Orientation of the polar charts. */
- SAT_CFG_INT_POLAR_BGD_COL, /*!< Polar view, background colour. */
- SAT_CFG_INT_POLAR_AXIS_COL, /*!< Polar view, axis colour. */
- SAT_CFG_INT_POLAR_TICK_COL, /*!< Tick label colour, e.g. N/W/S/E */
- SAT_CFG_INT_POLAR_SAT_COL, /*!< Satellite colour. */
- SAT_CFG_INT_POLAR_SAT_SEL_COL, /*!< Selected satellite colour. */
- SAT_CFG_INT_POLAR_TRACK_COL, /*!< Track colour. */
- SAT_CFG_INT_POLAR_INFO_COL, /*!< Info colour. */
- SAT_CFG_INT_SINGLE_SAT_REFRESH, /*!< Single-sat refresh rate (cycle). */
- SAT_CFG_INT_SINGLE_SAT_FIELDS, /*!< Single-sat fields. */
- SAT_CFG_INT_PRED_MIN_EL, /*!< Minimum elevation for passes. */
- SAT_CFG_INT_PRED_NUM_PASS, /*!< Number of passes to predict. */
- SAT_CFG_INT_PRED_LOOK_AHEAD, /*!< Look-ahead time limit in days. */
- SAT_CFG_INT_PRED_RESOLUTION, /*!< Time resolution in seconds */
- SAT_CFG_INT_PRED_NUM_ENTRIES, /*!< Number of entries in single pass. */
- SAT_CFG_INT_PRED_SINGLE_COL, /*!< Visible columns in single-pass dialog */
- SAT_CFG_INT_PRED_MULTI_COL, /*!< Visible columns in multi-pass dialog */
- SAT_CFG_INT_PRED_SAVE_FORMAT, /*!< Last used save format for predictions */
- SAT_CFG_INT_PRED_SAVE_CONTENTS, /*!< Last selection for save file contents */
+ SAT_CFG_INT_MODULE_TIMEOUT = 0, /*!< Module refresh rate */
+ SAT_CFG_INT_MODULE_LAYOUT, /*!< Module layout */
+ SAT_CFG_INT_MODULE_VIEW_1, /*!< Type of view 1 */
+ SAT_CFG_INT_MODULE_VIEW_2, /*!< Type of view 2 */
+ SAT_CFG_INT_MODULE_VIEW_3, /*!< Type of view 3 */
+ SAT_CFG_INT_WARP_FACTOR, /*!< Time compression factor. */
+ SAT_CFG_INT_LIST_REFRESH, /*!< List refresh rate (cycle). */
+ SAT_CFG_INT_LIST_COLUMNS, /*!< List column visibility. */
+ SAT_CFG_INT_MAP_REFRESH, /*!< Map refresh rate (cycle). */
+ SAT_CFG_INT_MAP_INFO_COL, /*!< Info text colour on maps. */
+ SAT_CFG_INT_MAP_INFO_BGD_COL, /*!< Info text bgd colour on maps. */
+ SAT_CFG_INT_MAP_QTH_COL, /*!< QTH mark colour on map. */
+ SAT_CFG_INT_MAP_SAT_COL, /*!< Satellite colour on maps */
+ SAT_CFG_INT_MAP_SAT_SEL_COL, /*!< Selected satellite colour */
+ SAT_CFG_INT_MAP_SAT_COV_COL, /*!< Map coverage area colour */
+ SAT_CFG_INT_MAP_GRID_COL, /*!< Grid colour. */
+ SAT_CFG_INT_MAP_TICK_COL, /*!< Tick labels colour. */
+ SAT_CFG_INT_MAP_TRACK_COL, /*!< Ground Track colour. */
+ SAT_CFG_INT_MAP_TRACK_NUM, /*!< Number of orbits to show ground track for */
+ SAT_CFG_INT_POLAR_REFRESH, /*!< Polar refresh rate (cycle). */
+ SAT_CFG_INT_POLAR_ORIENTATION, /*!< Orientation of the polar charts. */
+ SAT_CFG_INT_POLAR_BGD_COL, /*!< Polar view, background colour. */
+ SAT_CFG_INT_POLAR_AXIS_COL, /*!< Polar view, axis colour. */
+ SAT_CFG_INT_POLAR_TICK_COL, /*!< Tick label colour, e.g. N/W/S/E */
+ SAT_CFG_INT_POLAR_SAT_COL, /*!< Satellite colour. */
+ SAT_CFG_INT_POLAR_SAT_SEL_COL, /*!< Selected satellite colour. */
+ SAT_CFG_INT_POLAR_TRACK_COL, /*!< Track colour. */
+ SAT_CFG_INT_POLAR_INFO_COL, /*!< Info colour. */
+ SAT_CFG_INT_SINGLE_SAT_REFRESH, /*!< Single-sat refresh rate (cycle). */
+ SAT_CFG_INT_SINGLE_SAT_FIELDS, /*!< Single-sat fields. */
+ SAT_CFG_INT_PRED_MIN_EL, /*!< Minimum elevation for passes. */
+ SAT_CFG_INT_PRED_NUM_PASS, /*!< Number of passes to predict. */
+ SAT_CFG_INT_PRED_LOOK_AHEAD, /*!< Look-ahead time limit in days. */
+ SAT_CFG_INT_PRED_RESOLUTION, /*!< Time resolution in seconds */
+ SAT_CFG_INT_PRED_NUM_ENTRIES, /*!< Number of entries in single pass. */
+ SAT_CFG_INT_PRED_SINGLE_COL, /*!< Visible columns in single-pass dialog */
+ SAT_CFG_INT_PRED_MULTI_COL, /*!< Visible columns in multi-pass dialog */
+ SAT_CFG_INT_PRED_SAVE_FORMAT, /*!< Last used save format for predictions */
+ SAT_CFG_INT_PRED_SAVE_CONTENTS, /*!< Last selection for save file contents */
SAT_CFG_INT_PRED_TWILIGHT_THLD, /*!< Twilight zone threshold */
- SAT_CFG_INT_SKYATGL_TIME, /*!< Time span for sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_01, /*!< Colour 1 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_02, /*!< Colour 2 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_03, /*!< Colour 3 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_04, /*!< Colour 4 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_05, /*!< Colour 5 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_06, /*!< Colour 6 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_07, /*!< Colour 7 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_08, /*!< Colour 8 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_09, /*!< Colour 9 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_10, /*!< Colour 10 in sky at a glance predictions */
- SAT_CFG_INT_WINDOW_POS_X, /*!< Main window X during last session */
- SAT_CFG_INT_WINDOW_POS_Y, /*!< Main window Y during last session */
- SAT_CFG_INT_WINDOW_WIDTH, /*!< Main window width during last session */
- SAT_CFG_INT_WINDOW_HEIGHT, /*!< Main window height during last session */
- SAT_CFG_INT_WEB_BROWSER_TYPE, /*!< Web browser type, see browser_type_t */
- SAT_CFG_INT_TLE_AUTO_UPD_FREQ, /*!< TLE auto-update frequency. */
- SAT_CFG_INT_TLE_AUTO_UPD_ACTION, /*!< TLE auto-update action. */
- SAT_CFG_INT_TLE_LAST_UPDATE, /*!< Date and time of last update, Unix seconds. */
- SAT_CFG_INT_LOG_CLEAN_AGE, /*!< Age of log file to delete (seconds) */
- SAT_CFG_INT_LOG_LEVEL, /*!< Logging level */
- SAT_CFG_INT_NUM /*!< Number of integer parameters. */
+ SAT_CFG_INT_SKYATGL_TIME, /*!< Time span for sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_01, /*!< Colour 1 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_02, /*!< Colour 2 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_03, /*!< Colour 3 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_04, /*!< Colour 4 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_05, /*!< Colour 5 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_06, /*!< Colour 6 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_07, /*!< Colour 7 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_08, /*!< Colour 8 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_09, /*!< Colour 9 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_10, /*!< Colour 10 in sky at a glance predictions */
+ SAT_CFG_INT_WINDOW_POS_X, /*!< Main window X during last session */
+ SAT_CFG_INT_WINDOW_POS_Y, /*!< Main window Y during last session */
+ SAT_CFG_INT_WINDOW_WIDTH, /*!< Main window width during last session */
+ SAT_CFG_INT_WINDOW_HEIGHT, /*!< Main window height during last session */
+ SAT_CFG_INT_WEB_BROWSER_TYPE, /*!< Web browser type, see browser_type_t */
+ SAT_CFG_INT_TLE_AUTO_UPD_FREQ, /*!< TLE auto-update frequency. */
+ SAT_CFG_INT_TLE_AUTO_UPD_ACTION, /*!< TLE auto-update action. */
+ SAT_CFG_INT_TLE_LAST_UPDATE, /*!< Date and time of last update, Unix seconds. */
+ SAT_CFG_INT_LOG_CLEAN_AGE, /*!< Age of log file to delete (seconds) */
+ SAT_CFG_INT_LOG_LEVEL, /*!< Logging level */
+ SAT_CFG_INT_NUM /*!< Number of integer parameters. */
} sat_cfg_int_e;
/** \brief Symbolic references for string config values. */
typedef enum {
- SAT_CFG_STR_TIME_FORMAT = 0,/*!< Time format. */
- SAT_CFG_STR_DEF_QTH, /*!< Default QTH file. */
- SAT_CFG_STR_OPEN_MODULES, /*!< Open modules. */
- SAT_CFG_STR_WEB_BROWSER, /*!< Web browser string. */
- SAT_CFG_STR_MAP_FILE, /*!< Map file (abs or rel). */
- SAT_CFG_STR_MAP_FONT, /*!< Map font. */
- SAT_CFG_STR_POL_FONT, /*!< Polar view font. */
- SAT_CFG_STR_TLE_SERVER, /*!< Server for TLE updates. */
- SAT_CFG_STR_TLE_FILES, /*!< ; separated list of files on server. */
- SAT_CFG_STR_TLE_FILE_DIR, /*!< Local directory from which tle were last updated. */
- SAT_CFG_STR_TLE_FILE_EXT, /*!< File extensions. */
- SAT_CFG_STR_PRED_SAVE_DIR, /*!< Last used save directory for pass predictions */
- SAT_CFG_STR_NUM /*!< Number of string parameters */
+ SAT_CFG_STR_TIME_FORMAT = 0,/*!< Time format. */
+ SAT_CFG_STR_DEF_QTH, /*!< Default QTH file. */
+ SAT_CFG_STR_OPEN_MODULES, /*!< Open modules. */
+ SAT_CFG_STR_WEB_BROWSER, /*!< Web browser string. */
+ SAT_CFG_STR_MAP_FILE, /*!< Map file (abs or rel). */
+ SAT_CFG_STR_MAP_FONT, /*!< Map font. */
+ SAT_CFG_STR_POL_FONT, /*!< Polar view font. */
+ SAT_CFG_STR_TLE_SERVER, /*!< Server for TLE updates. */
+ SAT_CFG_STR_TLE_FILES, /*!< ; separated list of files on server. */
+ SAT_CFG_STR_TLE_PROXY, /*!< Proxy server. */
+ SAT_CFG_STR_TLE_FILE_DIR, /*!< Local directory from which tle were last updated. */
+ SAT_CFG_STR_TLE_FILE_EXT, /*!< File extensions. */
+ SAT_CFG_STR_PRED_SAVE_DIR, /*!< Last used save directory for pass predictions */
+ SAT_CFG_STR_NUM /*!< Number of string parameters */
} sat_cfg_str_e;
Modified: trunk/src/sat-pref-tle.c
===================================================================
--- trunk/src/sat-pref-tle.c 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/src/sat-pref-tle.c 2009-04-14 21:06:51 UTC (rev 268)
@@ -42,7 +42,7 @@
static GtkWidget *warn,*autom;
/* internet updates */
-static GtkWidget *server,*files;
+static GtkWidget *server,*proxy,*files;
/* add new sats */
static GtkWidget *addnew;
@@ -76,28 +76,27 @@
GtkWidget *sat_pref_tle_create ()
{
- GtkWidget *vbox;
+ GtkWidget *vbox;
-
- /* vertical box */
- vbox = gtk_vbox_new (FALSE, 10);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 20);
+ /* vertical box */
+ vbox = gtk_vbox_new (FALSE, 10);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 20);
- /* add contents */
- create_auto_update (vbox);
- gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 0);
- create_network (vbox);
- gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 0);
+ /* add contents */
+ create_auto_update (vbox);
+ gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 0);
+ create_network (vbox);
+ gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 0);
create_misc (vbox);
#if 0
create_local (vbox);
#endif
- /* create RESET button */
- create_reset_button (GTK_BOX (vbox));
+ /* create RESET button */
+ create_reset_button (GTK_BOX (vbox));
- return vbox;
+ return vbox;
}
@@ -106,8 +105,8 @@
void
sat_pref_tle_cancel ()
{
- dirty = FALSE;
- reset = FALSE;
+ dirty = FALSE;
+ reset = FALSE;
}
@@ -116,45 +115,50 @@
void
sat_pref_tle_ok ()
{
- if (dirty) {
-
- /* save settings */
+ if (dirty) {
+
+ /* save settings */
- /* update frequency */
- sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ,
- gtk_combo_box_get_active (GTK_COMBO_BOX (freq)));
+ /* update frequency */
+ sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ,
+ gtk_combo_box_get_active (GTK_COMBO_BOX (freq)));
- /* action to take */
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (autom)))
- sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION, TLE_AUTO_UPDATE_GOAHEAD);
- else
- sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION, TLE_AUTO_UPDATE_NOTIFY);
+ /* action to take */
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (autom)))
+ sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION, TLE_AUTO_UPDATE_GOAHEAD);
+ else
+ sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION, TLE_AUTO_UPDATE_NOTIFY);
- /* server */
- sat_cfg_set_str (SAT_CFG_STR_TLE_SERVER,
- gtk_entry_get_text (GTK_ENTRY (server)));
+ /* server */
+ sat_cfg_set_str (SAT_CFG_STR_TLE_SERVER,
+ gtk_entry_get_text (GTK_ENTRY (server)));
- /* files */
- sat_cfg_set_str (SAT_CFG_STR_TLE_FILES,
- gtk_entry_get_text (GTK_ENTRY (files)));
+ /* proxy */
+ sat_cfg_set_str (SAT_CFG_STR_TLE_PROXY,
+ gtk_entry_get_text (GTK_ENTRY (proxy)));
+
+ /* files */
+ sat_cfg_set_str (SAT_CFG_STR_TLE_FILES,
+ gtk_entry_get_text (GTK_ENTRY (files)));
/* add new sats */
sat_cfg_set_bool (SAT_CFG_BOOL_TLE_ADD_NEW,
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (addnew)));
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (addnew)));
- dirty = FALSE;
- }
- else if (reset) {
+ dirty = FALSE;
+ }
+ else if (reset) {
- /* use sat_cfg_reset */
- sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ);
- sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION);
- sat_cfg_reset_str (SAT_CFG_STR_TLE_SERVER);
- sat_cfg_reset_str (SAT_CFG_STR_TLE_FILES);
+ /* use sat_cfg_reset */
+ sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ);
+ sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION);
+ sat_cfg_reset_str (SAT_CFG_STR_TLE_SERVER);
+ sat_cfg_reset_str (SAT_CFG_STR_TLE_PROXY);
+ sat_cfg_reset_str (SAT_CFG_STR_TLE_FILES);
sat_cfg_reset_bool (SAT_CFG_BOOL_TLE_ADD_NEW);
- reset = FALSE;
- }
+ reset = FALSE;
+ }
}
@@ -162,53 +166,53 @@
static void
create_auto_update (GtkWidget *vbox)
{
- GtkWidget *label;
- GtkWidget *box;
- guint i;
+ GtkWidget *label;
+ GtkWidget *box;
+ guint i;
- /* auto update */
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), _("<b>Auto-Update:</b>"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
+ /* auto update */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), _("<b>Auto-Update:</b>"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
- /* frequency */
- freq = gtk_combo_box_new_text ();
- for (i = 0; i < TLE_AUTO_UPDATE_NUM; i++) {
- gtk_combo_box_append_text (GTK_COMBO_BOX (freq),
- tle_update_freq_to_str (i));
- }
- gtk_combo_box_set_active (GTK_COMBO_BOX (freq),
- sat_cfg_get_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ));
- g_signal_connect (freq, "changed", G_CALLBACK (value_changed_cb), NULL);
+ /* frequency */
+ freq = gtk_combo_box_new_text ();
+ for (i = 0; i < TLE_AUTO_UPDATE_NUM; i++) {
+ gtk_combo_box_append_text (GTK_COMBO_BOX (freq),
+ tle_update_freq_to_str (i));
+ }
+ gtk_combo_box_set_active (GTK_COMBO_BOX (freq),
+ sat_cfg_get_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ));
+ g_signal_connect (freq, "changed", G_CALLBACK (value_changed_cb), NULL);
- label = gtk_label_new (_("Check the age of TLE data:"));
+ label = gtk_label_new (_("Check the age of TLE data:"));
- box = gtk_hbox_new (FALSE, 5);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (box), freq, FALSE, FALSE, 0);
+ box = gtk_hbox_new (FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), freq, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
- /* radio buttons selecting action */
- label = gtk_label_new (_("If TLEs are too old:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
- warn = gtk_radio_button_new_with_label (NULL,
- _("Notify me"));
- gtk_box_pack_start (GTK_BOX (vbox), warn, FALSE, TRUE, 0);
- autom = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (warn),
- _("Perform automatic update in the background"));
- gtk_box_pack_start (GTK_BOX (vbox), autom, FALSE, TRUE, 0);
+ /* radio buttons selecting action */
+ label = gtk_label_new (_("If TLEs are too old:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
+ warn = gtk_radio_button_new_with_label (NULL,
+ _("Notify me"));
+ gtk_box_pack_start (GTK_BOX (vbox), warn, FALSE, TRUE, 0);
+ autom = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (warn),
+ _("Perform automatic update in the background"));
+ gtk_box_pack_start (GTK_BOX (vbox), autom, FALSE, TRUE, 0);
- /* warn is selected automatically by default */
- if (sat_cfg_get_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION) == TLE_AUTO_UPDATE_GOAHEAD) {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autom), TRUE);
- }
-
+ /* warn is selected automatically by default */
+ if (sat_cfg_get_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION) == TLE_AUTO_UPDATE_GOAHEAD) {
+ gtk_toggle_b...
[truncated message content] |
|
From: <cs...@us...> - 2009-05-20 20:43:49
|
Revision: 320
http://gpredict.svn.sourceforge.net/gpredict/?rev=320&view=rev
Author: csete
Date: 2009-05-20 20:43:47 +0000 (Wed, 20 May 2009)
Log Message:
-----------
Added new transponder files received from David VK5DG.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/data/28650.trsp
trunk/data/Makefile.am
Added Paths:
-----------
trunk/data/20439.trsp
trunk/data/20442.trsp
trunk/data/22826.trsp
trunk/data/23439.trsp
trunk/data/25397.trsp
trunk/data/26931.trsp
trunk/data/27844.trsp
trunk/data/27939.trsp
trunk/data/28895.trsp
trunk/data/32787.trsp
trunk/data/32789.trsp
trunk/data/32791.trsp
trunk/data/33493.trsp
trunk/data/33498.trsp
trunk/data/33499.trsp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-05-19 21:07:52 UTC (rev 319)
+++ trunk/ChangeLog 2009-05-20 20:43:47 UTC (rev 320)
@@ -1,3 +1,9 @@
+2009-05-20 Alexandru Csete <oz...@gm...>
+
+ * src/data:
+ Added new transponder files received from David VK5DG.
+
+
2009-05-13 Alexadnru Csete <oz...@gm...>
* src/gtk-rig-ctrl.c:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-05-19 21:07:52 UTC (rev 319)
+++ trunk/NEWS 2009-05-20 20:43:47 UTC (rev 320)
@@ -4,6 +4,11 @@
* Windows: New installer instead of ZIP distribution.
* Mac OS X package.
+Changes in version 1.0 beta 5 (TBD)
+
+- Added new transponder files received from David VK5DG.
+
+
Changes in version 1.0 beta 4 (13 May 2009)
- Fixed a bug that cause rig type to switch from DUPLEX -> RX
Added: trunk/data/20439.trsp
===================================================================
--- trunk/data/20439.trsp (rev 0)
+++ trunk/data/20439.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,3 @@
+[Mode V/U FM/SSB]
+UP_LOW=145920000
+DOWN_LOW=437036000
Added: trunk/data/20442.trsp
===================================================================
--- trunk/data/20442.trsp (rev 0)
+++ trunk/data/20442.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,3 @@
+[Mode U TLM]
+DOWN_LOW=437125000
+MODE=CW
Added: trunk/data/22826.trsp
===================================================================
--- trunk/data/22826.trsp (rev 0)
+++ trunk/data/22826.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,2 @@
+[Mode -/U BPSK]
+DOWN_LOW=435790000
Added: trunk/data/23439.trsp
===================================================================
--- trunk/data/23439.trsp (rev 0)
+++ trunk/data/23439.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,3 @@
+[Mode H TLM]
+DOWN_LOW=29352000
+MODE=CARRIER
Added: trunk/data/25397.trsp
===================================================================
--- trunk/data/25397.trsp (rev 0)
+++ trunk/data/25397.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,3 @@
+[Mode V/V APRS AFSK]
+UP_LOW=145827000
+DOWN_LOW=145827000
Added: trunk/data/26931.trsp
===================================================================
--- trunk/data/26931.trsp (rev 0)
+++ trunk/data/26931.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,15 @@
+[Mode V/U APRS FSK]
+UP_LOW=145930000
+DOWN_LOW=435225000
+
+[Mode V/U BBS FSK]
+UP_LOW=145850000
+DOWN_LOW=435225000
+
+[Mode V/U BBS FSK]
+UP_LOW=145890000
+DOWN_LOW=435225000
+
+[Mode V/U BBS FSK]
+UP_LOW=145930000
+DOWN_LOW=435225000
Added: trunk/data/27844.trsp
===================================================================
--- trunk/data/27844.trsp (rev 0)
+++ trunk/data/27844.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,4 @@
+[Mode U TLM]
+DOWN_LOW=436837500
+MODE=CW
+
Added: trunk/data/27939.trsp
===================================================================
--- trunk/data/27939.trsp (rev 0)
+++ trunk/data/27939.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,4 @@
+[Mode U CW Beacon]
+DOWN_LOW=435352000
+
+
Modified: trunk/data/28650.trsp
===================================================================
--- trunk/data/28650.trsp 2009-05-19 21:07:52 UTC (rev 319)
+++ trunk/data/28650.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -1,20 +1,19 @@
-[Dutch Beacon CW]
-DOWN_LOW=145860000
-
[Indian Beacon]
DOWN_LOW=145936000
-[Dutch U/V Lin]
-UP_LOW=435225000
-UP_HIGH=435275000
-DOWN_LOW=145875000
-DOWN_HIGH=145925000
-INVERT=true
+[Dutch Beacon CW]
+DOWN_LOW=145860000
[Indian U/V Lin]
UP_LOW=435220000
UP_HIGH=435280000
DOWN_LOW=145870000
DOWN_HIGH=145930000
-INVERT=false
+INVERT=true
+[Dutch U/V Lin]
+UP_LOW=435225000
+UP_HIGH=435275000
+DOWN_LOW=145875000
+DOWN_HIGH=145925000
+INVERT=false
Added: trunk/data/28895.trsp
===================================================================
--- trunk/data/28895.trsp (rev 0)
+++ trunk/data/28895.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,4 @@
+[Mode U TLM]
+DOWN_LOW=437425000
+MODE=CW
+
Added: trunk/data/32787.trsp
===================================================================
--- trunk/data/32787.trsp (rev 0)
+++ trunk/data/32787.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,4 @@
+[Mode V/U TLM]
+UP_LOW=145980000
+DOWN_LOW=437275000
+MODE=FM/CW
Added: trunk/data/32789.trsp
===================================================================
--- trunk/data/32789.trsp (rev 0)
+++ trunk/data/32789.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,7 @@
+[Mode V BPSK TLM primary]
+DOWN_LOW=145868000
+MODE=SSB
+
+[Mode V BPSK TLM secondary]
+DOWN_LOW=145930000
+MODE=SSB
Added: trunk/data/32791.trsp
===================================================================
--- trunk/data/32791.trsp (rev 0)
+++ trunk/data/32791.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,2 @@
+[Mode U TLM]
+DOWN_LOW=437385000
Added: trunk/data/33493.trsp
===================================================================
--- trunk/data/33493.trsp (rev 0)
+++ trunk/data/33493.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,7 @@
+[Mode U CW]
+DOWN_LOW=437250000
+MODE=CW
+
+[Mode U FM]
+DOWN_LOW=437425000
+MODE=1k2 AFSK
Added: trunk/data/33498.trsp
===================================================================
--- trunk/data/33498.trsp (rev 0)
+++ trunk/data/33498.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,15 @@
+[Mode U Mother CW]
+DOWN_LOW=437305000
+MODE=CW
+
+[Mode U Mother FM]
+DOWN_LOW=437485000
+MODE=1k2 AFSK
+
+[Mode U Daughter CW]
+DOWN_LOW=437275000
+MODE=CW
+
+[Mode U Daughter FM]
+DOWN_LOW=437465000
+MODE=1k2 AFSK
Added: trunk/data/33499.trsp
===================================================================
--- trunk/data/33499.trsp (rev 0)
+++ trunk/data/33499.trsp 2009-05-20 20:43:47 UTC (rev 320)
@@ -0,0 +1,3 @@
+[Mode U MSG]
+DOWN_LOW=437385000
+MODE=CW
Modified: trunk/data/Makefile.am
===================================================================
--- trunk/data/Makefile.am 2009-05-19 21:07:52 UTC (rev 319)
+++ trunk/data/Makefile.am 2009-05-20 20:43:47 UTC (rev 320)
@@ -10,7 +10,11 @@
27607.trsp 27848.trsp 28375.trsp 28650.trsp \
32785.trsp \
24786.trsp 25338.trsp 26352.trsp 26536.trsp \
- 26871.trsp 27453.trsp 28654.trsp
+ 26871.trsp 27453.trsp 28654.trsp \
+ 20439.trsp 20442.trsp 22826.trsp 23439.trsp \
+ 25397.trsp 26931.trsp 27844.trsp 27939.trsp \
+ 28895.trsp 32787.trsp 32789.trsp 32791.trsp \
+ 33493.trsp 33498.trsp 33499.trsp
EXTRA_DIST = $(gpredict_dat_DATA)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-05-23 14:54:23
|
Revision: 324
http://gpredict.svn.sourceforge.net/gpredict/?rev=324&view=rev
Author: csete
Date: 2009-05-23 14:54:20 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Fixed a bug that could result in incorrect Doppler shift in certain cases.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/doc/um/gpredict-user-manual.odt
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rig-ctrl.h
trunk/src/gtk-sat-data.c
trunk/src/gtk-sat-data.h
trunk/src/gtk-sat-module.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-05-23 10:52:05 UTC (rev 323)
+++ trunk/ChangeLog 2009-05-23 14:54:20 UTC (rev 324)
@@ -1,3 +1,19 @@
+2009-05-23 Alexandru Csete <oz...@gm...>
+
+ * src/gtk-rig-ctrl.c:
+ Fixed some bugs that caused the Doppler shift to be calculated incorrectly
+ in some cases.
+
+ * src/gtk-single-sat.c:
+ Improved tooltip texts.
+
+
+2009-05-21 Alexandru Csete <oz...@gm...>
+
+ * src/gtk-sat-data.[ch]:
+ Added function to copy satellite data from one sat_t structure to another.
+
+
2009-05-20 Alexandru Csete <oz...@gm...>
* src/data:
@@ -7,7 +23,8 @@
2009-05-13 Alexadnru Csete <oz...@gm...>
* src/gtk-rig-ctrl.c:
- Fixed bug that caused rig type to switch from DUPLEX -> RX after first cycle.
+ Fixed bug that caused rig type to switch from DUPLEX -> RX after first
+ cycle.
* src/sat-pass-dialogs.c:
Fixed bug 2691797: Potential array index out of range.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-05-23 10:52:05 UTC (rev 323)
+++ trunk/NEWS 2009-05-23 14:54:20 UTC (rev 324)
@@ -7,6 +7,8 @@
Changes in version 1.0 beta 5 (TBD)
- Added new transponder files received from David VK5DG.
+- Fixed some bugs that caused the Doppler shift to be calculated
+ incorrectly in some cases.
Changes in version 1.0 beta 4 (13 May 2009)
Modified: trunk/doc/um/gpredict-user-manual.odt
===================================================================
(Binary files differ)
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2009-05-23 10:52:05 UTC (rev 323)
+++ trunk/src/gtk-rig-ctrl.c 2009-05-23 14:54:20 UTC (rev 324)
@@ -337,15 +337,15 @@
/* Doppler shift down */
satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqDown));
- doppler = -satfreq * (ctrl->target->range_rate / 299792.4580); // Hz
- buff = g_strdup_printf ("%.0f Hz", doppler);
+ ctrl->dd = -satfreq * (ctrl->target->range_rate / 299792.4580); // Hz
+ buff = g_strdup_printf ("%.0f Hz", ctrl->dd);
gtk_label_set_text (GTK_LABEL (ctrl->SatDopDown), buff);
g_free (buff);
/* Doppler shift up */
satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqUp));
- doppler = -satfreq * (ctrl->target->range_rate / 299792.4580); // Hz
- buff = g_strdup_printf ("%.0f Hz", doppler);
+ ctrl->du = -satfreq * (ctrl->target->range_rate / 299792.4580); // Hz
+ buff = g_strdup_printf ("%.0f Hz", ctrl->du);
gtk_label_set_text (GTK_LABEL (ctrl->SatDopUp), buff);
g_free (buff);
@@ -398,6 +398,9 @@
/* Downlink doppler */
label = gtk_label_new (_("Doppler:"));
+ gtk_widget_set_tooltip_text (label,
+ _("The Doppler shift according to the range rate and "\
+ "the currently selected downlink frequency"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
ctrl->SatDopDown = gtk_label_new ("---- Hz");
@@ -460,6 +463,9 @@
/* Uplink doppler */
label = gtk_label_new (_("Doppler:"));
+ gtk_widget_set_tooltip_text (label,
+ _("The Doppler shift according to the range rate and "\
+ "the currently selected downlink frequency"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
ctrl->SatDopUp = gtk_label_new ("---- Hz");
@@ -527,7 +533,9 @@
/* tracking button */
track = gtk_toggle_button_new_with_label (_("Track"));
- gtk_widget_set_tooltip_text (track, _("Track the satellite when it is within range"));
+ gtk_widget_set_tooltip_text (track, _("Track the satellite transponder.\n"\
+ "Enabling this button will apply Dopper correction "\
+ "to the frequency of the radio."));
gtk_table_attach_defaults (GTK_TABLE (table), track, 3, 4, 0, 1);
g_signal_connect (track, "toggled", G_CALLBACK (track_toggle_cb), ctrl);
@@ -591,7 +599,14 @@
ctrl->SatRng = gtk_label_new ("0 km");
gtk_misc_set_alignment (GTK_MISC (ctrl->SatRng), 0.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), ctrl->SatRng, 3, 4, 2, 3);
-
+
+ gtk_widget_set_tooltip_text (label,
+ _("This is the current distance between the satellite "\
+ "and the observer."));
+ gtk_widget_set_tooltip_text (ctrl->SatRng,
+ _("This is the current distance between the satellite "\
+ "and the observer."));
+
/* Range rate */
label = gtk_label_new (_(" Rate:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
@@ -599,7 +614,14 @@
ctrl->SatRngRate = gtk_label_new ("0.0 km/s");
gtk_misc_set_alignment (GTK_MISC (ctrl->SatRngRate), 0.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), ctrl->SatRngRate, 3, 4, 3, 4);
-
+
+ gtk_widget_set_tooltip_text (label,
+ _("The rate of change for the distance between "
+ "the satellite and the observer."));
+ gtk_widget_set_tooltip_text (ctrl->SatRngRate,
+ _("The rate of change for the distance between "
+ "the satellite and the observer."));
+
frame = gtk_frame_new (_("Target"));
gtk_container_add (GTK_CONTAINER (frame), table);
@@ -762,6 +784,9 @@
gtk_misc_set_alignment (GTK_MISC (ctrl->SatCnt), 0.5, 0.5);
gtk_label_set_markup (GTK_LABEL (ctrl->SatCnt),
_("<span size='large'><b>\316\224T: 00:00:00</b></span>"));
+ gtk_widget_set_tooltip_text (ctrl->SatCnt,
+ _("The time remaining until the next AOS or LOS event, "\
+ "depending on which one comes first."));
frame = gtk_frame_new (NULL);
gtk_container_add (GTK_CONTAINER (frame), ctrl->SatCnt);
@@ -930,6 +955,10 @@
GtkRigCtrl *ctrl = GTK_RIG_CTRL (data);
ctrl->tracking = gtk_toggle_button_get_active (button);
+
+ /* invalidate sync with radio */
+ ctrl->lastrxf = 0.0;
+ ctrl->lasttxf = 0.0;
}
@@ -1158,49 +1187,31 @@
/* set initial frequency */
if (ctrl->conf2 != NULL) {
/* set initial dual mode */
- ctrl->lastrxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown));
- set_freq_simplex (ctrl, ctrl->conf, ctrl->lastrxf);
- ctrl->lasttxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqUp));
- set_freq_simplex (ctrl, ctrl->conf2, ctrl->lasttxf);
+ exec_dual_rig_cycle (ctrl);
}
else {
switch (ctrl->conf->type) {
case RIG_TYPE_RX:
- ctrl->lastrxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown));
- set_freq_simplex (ctrl, ctrl->conf, ctrl->lastrxf);
+ exec_rx_cycle (ctrl);
break;
case RIG_TYPE_TX:
- ctrl->lasttxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqUp));
- set_freq_simplex (ctrl, ctrl->conf, ctrl->lasttxf);
+ exec_tx_cycle (ctrl);
break;
case RIG_TYPE_TRX:
- if (get_ptt (ctrl, ctrl->conf)) {
- ctrl->lasttxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqUp));
- set_freq_simplex (ctrl, ctrl->conf, ctrl->lasttxf);
- }
- else {
- ctrl->lastrxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown));
- set_freq_simplex (ctrl, ctrl->conf, ctrl->lastrxf);
- }
+ exec_trx_cycle (ctrl);
break;
case RIG_TYPE_DUPLEX:
- ctrl->lastrxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown));
- set_vfo (ctrl, ctrl->conf->vfoDown);
- set_freq_simplex (ctrl, ctrl->conf, ctrl->lastrxf);
- ctrl->lasttxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqUp));
- set_vfo (ctrl, ctrl->conf->vfoUp);
- set_freq_simplex (ctrl, ctrl->conf, ctrl->lasttxf);
+ exec_duplex_cycle (ctrl);
break;
default:
/* this is an error! */
ctrl->conf->type = RIG_TYPE_RX;
- ctrl->lastrxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown));
- set_freq_simplex (ctrl, ctrl->conf, ctrl->lastrxf);
+ exec_rx_cycle (ctrl);
break;
}
}
@@ -1360,8 +1371,10 @@
/* doppler shift; only if we are tracking */
if (ctrl->tracking) {
- satfreqd = (readfreq + ctrl->conf->lo) /
- (1 - (ctrl->target->range_rate/299792.4580));
+ /*satfreqd = (readfreq + ctrl->conf->lo) /
+ (1.0 - (ctrl->target->range_rate/299792.4580));*/
+ satfreqd = (readfreq - ctrl->dd + ctrl->conf->lo);
+
}
else {
satfreqd = readfreq + ctrl->conf->lo;
@@ -1388,13 +1401,15 @@
satfrequ = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqUp));
if (ctrl->tracking) {
/* downlink */
- doppler = -satfreqd * (ctrl->target->range_rate / 299792.4580);
+ /*doppler = -satfreqd * (ctrl->target->range_rate / 299792.4580);
+ g_print ("Doppler D:%.0f:%.0f ",doppler,ctrl->dd); */
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown),
- satfreqd + doppler - ctrl->conf->lo);
+ satfreqd + ctrl->dd - ctrl->conf->lo);
/* uplink */
- doppler = -satfrequ * (ctrl->target->range_rate / 299792.4580);
+ /*doppler = -satfrequ * (ctrl->target->range_rate / 299792.4580);
+ g_print ("U:%.0f:%.0f\n",doppler,ctrl->du); */
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqUp),
- satfrequ + doppler - ctrl->conf->loup);
+ satfrequ + ctrl->du - ctrl->conf->loup);
}
else {
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown),
@@ -1411,7 +1426,7 @@
/* reset error counter */
ctrl->errcnt = 0;
- /* The actual frequency migh be different from what we have set because
+ /* The actual frequency might be different from what we have set because
the tuning step is larger than what we work with (e.g. FT-817 has a
smallest tuning step of 10 Hz). Therefore we read back the actual
frequency from the rig. */
@@ -1473,8 +1488,9 @@
/* doppler shift; only if we are tracking */
if (ctrl->tracking) {
- satfrequ = (readfreq + ctrl->conf->loup) /
- (1 - (ctrl->target->range_rate/299792.4580));
+ satfrequ = readfreq - ctrl->du + ctrl->conf->loup;
+ /*satfrequ = (readfreq + ctrl->conf->loup) /
+ (1.0 - (ctrl->target->range_rate/299792.4580));*/
}
else {
satfrequ = readfreq + ctrl->conf->loup;
@@ -1501,13 +1517,13 @@
satfrequ = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqUp));
if (ctrl->tracking) {
/* downlink */
- doppler = -satfreqd * (ctrl->target->range_rate / 299792.4580);
+ /*doppler = -satfreqd * (ctrl->target->range_rate / 299792.4580);*/
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown),
- satfreqd + doppler - ctrl->conf->lo);
+ satfreqd + ctrl->dd - ctrl->conf->lo);
/* uplink */
- doppler = -satfrequ * (ctrl->target->range_rate / 299792.4580);
+ /*doppler = -satfrequ * (ctrl->target->range_rate / 299792.4580);*/
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqUp),
- satfrequ + doppler - ctrl->conf->loup);
+ satfrequ + ctrl->du - ctrl->conf->loup);
}
else {
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown),
@@ -1548,6 +1564,7 @@
*/
static void exec_trx_cycle (GtkRigCtrl *ctrl)
{
+ /*
if (ctrl->engaged) {
if (get_ptt (ctrl, ctrl->conf) == TRUE) {
exec_tx_cycle (ctrl);
@@ -1555,7 +1572,10 @@
else {
exec_rx_cycle (ctrl);
}
- }
+ }*/
+
+ exec_rx_cycle (ctrl);
+ exec_tx_cycle (ctrl);
}
@@ -1576,6 +1596,12 @@
set_vfo (ctrl, ctrl->conf->vfoUp);
exec_tx_cycle (ctrl);
}
+ else {
+ /* still execute cycles to update UI widgets
+ no data will be sent to RIG */
+ exec_rx_cycle (ctrl);
+ exec_tx_cycle (ctrl);
+ }
}
/** \brief Execute dual-rig cycle.
@@ -1608,8 +1634,9 @@
/* doppler shift; only if we are tracking */
if (ctrl->tracking) {
- satfreqd = (readfreq + ctrl->conf->lo) /
- (1 - (ctrl->target->range_rate/299792.4580));
+ satfreqd = readfreq - ctrl->dd + ctrl->conf->lo;
+ /*satfreqd = (readfreq + ctrl->conf->lo) /
+ (1.0 - (ctrl->target->range_rate/299792.4580));*/
}
else {
satfreqd = readfreq + ctrl->conf->lo;
@@ -1627,9 +1654,9 @@
/* update uplink */
satfrequ = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqUp));
if (ctrl->tracking) {
- doppler = -satfrequ * (ctrl->target->range_rate / 299792.4580);
+ /*doppler = -satfrequ * (ctrl->target->range_rate / 299792.4580);*/
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqUp),
- satfrequ + doppler - ctrl->conf2->loup);
+ satfrequ + ctrl->du - ctrl->conf2->loup);
}
else {
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqUp),
@@ -1662,9 +1689,9 @@
satfreqd = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqDown));
if (ctrl->tracking) {
/* downlink */
- doppler = -satfreqd * (ctrl->target->range_rate / 299792.4580);
+ /*doppler = -satfreqd * (ctrl->target->range_rate / 299792.4580);*/
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown),
- satfreqd + doppler - ctrl->conf->lo);
+ satfreqd + ctrl->dd - ctrl->conf->lo);
}
else {
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown),
@@ -1707,8 +1734,9 @@
/* doppler shift; only if we are tracking */
if (ctrl->tracking) {
- satfrequ = (readfreq + ctrl->conf2->loup) /
- (1 - (ctrl->target->range_rate/299792.4580));
+ satfrequ = readfreq - ctrl->du + ctrl->conf2->loup;
+ /*satfrequ = (readfreq + ctrl->conf2->loup) /
+ (1.0 - (ctrl->target->range_rate/299792.4580));*/
}
else {
satfrequ = readfreq + ctrl->conf2->loup;
@@ -1726,9 +1754,9 @@
/* update downlink */
satfreqd = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqDown));
if (ctrl->tracking) {
- doppler = -satfreqd * (ctrl->target->range_rate / 299792.4580);
+ /*doppler = -satfreqd * (ctrl->target->range_rate / 299792.4580);*/
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown),
- satfreqd + doppler - ctrl->conf->lo);
+ satfreqd + ctrl->dd - ctrl->conf->lo);
}
else {
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown),
@@ -1756,9 +1784,9 @@
/* perform forward tracking on uplink */
satfrequ = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqUp));
if (ctrl->tracking) {
- doppler = -satfrequ * (ctrl->target->range_rate / 299792.4580);
+ /*doppler = -satfrequ * (ctrl->target->range_rate / 299792.4580);*/
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqUp),
- satfrequ + doppler - ctrl->conf2->loup);
+ satfrequ + ctrl->du - ctrl->conf2->loup);
}
else {
gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqUp),
Modified: trunk/src/gtk-rig-ctrl.h
===================================================================
--- trunk/src/gtk-rig-ctrl.h 2009-05-23 10:52:05 UTC (rev 323)
+++ trunk/src/gtk-rig-ctrl.h 2009-05-23 14:54:20 UTC (rev 324)
@@ -104,6 +104,7 @@
gdouble lastrxf; /*!< Last frequency sent to receiver. */
gdouble lasttxf; /*!< Last frequency sent to tranmitter. */
+ gdouble du,dd; /*!< Last computed up/down Doppler shift; computed in update() */
/* debug related */
guint wrops;
Modified: trunk/src/gtk-sat-data.c
===================================================================
--- trunk/src/gtk-sat-data.c 2009-05-23 10:52:05 UTC (rev 323)
+++ trunk/src/gtk-sat-data.c 2009-05-23 14:54:20 UTC (rev 324)
@@ -623,7 +623,7 @@
* function for initializing the other fields.
*
*/
-void gtk_sat_data_copy_sat (sat_t *source, sat_t *dest, qth_t *qth)
+void gtk_sat_data_copy_sat (const sat_t *source, sat_t *dest, qth_t *qth)
{
guint i;
@@ -655,5 +655,30 @@
dest->tle.xincl1 = source->tle.xincl1;
dest->tle.omegao1 = source->tle.omegao1;
+ dest->otype = source->otype;
+
+ /* very important */
+ dest->flags = 0;
+ select_ephemeris (dest);
+
+ /* initialise variable fields */
+ dest->jul_utc = 0.0;
+ dest->tsince = 0.0;
+ dest->az = 0.0;
+ dest->el = 0.0;
+ dest->range = 0.0;
+ dest->range_rate = 0.0;
+ dest->ra = 0.0;
+ dest->dec = 0.0;
+ dest->ssplat = 0.0;
+ dest->ssplon = 0.0;
+ dest->alt = 0.0;
+ dest->velo = 0.0;
+ dest->ma = 0.0;
+ dest->footprint = 0.0;
+ dest->phase = 0.0;
+ dest->aos = 0.0;
+ dest->los = 0.0;
+
gtk_sat_data_init_sat (dest, qth);
}
Modified: trunk/src/gtk-sat-data.h
===================================================================
--- trunk/src/gtk-sat-data.h 2009-05-23 10:52:05 UTC (rev 323)
+++ trunk/src/gtk-sat-data.h 2009-05-23 14:54:20 UTC (rev 324)
@@ -53,6 +53,6 @@
void gtk_sat_data_free_qth (qth_t *qth);
gint gtk_sat_data_read_sat (gint catnum, sat_t *sat);
void gtk_sat_data_init_sat (sat_t *sat, qth_t *qth);
-void gtk_sat_data_copy_sat (sat_t *source, sat_t *dest, qth_t *qth);
+void gtk_sat_data_copy_sat (const sat_t *source, sat_t *dest, qth_t *qth);
#endif
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2009-05-23 10:52:05 UTC (rev 323)
+++ trunk/src/gtk-sat-module.c 2009-05-23 14:54:20 UTC (rev 324)
@@ -862,13 +862,18 @@
if (mod->child_3 != NULL)
update_child (mod->child_3, mod->tmgCdnum);
+ /* update satellite data (it may have got out of sync during child updates) */
+ g_hash_table_foreach (mod->satellites,
+ gtk_sat_module_update_sat,
+ module);
+
/* send notice to radio and rotator controller */
if (mod->rigctrl)
gtk_rig_ctrl_update (GTK_RIG_CTRL (mod->rigctrl), mod->tmgCdnum);
if (mod->rotctrl)
gtk_rot_ctrl_update (GTK_ROT_CTRL (mod->rotctrl), mod->tmgCdnum);
-
+
mod->event_count++;
/* store time keeping variables */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-05-24 12:46:21
|
Revision: 331
http://gpredict.svn.sourceforge.net/gpredict/?rev=331&view=rev
Author: csete
Date: 2009-05-24 12:46:17 +0000 (Sun, 24 May 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-05-24 12:40:11 UTC (rev 330)
+++ trunk/ChangeLog 2009-05-24 12:46:17 UTC (rev 331)
@@ -1,4 +1,4 @@
-2009-05-24 Alexandru Csete <oz...@gm...>
+2009-05-24 Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-single-sat.c:
Use field text instead of field hint for checkbox label. Use the hints for
@@ -12,7 +12,7 @@
too soon. Changed packing options to include GTK_EXPAND.
-2009-05-23 Alexandru Csete <oz...@gm...>
+2009-05-23 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rig-ctrl.c:
Fixed some bugs that caused the Doppler shift to be calculated incorrectly
@@ -22,19 +22,19 @@
Improved tooltip texts.
-2009-05-21 Alexandru Csete <oz...@gm...>
+2009-05-21 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-data.[ch]:
Added function to copy satellite data from one sat_t structure to another.
-2009-05-20 Alexandru Csete <oz...@gm...>
+2009-05-20 Alexandru Csete <oz9aec at gmail.com>
* src/data:
Added new transponder files received from David VK5DG.
-2009-05-13 Alexadnru Csete <oz...@gm...>
+2009-05-13 Alexadnru Csete <oz9aec at gmail.com>
* src/gtk-rig-ctrl.c:
Fixed bug that caused rig type to switch from DUPLEX -> RX after first
@@ -59,7 +59,7 @@
Fixed compile warnings.
-2009-05-10 Alexandru Csete <oz...@gm...>
+2009-05-10 Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-rig-data.h:
* src/sat-pref-rig.c:
@@ -68,7 +68,7 @@
* src/trsp-conf.c:
Changed error messages severity to WARNING when reading transponder data.
-2009-05-09 Alexandru Csete <oz...@gm...>
+2009-05-09 Alexandru Csete <oz9aec at gmail.com>
* src/radio-conf.[ch]:
Added parameter to store uplink and downlink VFOs for full-duplex capable
@@ -82,7 +82,7 @@
Implemented full-duplex controller.
-2009-05-01 Alexandru Csete <oz...@gm...>
+2009-05-01 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module.c:
Fixed indent. Log an error message if module configuration fails.
@@ -93,7 +93,7 @@
is opened or reconfigured.
-2009-04-14 Alexandru Csete <oz...@gm...>
+2009-04-14 Alexandru Csete <oz9aec at gmail.com>
* configure.ac:
Require libcurl 7.16.0 or later as mandatory dependency.
@@ -104,13 +104,13 @@
Reverted TLE update to libcurl version.
-2009-04-13 Alexandru Csete <oz...@gm...>
+2009-04-13 Alexandru Csete <oz9aec at gmail.com>
* src/predict-tools.c:
Fixed a bug that could cause find_aos() to go into infinite loop.
-2009-04-12 Alexandru Csete <oz...@gm...>
+2009-04-12 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rig-ctrl.c:
Implemented dual-rig controller. Tested with FT-817/IC-765 pair.
@@ -140,13 +140,13 @@
Implemented new PTT option.
-2009-04-11 Alexandru Csete <oz...@gm...>
+2009-04-11 Alexandru Csete <oz9aec at gmail.com>
* src/radio-conf.c:
Fixed bug that prevented correct saving of the LO frequencies.
-2009-04-10 Alexandru Csete <oz...@gm...>
+2009-04-10 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module-tmg.c:
Fixed bug 2750119: Unable to set the time correctly in Time Controller.
@@ -161,7 +161,7 @@
Added secondary device for uplink.
-2009-04-08 Alexandru Csete <oz...@gm...>
+2009-04-08 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rig-ctrl.[ch]:
Fixed crash when closing rig controller window with an active transponder
@@ -174,20 +174,20 @@
Added transponder selector combo box. Not fully functional.
-2009-04-03 Alexandru Csete <oz...@gm...>
+2009-04-03 Alexandru Csete <oz9aec at gmail.com>
* src/trsp-conf.[ch]:
Added function for freeing transponder list. Fixed a small typo in file
extension.
-2009-04-01 Alexandru Csete <oz...@gm...>
+2009-04-01 Alexandru Csete <oz9aec at gmail.com>
* src/trsp-conf.c:
Implemented read_transponders().
-2009-03-29 Alexandru Csete <oz...@gm...>
+2009-03-29 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rig-ctrl.[ch]:
Implemented new controller (RX and TX). Pending transponder management.
@@ -196,7 +196,7 @@
Added files for transpoder data file I/O.
-2009-03-21 Alexandru Csete <oz...@gm...>
+2009-03-21 Alexandru Csete <oz9aec at gmail.com>
* src/radio-conf.[ch]:
Added config field for uplink transverter LO. LO values are now optional.
@@ -210,7 +210,7 @@
Begun implementation of new controller.
-2009-03-21 Stephane Fillod <fi...@us...>
+2009-03-21 Stephane Fillod <fillods at users.sf.net>
* src/about.c:
* src/gtk-polar-view.c:
@@ -231,32 +231,32 @@
* po/fr.po: update
-2009-03-20 Alexandru Csete <oz...@gm...>
+2009-03-20 Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-rig-editor.c:
Changed radio type labels.
-2009-03-20 Stephane Fillod <fi...@us...>
+2009-03-20 Stephane Fillod <fillods at users.sf.net>
* src/tle-update.c:
Added Gio error checking and reporting.
-2009-03-18 Alexandru Csete <oz...@gm...>
+2009-03-18 Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-qth.c:
Fixed typo (Debian bug #520203).
-2009-03-16 Bruce Cowan <bc...@fa...>
+2009-03-16 Bruce Cowan <bcowan at fastmail.co.uk>
* src/sat-cfg.[ch]:
* src/sat-pref-tle.c:
Remove proxy configuration item, taken care by GVFS.
-2009-03-16 Bruce Cowan <bc...@fa...>
+2009-03-16 Bruce Cowan <bcowan at fastmail.co.uk>
* src/menubar.c:
* src/tle-update.c:
@@ -274,14 +274,14 @@
Updated.
-2009-03-01 Alexandru Csete <oz...@gm...>
+2009-03-01 Alexandru Csete <oz9aec at gmail.com>
* configure.ac:
Changed required GooCanvas version from 0.10 to 0.9 to be compatible
with older linux distributions, too (e.g. Ubuntu 8.04).
-2009-02-19 Stephane Fillod <fi...@us...>
+2009-02-19 Stephane Fillod <fillods at users.sf.net>
* po/POTFILES.in:
Remove goocanv8 files. Update list of C files.
@@ -293,7 +293,7 @@
* src/Makefile.am:
Fixed a typo.
-2008-12-28 Alexandru Csete <oz...@gm...>
+2008-12-28 Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-rig-editor.c:
Added widgets for editing radio type and ptt.
@@ -312,7 +312,7 @@
Update canvas bounds when resizing the canvas.
-2008-12-27; Alexandru Csete <oz...@gm...>
+2008-12-27; Alexandru Csete <oz9aec at gmail.com>
* autogen.sh:
* configure.ac:
@@ -328,7 +328,7 @@
Added management of radio type.
-2008-10-26; Alexandru Csete <oz...@gm...>
+2008-10-26; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-list-popup.[ch]:
New files containing popup menu for satlist. Satlist was previously
@@ -345,7 +345,7 @@
Deleted.
-2008-10-25; Alexandru Csete <oz...@gm...>
+2008-10-25; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sky-glance.[ch]:
Added start time as parameter.
@@ -362,7 +362,7 @@
labels in GtkSingleSat.
-2008-10-24; Alexandru Csete <oz...@gm...>
+2008-10-24; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.[ch]:
Added parameter for pass prediction T0.
@@ -371,7 +371,7 @@
Added widgets to configure pass prediction T0.
-2008-10-11; Alexandru Csete <oz...@gm...>
+2008-10-11; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-rig-editor.c:
* src/sat-pref-rot-editor.c:
@@ -383,7 +383,7 @@
Fixed bug 2130912: Crash when no rig or no rotator are defined.
-2008-09-20; Alexandru Csete <oz...@gm...>
+2008-09-20; Alexandru Csete <oz9aec at gmail.com>
* src/tle-update.c:
Changed connection timeout from system default to 10 seconds.
@@ -397,7 +397,7 @@
edit a radio configuration.
-2008-09-18; Alexandru Csete <oz...@gm...>
+2008-09-18; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rig-ctrl.[ch]:
Implemented active feedback to take into account frequency changes made
@@ -408,7 +408,7 @@
Removed newline from the end of hamlib commands.
-2008-09-18; Alexandru Csete <oz...@gm...>
+2008-09-18; Alexandru Csete <oz9aec at gmail.com>
* src/rotor-conf.[ch]:
Added field for storing rotator azimuth type, i.e. whether the rotator
@@ -421,14 +421,14 @@
Added support for Az-type.
-2008-09-17; Alexandru Csete <oz...@gm...>
+2008-09-17; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rot-ctrl.[ch]:
* src/gtk-rig-ctrl.[ch]:
Added error handling. After 5 comm errors the device is disengaged.
-2008-09-16; Alexandru Csete <oz...@gm...>
+2008-09-16; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rot-ctrl.[ch]:
Implemented correct management of next pass taking into account
@@ -436,7 +436,7 @@
implementation.
-2008-09-10; Alexandru Csete <oz...@gm...>
+2008-09-10; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-polar-plot.[ch]:
Added API to add/modify/delete the pass.
@@ -447,7 +447,7 @@
and rotator. However, this part has been disabled for now.
-2008-09-09; Alexandru Csete <oz...@gm...>
+2008-09-09; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-conditions.c:
* src/sat-cfg.[ch]:
@@ -456,14 +456,14 @@
satellite visibility.
-2008-09-07; Alexandru Csete <oz...@gm...>
+2008-09-07; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rig-ctrl.c:
* src/gtk-rot-ctrl.[ch]:
Implemented AOS/LOS count down.
-2008-09-06; Alexandru Csete <oz...@gm...>
+2008-09-06; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-freq-knob.[ch]:
Finished implementation of frequency control knob.
@@ -475,7 +475,7 @@
Finished implementation.
-2008-09-05; Alexandru Csete <oz...@gm...>
+2008-09-05; Alexandru Csete <oz9aec at gmail.com>
* src/gtk.rig.ctrl.[ch]:
Added files implementing user interface for doppler tuning.
@@ -488,7 +488,7 @@
Don't show minus when value is 0.
-2008-09-03; Alexandru Csete <oz...@gm...>
+2008-09-03; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rot-knob.[ch]:
Added API functions to get/set range of the control widget.
@@ -497,7 +497,7 @@
Implemented controller algorithm (except device I/O).
-2008-08-28; Alexandru Csete <oz...@gm...>
+2008-08-28; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rot-knob.c:
Fixed bug that prevented the knob value to be set to min/max.
@@ -506,7 +506,7 @@
Done some work on rotator control window.
-2008-08-27; Alexandru Csete <oz...@gm...>
+2008-08-27; Alexandru Csete <oz9aec at gmail.com>
* src/radio-conf.[ch]:
Added separate fileds for port number and local oscillator ffrequency.
@@ -526,7 +526,7 @@
Added field for port number.
-2008-08-22; Alexandru Csete <oz...@gm...>
+2008-08-22; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-rig.c:
* src/sat-pref-rig-editor.c:
@@ -537,7 +537,7 @@
Removed unnecessary data fields.
-2008-08-20; Alexandru Csete <oz...@gm...>
+2008-08-20; Alexandru Csete <oz9aec at gmail.com>
* configure.ac:
Disabled Hamlib checks since we will be using the TCP interface
@@ -558,7 +558,7 @@
Changed from hamlib C API to TCP based configuration.
-2008-05-01; Alexandru Csete <oz...@gm...>
+2008-05-01; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rot-knob.[ch]:
New files, previously gtk-rot-ctrl.
@@ -571,7 +571,7 @@
windows.
-2008-04-30; Alexandru Csete <oz...@gm...>
+2008-04-30; Alexandru Csete <oz9aec at gmail.com>
* src/predict-tools.c:
Fixed bug 1954664: Wrong overpass prediction.
@@ -580,32 +580,32 @@
Fixed bug 1880815: Null pointer dereference causes crash on startup.
-2008-04-24; Alexandru Csete <oz...@gm...>
+2008-04-24; Alexandru Csete <oz9aec at gmail.com>
* src/rot-ctrl-window.[ch]:
Added files.
-2008-04-22; Alexandru Csete <oz...@gm...>
+2008-04-22; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rot-ctrl.[ch]:
First fully functional implementation.
-2008-04-20; Alexandru Csete <oz...@gm...>
+2008-04-20; Alexandru Csete <oz9aec at gmail.com>
* src/rig-io.[ch]:
Added generic interface to hardware drivers.
-2008-03-30; Alexandru Csete <oz...@gm...>
+2008-03-30; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-freq-ctrl.c, gtk-freq-ctrl.h:
* src/gtk-rot-ctrl.c, gtk-rot-ctrl.h:
Added files.
-2008-03-27; Alexandru Csete <oz...@gm...>
+2008-03-27; Alexandru Csete <oz9aec at gmail.com>
* src/radio-conf.[ch]:
Added parameter for enabling built-in radio extensions.
@@ -619,14 +619,14 @@
Added menu items for radio and rotator control.
-2008-03-17; Alexandru Csete <oz...@gm...>
+2008-03-17; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-rig.c:
Fixed bug that caused incorrect display of DTR and RTS line settings in
the radio list.
-2008-01-26; Alexandru Csete <oz...@gm...>
+2008-01-26; Alexandru Csete <oz9aec at gmail.com>
* src/rotor-conf.[ch]:
* src/sat-pref-rot.c:
@@ -635,7 +635,7 @@
Added support for Az and El limits.
-2008-01-24; Alexandru Csete <oz...@gm...>
+2008-01-24; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-rig-editor.[ch]:
Finished first draft of radio configuration editor.
@@ -652,13 +652,13 @@
Updated to use new rotator configuration code.
-2008-01-12; Alexandru Csete <oz...@gm...>
+2008-01-12; Alexandru Csete <oz9aec at gmail.com>
* src/radio-conf.[ch]:
Added parameter for radio type (RX, TX, TRX, FULL_DUPL).
-2008-01-21; Alexandru Csete <oz...@gm...>
+2008-01-21; Alexandru Csete <oz9aec at gmail.com>
* src/radio-conf.[ch], src/sat-pref-rig.c:
Removed manufacturer field. Will be part of the model.
@@ -667,7 +667,7 @@
Added all widgets except the rig model selector.
-2008-01-01; Alexandru Csete <oz...@gm...>
+2008-01-01; Alexandru Csete <oz9aec at gmail.com>
* src/compat.[ch]:
Added function to return user home directory.
@@ -680,7 +680,7 @@
configuration files.
-2007-12-27; Alexandru Csete <oz...@gm...>
+2007-12-27; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.[ch]:
Added parameters for adding new satellites to database.
@@ -694,13 +694,13 @@
New satellites are now added to a file called new.tle
-2007-12-11; Alexandru Csete <oz...@gm...>
+2007-12-11; Alexandru Csete <oz9aec at gmail.com>
* src/sat-log.c:
Fixed bug 1818144: No log file created at first execution.
-2007-11-27; Alexandru Csete <oz...@gm...>
+2007-11-27; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sky-glance.c:
Fixed bug 1839140: Sky at a glance axis incorrectly labelled.
@@ -711,7 +711,7 @@
Added Tools menu.
-2007-08-23; Alexandru Csete <oz...@gm...>
+2007-08-23; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-map.c:
One more fix for bug 1763321.
@@ -725,7 +725,7 @@
non-realtime cases.
-2007-08-16; Alexandru Csete <oz...@gm...>
+2007-08-16; Alexandru Csete <oz9aec at gmail.com>
* src/sat-log-browser.[ch]:
Added files containing message log browser.
@@ -741,7 +741,7 @@
Include new log browser files.
-2007-08-14; Alexandru Csete <oz...@gm...>
+2007-08-14; Alexandru Csete <oz9aec at gmail.com>
* src/Makefile.am:
Allow deprecated symbols otherwise gpredict will not compile with
@@ -753,7 +753,7 @@
file I/O functions, thus the bug is unfixable in gpredict.
-2007-08-13; Alexandru Csete <oz...@gm...>
+2007-08-13; Alexandru Csete <oz9aec at gmail.com>
* src/gpredict-help.[ch]:
Added function to show distributed help files (license, news, etc.)
@@ -765,26 +765,26 @@
Updated with goocanvas 0.8 files.
-2007-08-12; Alexandru Csete <oz...@gm...>
+2007-08-12; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-single-pass.c:
Fixed bug 1772454: Single pass prediction flags are reset to default.
-2007-08-11; Alexandru Csete <oz...@gm...>
+2007-08-11; Alexandru Csete <oz9aec at gmail.com>
* src/save-pass.[ch]:
* src/pass-to-txt.[ch]:
Implemented functions to save pass predictions to text files.
-2007-08-04; Alexandru Csete <oz...@gm...>
+2007-08-04; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.[ch]:
Added parameters for saving pass predictions.
-2007-08-02; Alexandru Csete <oz...@gm...>
+2007-08-02; Alexandru Csete <oz9aec at gmail.com>
* configure.ac:
* src/all:
@@ -792,7 +792,7 @@
from GooCanvas when building win32 binaries (bug 1631822).
-2007-07-31; Alexandru Csete <oz...@gm...>
+2007-07-31; Alexandru Csete <oz9aec at gmail.com>
* src/predict-tools.[ch]:
The AOS and LOS finders (find_aos and find_los) now take an optional
@@ -812,7 +812,7 @@
(bug 1763321).
-2007-07-29; Alexandru Csete <oz...@gm...>
+2007-07-29; Alexandru Csete <oz9aec at gmail.com>
* src/gpredict-utils.[ch]:
Added Gtk+ workaround for allowing tooltips on GtkComboBox.
@@ -828,7 +828,7 @@
Reopen modules in the same state in which they were last time.
-2007-07-27; William J Beksi <wj...@us...>
+2007-07-27; William J Beksi <wjbeksi at users.sourceforge.net>
* src/gtk-azel-plot.[ch]:
* src/gtk-polar-plot.[ch]:
@@ -843,7 +843,7 @@
Build for goocanvas-0.8.
-2007-07-16; Alexandru Csete <oz...@gm...>
+2007-07-16; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module-popup.c:
Added window icon to module windows (bug #1752910).
@@ -883,7 +883,7 @@
and other maintenance operations. Proper configuration is still TBD.
-2007-07-15; Alexandru Csete <oz...@gm...>
+2007-07-15; Alexandru Csete <oz9aec at gmail.com>
* src/conig-keys.h:
Added configuration keys for module state.
@@ -902,7 +902,7 @@
positon of module window if requested by configuration.
-2007-07-13; Alexandru Csete <oz...@gm...>
+2007-07-13; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.[ch]:
Added configuration parameters for remembering window position.
@@ -915,7 +915,7 @@
powition of the main and module windows).
-2007-07-10; Alexandru Csete <oz...@gm...>
+2007-07-10; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.[ch]:
Added config parameters for main window position.
@@ -925,14 +925,14 @@
"configure_event" (feature request #1705375).
-2007-06-18; Alexandru Csete <oz...@gm...>
+2007-06-18; Alexandru Csete <oz9aec at gmail.com>
* src/gpredict-utils.c:
Use g_file_get_contents and g_file_set_contents in file
copy function (bug #1575291).
-2007-06-16; Alexandru Csete <oz...@gm...>
+2007-06-16; Alexandru Csete <oz9aec at gmail.com>
* src/loc-tree.c:
Enabled rules hint in the location tree.
@@ -941,7 +941,7 @@
Show an error message if gpredict is compiled without libcurl.
-2007-05-30; Alexandru Csete <oz...@gm...>
+2007-05-30; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-qth-editor.c:
* src/sat-pref-qth.c:
@@ -956,7 +956,7 @@
(#1728575).
-2007-04-21; Alexandru Csete <oz...@gm...>
+2007-04-21; Alexandru Csete <oz9aec at gmail.com>
* src/map-selector.[ch]:
Implementation of the map selector with preview.
@@ -965,7 +965,7 @@
Use new map selector and store map selection in config.
-2007-03-22; Alexandru Csete <oz...@gm...>
+2007-03-22; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module-tmg.[ch]:
* src/gtk-sat-module.[ch]:
@@ -983,7 +983,7 @@
and GtkPolarView views.
-2007-03-21; Alexandru Csete <oz...@gm...>
+2007-03-21; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module.c:
Allow running in RT mode with time offset. This was not possible
@@ -999,7 +999,7 @@
tmg_reset function.
-2007-03-03; Alexandru Csete <oz...@gm...>
+2007-03-03; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module-tmg.[ch]:
New files containing RT/SRT/MAN time controller.
@@ -1011,7 +1011,7 @@
Added menu entry for Time Controller.
-2007-02-27; Alexandru Csete <oz...@gm...>
+2007-02-27; Alexandru Csete <oz9aec at gmail.com>
* src/predict-tools.c:
Added checks to ensure that satellite has AOS before starting
@@ -1023,7 +1023,7 @@
same position all the time.
-2007-02-25; Alexandru Csete <oz...@gm...>
+2007-02-25; Alexandru Csete <oz9aec at gmail.com>
* doc/notes/time-keeping.txt:
Added info about the gpredict time manager.
@@ -1044,7 +1044,7 @@
Implemented.
-2007-02-13; Alexandru Csete <oz...@gm...>
+2007-02-13; Alexandru Csete <oz9aec at gmail.com>
* src/mod-cfg.c:
Allow user to explicitly select "** DEFAULT **" ground station. This
@@ -1053,7 +1053,7 @@
station is selected as default (see bug #1656943).
-2007-02-04; Alexandru Csete <oz...@gm...>
+2007-02-04; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.[ch]:
Added configuration parameters for sky at a glance predictions.
@@ -1072,13 +1072,13 @@
Increment version number.
-2007-02-03; William J Beksi <wj...@us...>
+2007-02-03; William J Beksi <wjbeksi at users.sourceforge.net>
* src/gtk-sat-map.[ch]:
Implemented labels for horizontal and vertical grid lines.
-2007-02-02; Alexandru Csete <oz...@gm...>
+2007-02-02; Alexandru Csete <oz9aec at gmail.com>
* goocanvas, goocanvas-patches:
Imported goocanvas 0.4 into gpredict CVS as baseline and removed patches
@@ -1086,14 +1086,14 @@
closes bug #1631810.
-2007-02-01; William J Beksi <wj...@us...>
+2007-02-01; William J Beksi <wjbeksi at users.sourceforge.net>
* src/sgpsdp/sgp_in.c:
Fix for bug 1644926, avoid escaping '&' by using '/' for satellite
names.
-2007-01-28; William J Beksi <wj...@us...>
+2007-01-28; William J Beksi <wjbeksi at users.sourceforge.net>
* src/gtk-sat-map.c:
Added support to remap satellite labels. When the satellite marker
@@ -1103,7 +1103,7 @@
label will be mapped to GTK_ANCHOR_SOUTH.
-2006-01-20; Alexandru Csete <oz...@gm...>
+2006-01-20; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-map-ground-track.c:
Explicitly free allocated ssp_t structures when the ground track is
@@ -1129,7 +1129,7 @@
No need for libc compat functions anymore.
-2006-01-19; Alexandru Csete <oz...@gm...>
+2006-01-19; Alexandru Csete <oz9aec at gmail.com>
* src/tle-lookup.c:
Free allocated TLE lines when no longer needed (bug #1636429).
@@ -1153,26 +1153,26 @@
Fixed indent.
-2006-01-17; Alexandru Csete <oz...@gm...>
+2006-01-17; Alexandru Csete <oz9aec at gmail.com>
* Makefile.am:
Include win32 files in source distribution (bug #1631809).
-2006-01-09; Alexandru Csete <oz...@gm...>
+2006-01-09; Alexandru Csete <oz9aec at gmail.com>
* src/tle-update.c:
Fixed bug that prevented TLE files to be updated under windows
(bug #1631803).
-2006-01-08; Alexandru Csete <oz...@gm...>
+2006-01-08; Alexandru Csete <oz9aec at gmail.com>
* win32:
Added files necessary for linux->win32 cross-build.
-2006-12-31; Alexandru Csete <oz...@gm...>
+2006-12-31; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pass-dialogs.c:
Show polar and az/el plots of pass in addition to the data. We use a
@@ -1195,13 +1195,13 @@
Include new files into build list.
-2006-12-27; Alexandru Csete <oz...@gm...>
+2006-12-27; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.c:
Changed default layout to include single satellite view instead of list.
-2006-12-17; Alexandru Csete <oz...@gm...>
+2006-12-17; Alexandru Csete <oz9aec at gmail.com>
* src/menubar.c:
Don't set any default window size for TLE update window.
@@ -1220,7 +1220,7 @@
singly linked lists.
-2006-12-10; Alexandru Csete <oz...@gm...>
+2006-12-10; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-map-ground-track.[ch]:
Added files containing function for ground track management.
@@ -1235,20 +1235,20 @@
Added control to adjust number of orbits for ground tracks.
-2006-10-29; Alexandru Csete <oz...@gm...>
+2006-10-29; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.[ch]:
* src/config-keys.h:
Added parameter for number of orbits to show ground track for.
-2006-10-28; Alexandru Csete <oz...@gm...>
+2006-10-28; Alexandru Csete <oz9aec at gmail.com>
* src/sat-popup-menu.c:
Fixed wrong epoch day in the satellite info dialogue (bug #1586341).
-2006-10-21; Alexandru Csete <oz...@gm...>
+2006-10-21; Alexandru Csete <oz9aec at gmail.com>
* src/sgpsdp/sgp4sdp4.h, src/sgpsdp/sgp_in.c:
Added support for operational status encoded in the satellite name
@@ -1258,25 +1258,25 @@
Added support for operational status.
-2006-10-17; Alexandru Csete <oz...@gm...>
+2006-10-17; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-map.[ch]:
Use arrays for grid lines.
-2006-10-15; Alexandru Csete <oz...@gm...>
+2006-10-15; Alexandru Csete <oz9aec at gmail.com>
* src/main.c:
Added code to implement automatic monitoring of TLE age.
-2006-10-14; Alexandru Csete <oz...@gm...>
+2006-10-14; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-tle.c:
Finished implementation of TLE configuration module.
-2006-10-11; Alexandru Csete <oz...@gm...>
+2006-10-11; Alexandru Csete <oz9aec at gmail.com>
* src/tle-lookup.[ch]:
Added function tle_lookup_count(), which returns the number of
@@ -1300,7 +1300,7 @@
Added Curl to Mingw build environment.
-2006-10-10; Alexandru Csete <oz...@gm...>
+2006-10-10; Alexandru Csete <oz9aec at gmail.com>
* src/tle-update.[ch]:
Finished preliminary implementation of TLE update.
@@ -1312,37 +1312,37 @@
Added infrastructure to allow reloading of sats in each module.
-2006-10-08; Alexandru Csete <oz...@gm...>
+2006-10-08; Alexandru Csete <oz9aec at gmail.com>
* src/menubar.c:
Added menu items fro TLE update.
-2006-10-06; Alexandru Csete <oz...@gm...>
+2006-10-06; Alexandru Csete <oz9aec at gmail.com>
* src/first-time.[ch]:
Added checks for TLE cache directory.
-2006-10-04; Alexandru Csete <oz...@gm...>
+2006-10-04; Alexandru Csete <oz9aec at gmail.com>
* configure.ac:
Check for libcurl that is used for automatic TLE update.
-2006-10-03; Alexandru Csete <oz...@gm...>
+2006-10-03; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.[ch]:
Added config keys for TLE update.
-2006-10-01; Alexandru Csete <oz...@gm...>
+2006-10-01; Alexandru Csete <oz9aec at gmail.com>
* src/mod-cfg.c:
Added window icon to module configuration windows. Fixed indent.
-2006-09-24; Alexandru Csete <oz...@gm...>
+2006-09-24; Alexandru Csete <oz9aec at gmail.com>
* src/sat-vis.[ch]:
* src/predict-tools.c:
@@ -1356,7 +1356,7 @@
Added new files to list.
-2006-09-05; Alexandru Csete <oz...@gm...>
+2006-09-05; Alexandru Csete <oz9aec at gmail.com>
* data/Makefile.am:
Don't use $(DESTDIR) because that causes data to be installed into the
@@ -1369,7 +1369,7 @@
delete the module specific QTHFILE setting.
-2006-09-02; William J Beksi <wj...@us...>
+2006-09-02; William J Beksi <wjbeksi at users.sourceforge.net>
* src/sat-pref-map-view.c:
Enabled grid lines.
@@ -1378,7 +1378,7 @@
Implemented horizontal and vertical grid lines.
-2006-09-02; Alexandru Csete <oz...@gm...>
+2006-09-02; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-polar-view.c:
Update positions of time stamp labels when the polar view is resized.
@@ -1404,7 +1404,7 @@
Use table instead of list to select visible columns in list view.
-2006-08-28; Alexandru Csete <oz...@gm...>
+2006-08-28; Alexandru Csete <oz9aec at gmail.com>
* src/predict-tools.[ch]:
Added get_current_pass function, which provides the details of the
@@ -1422,7 +1422,7 @@
Renamed "Show Track" to "Sky track" and disabled "Set target" item.
-2006-08-27; Alexandru Csete <oz...@gm...>
+2006-08-27; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-map.c:
Fixed remaining issues with erroneous calculation of the range circles,
@@ -1440,7 +1440,7 @@
Added function to calculate AOS time of current pass (in the past).
-2006-08-26; Alexandru Csete <oz...@gm...>
+2006-08-26; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-map.[ch]:
Use preferred coverage colour and allow disabling of coverage. Added
@@ -1470,7 +1470,7 @@
background colour.
-2006-08-25; Alexandru Csete <oz...@gm...>
+2006-08-25; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-map.[ch]:
Use GooCanvasPolyline instead of rectangles for footprint. This gives
@@ -1485,14 +1485,14 @@
Added widgets.
-2006-08-23; Alexandru Csete <oz...@gm...>
+2006-08-23; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-data.c:
* src/gtk-sat-moules.c:
Added code to ensure that ssplon always stays within -PI and +PI.
-2006-08-20; Alexandru Csete <oz...@gm...>
+2006-08-20; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-map.c:
Only update satellite if it has moved 2*MARKER_SIZE_HALF (performance).
@@ -1500,7 +1500,7 @@
Fixed update of next event. Fixed indentation.
-2006-08-13; Alexandru Csete <oz...@gm...>
+2006-08-13; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-list.c:
Enabled automatic sorting for all columns.
@@ -1510,7 +1510,7 @@
if field is enabled and there is an upcoming satellite.
-2006-08-12; Alexandru Csete <oz...@gm...>
+2006-08-12; Alexandru Csete <oz9aec at gmail.com>
* src/sat-vis.c, src/sat-vis.h:
Added files to calculate satellite visibility.
@@ -1526,7 +1526,7 @@
Implemented visibility fields.
-2006-08-10; Alexandru Csete <oz...@gm...>
+2006-08-10; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-list.c:
Fixed column alignments.
@@ -1547,14 +1547,14 @@
-2006-08-09; William J Beksi <wj...@us...>
+2006-08-09; William J Beksi <wjbeksi at users.sourceforge.net>
* src/gtk-sat-map.[ch]:
Implemented satellite range circles. Points are plotted using the
goocanvasrect items.
-2006-08-06; William J Beksi <wj...@us...>
+2006-08-06; William J Beksi <wjbeksi at users.sourceforge.net>
* src/gtk-polar-view.c:
* src/gtk-map-view.c:
@@ -1562,7 +1562,7 @@
orbit satellites to crash when their next aos was not updated.
-2006-08-05; William J Beksi <wj...@us...>
+2006-08-05; William J Beksi <wjbeksi at users.sourceforge.net>
* gpredict.doxygen:
Added Doxygen configuration file for generating source code
@@ -1573,7 +1573,7 @@
documentation and Latex to generate the user manual.
-2006-07-30; Alexandru Csete <oz...@gm...>
+2006-07-30; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-tree.c:
Added buttons to expand and collapse the GtkSatTree. Expanding the tree
@@ -1592,7 +1592,7 @@
Modified step 3 to copy Amateur.mod into user modules directory.
-2006-07-29; Alexandru Csete <oz...@gm...>
+2006-07-29; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module-popup.c, src/tle-lookup.c:
* src/loc-tree.c, src/sat-log.c:
@@ -1617,7 +1617,7 @@
Use qth-editor to implement "+" button (add QTH).
-2006-07-28; Alexandru Csete <oz...@gm...>
+2006-07-28; Alexandru Csete <oz9aec at gmail.com>
* src/sat-popup-menu.[ch]:
* src/pass-popup-menu.[ch]:
@@ -1652,7 +1652,7 @@
all the way and only fail during uninstall #-o
-2006-07-27; Alexandru Csete <oz...@gm...>
+2006-07-27; Alexandru Csete <oz9aec at gmail.com>
* src/config-keys.h, src/sat-cfg.[ch]:
Added font name and extra azimuth ticks flag for GtkPolarView.
@@ -1665,7 +1665,7 @@
Finished implementation.
-2006-07-26; Alexandru Csete <oz...@gm...>
+2006-07-26; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-single-sat:
Removed unused variables.
@@ -1685,7 +1685,7 @@
view (list).
-2006-07-25; Alexandru Csete <oz...@gm...>
+2006-07-25; Alexandru Csete <oz9aec at gmail.com>
* README, src/gtk-sat-map.c, src/sat-pref-qth-editor.c:
Spell Maidenhead correctly.
@@ -1719,7 +1719,7 @@
Added file.
-2006-07-24; Alexandru Csete <oz...@gm...>
+2006-07-24; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-qth.c:
Show QTH location instead of weather station.
@@ -1728,7 +1728,7 @@
Fix initial module sizes based on parent (GtkNotebook) size.
-2006-07-23; Alexandru Csete <oz...@gm...>
+2006-07-23; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-list-col-sel.[ch]:
Added function to set column flags of existing column selector.
@@ -1737,7 +1737,7 @@
Added RESET button.
-2006-07-22; Alexandru Csete <oz...@gm...>
+2006-07-22; Alexandru Csete <oz9aec at gmail.com>
* src/mod-mgr.[ch]:
New API to support addition of modules without docking.
@@ -1755,7 +1755,7 @@
Added RESET button.
-2006-07-21; Alexandru Csete <oz...@gm...>
+2006-07-21; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pass-dialogs.c, src/sat-popup-menu.c:
Use NULL parent for dialog windows to avoid conflicts when using
@@ -1768,7 +1768,7 @@
Re-enabled module config in fullscreen mode.
-2006-07-20; Alexandru Csete <oz...@gm...>
+2006-07-20; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-map.[ch]:
Optimised resize algorithm. Size allocate callback will simply request
@@ -1776,7 +1776,7 @@
timeout handler at every GtkSatModule cycle.
-2006-07-18; Alexandru Csete <oz...@gm...>
+2006-07-18; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module.[ch]:
Added public wrapper function for fix_child_allocations function
@@ -1788,7 +1788,7 @@
Store paned positions when docking back to notebook.
-2006-07-16; Alexandru Csete <oz...@gm...>
+2006-07-16; Alexandru Csete <oz9aec at gmail.com>
* src/mod-mgr.[ch]:
Implemented awareness of GtkSatModule states, i.e. docked/undocked.
@@ -1800,7 +1800,7 @@
Updated with info about module states (docked, window, fullscreen).
-2006-07-15; Alexandru Csete <oz...@gm...>
+2006-07-15; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-single-pass.c:
Changed widget layout to use three columns instead of two.
@@ -1818,7 +1818,7 @@
since this will allow user to shrink the window and scale down the map.
-2006-07-14; Alexandru Csete <oz...@gm...>
+2006-07-14; Alexandru Csete <oz9aec at gmail.com>
* src/config-keys.h, src/sat-cfg.[ch]:
Added necessary config keys.
@@ -1836,7 +1836,7 @@
Require Glib 2.10 because of Goocanvas. Sorry...
-2006-07-13; Alexandru Csete <oz...@gm...>
+2006-07-13; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-map.[ch]:
Added GtkSatMap skeleton based on GtkPolarView.
@@ -1845,7 +1845,7 @@
Use new GtkSatMap widget.
-2006-07-12; Alexandru Csete <oz...@gm...>
+2006-07-12; Alexandru Csete <oz9aec at gmail.com>
* goocanvas-patch/src-Makefile.am:
Added file that should replace goocanvas/src/Makefile.am
@@ -1881,7 +1881,7 @@
Updated.
-2006-07-09; Alexandru Csete <oz...@gm...>
+2006-07-09; Alexandru Csete <oz9aec at gmail.com>
* doc/notes/configuration.txt:
Added notes describing the idea behind the local and global
@@ -1920,7 +1920,7 @@
Added button for popping up properties dialog.
-2006-07-08; Alexandru Csete <oz...@gm...>
+2006-07-08; Alexandru Csete <oz9aec at gmail.com>
* src/Makefile.am:
Define PACKAGE_PIXMAPS_DIR.
@@ -1941,7 +1941,7 @@
Implemented the module layout.
-2006-06-26; Alexandru Csete <oz...@gm...>
+2006-06-26; Alexandru Csete <oz9aec at gmail.com>
* configure.ac:
Don't define directories using AC_DEFINE_UNQUOTED (wrong and broken
@@ -1955,7 +1955,7 @@
/usr/local/share/pixmaps/gpredict by default (same as for gpredcit 0.5)
-2006-06-25; Alexandru Csete <oz...@gm...>
+2006-06-25; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg:
Added polar view related parameters.
@@ -1964,7 +1964,7 @@
Use colours from global configuration.
-2006-06-24; Alexandru Csete <oz...@gm...>
+2006-06-24; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-polar-view:
Implemented satellite selection and popup menu. Modified next aos code
@@ -1974,20 +1974,20 @@
Implemented polar view popup menu.
-2006-06-23; Alexandru Csete <oz...@gm...>
+2006-06-23; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-polar-view:
Added location name and next event to chart.
-2006-06-22; Alexandru Csete <oz...@gm...>
+2006-06-22; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-polar-view:
Finished support for graph orientation (not config though).
Implemented cursor tracking.
-2006-06-20; Alexandru Csete <oz...@gm...>
+2006-06-20; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-polar-view:
Done some more work using GooCanvas. This seems to be the way to go!
@@ -1995,13 +1995,13 @@
add satellites and user config, i.e. orientation and colours.
-2006-06-19; Alexandru Csete <oz...@gm...>
+2006-06-19; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-polar-view:
Making an attempt with goocanvas :-)
-2006-06-18; Alexandru Csete <oz...@gm...>
+2006-06-18; Alexandru Csete <oz9aec at gmail.com>
* src/sat-popup-menu:
Made info and predict functions public to allow their use from other
@@ -2025,7 +2025,7 @@
Added widget skeleton.
-2006-06-17; Alexandru Csete <oz...@gm...>
+2006-06-17; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-single-sat.c:
Implemented periodic update of fields.
@@ -2038,13 +2038,13 @@
event time = 0.0
-2006-05-20; Alexandru Csete <oz...@gm...>
+2006-05-20; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-single-sat:
Added fields and popup menu. Not fully functional.
-2006-05-13; Alexandru Csete <oz...@gm...>
+2006-05-13; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-list.c:
Sanity checks in gtk_sat_list_update should be done as first thing.
@@ -2053,7 +2053,7 @@
Added files.
-2006-05-12; Alexandru Csete <oz...@gm...>
+2006-05-12; Alexandru Csete <oz9aec at gmail.com>
* src/predict-col-defs.h:
Changed String arrays to static. This allows inclusion in multiple
@@ -2069,13 +2069,13 @@
Added tooltips.
-2006-05-06; Alexandru Csete <oz...@gm...>
+2006-05-06; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-conditions.c:
Added widgets to configure predict conditions.
-2006-05-04; Alexandru Csete <oz...@gm...>
+2006-05-04; Alexandru Csete <oz9aec at gmail.com>
* src/predict-tools.c:
Fixed bug that caused multi-pass predictions to be completely nonsense.
@@ -2094,7 +2094,7 @@
Added icons to menu items.
-2006-05-03; Alexandru Csete <oz...@gm...>
+2006-05-03; Alexandru Csete <oz9aec at gmail.com>
* src/predict-tools:
Added functions to copy pass_t and pass_detail_t structures.
@@ -2107,7 +2107,7 @@
Added multi-pass dialog. Not finished and buggy.
-2006-05-02; Alexandru Csete <oz...@gm...>
+2006-05-02; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg:
Added support for SAT_CFG_INT_PRED_SINGLE_COL and
@@ -2122,7 +2122,7 @@
follow later.
-2006-05-01; Alexandru Csete <oz...@gm...>
+2006-05-01; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg:
Changed SAT_CFG_INT_PRED_LOOK_AHEAD from hours to days. Default is 3.
@@ -2143,7 +2143,7 @@
section we are in.
-2006-04-30; Alexandru Csete <oz...@gm...>
+2006-04-30; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-formats.c:
Implemented time format reset button.
@@ -2160,7 +2160,7 @@
Added option to enable rules hint in the GtkSatList.
-2006-04-29; Alexandru Csete <oz...@gm...>
+2006-04-29; Alexandru Csete <oz9aec at gmail.com>
* src/sgpsdp/sgp4sdp4.h:
Added AOS and LOS fields to sat_t.
@@ -2175,7 +2175,7 @@
Added boolean parameter for enabling GtkSatList rules hint.
-2006-04-28; Alexandru Csete <oz...@gm...>
+2006-04-28; Alexandru Csete <oz9aec at gmail.com>
* src/orbit-tools.c:
Fixed erroneous qth.lat conversion in has_aos.
@@ -2191,7 +2191,7 @@
Added files with code to predict upcoming passes.
-2006-04-27; Alexandru Csete <oz...@gm...>
+2006-04-27; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module-popup.c:
Ask user for confirmation before deleting a module permanently.
@@ -2226,7 +2226,7 @@
Make notebook tabs homogeneous.
-2006-04-26; Alexandru Csete <oz...@gm...>
+2006-04-26; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module-popup.c, src/gtk-sat-module-popup.h:
New files. Implement popup menu for the GtkSatModule widget instead of
@@ -2244,7 +2244,7 @@
values may have to be changed later).
-2006-04-25; Alexandru Csete <oz...@gm...>
+2006-04-25; Alexandru Csete <oz9aec at gmail.com>
* src/sat-popup-menu.c:
Use gtk_widget_show instead of gtk_dialog_run in order to return
@@ -2277,7 +2277,7 @@
Convert phase to degrees.
-2006-04-24; Alexandru Csete <oz...@gm...>
+2006-04-24; Alexandru Csete <oz9aec at gmail.com>
* src/orbit-tools.c:
Use true mean motion when checking for GEO.
@@ -2307,7 +2307,7 @@
Added file.
-2006-04-22; Alexandru Csete <oz...@gm...>
+2006-04-22; Alexandru Csete <oz9aec at gmail.com>
* doc/man/gpredict.1.in:
Updated with minimal info.
@@ -2324,7 +2324,7 @@
Done some work on the sat info dialog.
-2006-04-21; Alexandru Csete <oz...@gm...>
+2006-04-21; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-data.c:
Store orbit type after reading satellite data. Clean some compile
@@ -2354,7 +2354,7 @@
Added macros to convert between miles and kilometers.
-2006-04-21; Alexandru Csete <oz...@gm...>
+2006-04-21; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-list.c:
Do not detach model from tree view while updating because that makes
@@ -2365,7 +2365,7 @@
by both GtkSatList, GtkSatMap and others.
-2006-04-20; Alexandru Csete <oz...@gm...>
+2006-04-20; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module.c:
Implemented configure on the fly in docked state. Fixed bug with wrong
@@ -2391,7 +2391,7 @@
Added more field descriptions and orbit type.
-2006-04-18; Alexandru Csete <oz...@gm...>
+2006-04-18; Alexandru Csete <oz9aec at gmail.com>
* src/mod-cfg.c:
Add return code to mod_cfg_edit. Make editor dialog the same size as the
@@ -2405,7 +2405,7 @@
Done some work on "module-config" functionality.
-2006-04-15; Alexandru Csete <oz...@gm...>
+2006-04-15; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-tree.c:
Sort tree by satellite name in ascending order.
@@ -2414,14 +2414,14 @@
Addd files containing code for the "about" dialog.
-2006-04-14; Alexandru Csete <oz...@gm...>
+2006-04-14; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-list-col-sel.c:
Fixed bug which caused the gtk_sat_list_col_sel_get_flags query to
always fail.
-2006-04-11; Alexandru Csete <oz...@gm...>
+2006-04-11; Alexandru Csete <oz9aec at gmail.com>
* src/mod-cfg.c:
Remove "+" button for now.
@@ -2436,7 +2436,7 @@
Implemented mod_mgr_remove_module.
-2006-04-10; Alexandru Csete <oz...@gm...>
+2006-04-10; Alexandru Csete <oz9aec at gmail.com>
* src/mod-mgr.c:
Set OPEN_MODULES=NULL in sat-cfg when there are no modules open,
@@ -2459,7 +2459,7 @@
text. Primary use will be dock/close buttons for modules.
-2006-04-09; Alexandru Csete <oz...@gm...>
+2006-04-09; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module.c:
Made destuction of the satellite hash table conditional. Appearantly,
@@ -2483,7 +2483,7 @@
Use new module manager.
-2006-04-08; Alexandru Csete <oz...@gm...>
+2006-04-08; Alexandru Csete <oz9aec at gmail.com>
* src/gpredict-utils.c:
Allow to create buttons without text.
@@ -2495,7 +2495,7 @@
Implemented "Open" function.
-2006-04-07; Alexandru Csete <oz...@gm...>
+2006-04-07; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-tree:
Widget is now in a useable state. Still needs to be done:
@@ -2508,7 +2508,7 @@
Connected "New" menu item to mod-cfg editor.
-2006-04-06; Alexandru Csete <oz...@gm...>
+2006-04-06; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-list:
Update function is now member in the GtkSatList structure.
@@ -2520,7 +2520,7 @@
Added new widget. Can be used to select satellites.
-2006-04-05; Alexandru Csete <oz...@gm...>
+2006-04-05; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-qth.c, src/sat-pref-formats.c:
Make sure that altitude is handled properly when user changes between
@@ -2549,7 +2549,7 @@
gtk-sat-list.h. Minor speed optimisations.
-2006-04-04; Alexandru Csete <oz...@gm...>
+2006-04-04; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-qth-editor.c:
Only allow valid charachters in location name (code stolen from xlog).
@@ -2583,7 +2583,7 @@
reading tle files.
-2006-04-03; Alexandru Csete <oz...@gm...>
+2006-04-03; Alexandru Csete <oz9aec at gmail.com>
* src/Makefile.am:
Include config-keys.h in list of files.
@@ -2617,7 +2617,7 @@
Removed NAME field.
-2006-04-02; Alexandru Csete <oz...@gm...>
+2006-04-02; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-qth.c:
Only store basic qth file name in qth list. We do not ever need the
@@ -2625,13 +2625,13 @@
users home.
-2006-04-01; Alexandru Csete <oz...@gm...>
+2006-04-01; Alexandru Csete <oz9aec at gmail.com>
* src/gpredict-utils.h:
Added macros to convert between feet and meters.
-2006-03-31; Alexandru Csete <oz...@gm...>
+2006-03-31; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-qth-editor.c, src/sat-pref-qth-editor.h:
Added files containing code to edit QTH details.
@@ -2645,7 +2645,7 @@
Include new files in files list.
-2006-03-29; Alexandru Csete <oz...@gm...>
+2006-03-29; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-qth.c:
Use g_try_malloc instead of g_try_new, which is not available until
@@ -2654,20 +2654,20 @@
locations from the list. Still to do Add and Edit buttons.
* src/sgpsdp/Makefile.am:
- Add @PACKAGE_LIBS@ to linker, otherwise mathlib was not available
+ Add at PACKAGE_LIBS at to linker, otherwise mathlib was not available
anymore. Go figure...
* src/gtk-sat-data.c:
Added finction to save QTH data.
-2006-03-28; Alexandru Csete <oz...@gm...>
+2006-03-28; Alexandru Csete <oz9aec at gmail.com>
* src/main.c:
Only include rig.h if hamlib is available.
-2006-02-05; Alexandru Csete <oz...@gm...>
+2006-02-05; Alexandru Csete <oz9aec at gmail.com>
* configure.ac:
Changed check for hamlib so that support is optional.
@@ -2682,7 +2682,7 @@
Added QTH list and editing functions.
-2006-02-03; Alexandru Csete <oz...@gm...>
+2006-02-03; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.c:
Fixed bug, which caused the whole program to crash when creating the
@@ -2695,7 +2695,7 @@
Added some more comments.
-2005-11-09; Alexandru Csete <oz...@gm...>
+2005-11-09; Alexandru Csete <oz9aec at gmail.com>
* src/gpredict-utils:
Added function to create horizontal pixmap button using stock pixmaps.
@@ -2706,7 +2706,7 @@
WIN32 (tip from TML on gtk-app-devel).
-2005-11-08; Alexandru Csete <oz...@gm...>
+2005-11-08; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-general.c:
Changed tab labels.
@@ -2715,7 +2715,7 @@
Added files.
-2005-11-05; Alexandru Csete <oz...@gm...>
+2005-11-05; Alexandru Csete <oz9aec at gmail.com>
* src/loc-tree.c:
Check whether specified location file exists.
@@ -2725,7 +2725,7 @@
-2005-10-22; Alexandru Csete <oz...@gm...>
+2005-10-22; Alexandru Csete <oz9aec at gmail.com>
* src/tle-lookup.c:
Send error message to sat-log if there are no tle files in
@@ -2745,20 +2745,20 @@
noise, fx. when creating loc-tree.
-2005-10-21; Alexandru Csete <oz...@gm...>
+2005-10-21; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-qth.c:
Started implementation.
-2005-10-20; Alexandru Csete <oz...@gm...>
+2005-10-20; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref-formats.c
Implemented automatic update of time preview label. Takes both the
time format string and the Local/UTC checkbox into account.
-2005-10-19; Alexandru Csete <oz...@gm...>
+2005-10-19; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.c, src/sat-cfg.h:
This is now the only module, which has direct access to gpredict.cfg
@@ -2775,7 +2775,7 @@
fortime format.
-2005-10-18; Alexandru Csete <oz...@gm...>
+2005-10-18; Alexandru Csete <oz9aec at gmail.com>
* src/gpredict-utils.c, src/gpredict-utils.h:
Added files.
@@ -2800,7 +2800,7 @@
Added g_io_channel_unref when channel has been shut down.
-2005-10-17; Alexandru Csete <oz...@gm...>
+2005-10-17; Alexandru Csete <oz9aec at gmail.com>
* data/Makefile.am:
Added file.
@@ -2822,7 +2822,7 @@
Added some icons.
-2005-10-16; Alexandru Csete <oz...@gm...>
+2005-10-16; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module.c:
Inhibit addition of satellite if it is already in hash table. There is
@@ -2835,7 +2835,7 @@
respect to CPU load during udates... Also need to add sorting.
-2005-10-15; Alexandru Csete <oz...@gm...>
+2005-10-15; Alexandru Csete <oz9aec at gmail.com>
* src/loc-tree.c:
Finished location selector. This is now a complete module incluing a
@@ -2851,7 +2851,7 @@
Use PACKAGE_DATA_DIR instead PACKAGE_PIXMAPS_DIR.
-2005-10-12; Alexandru Csete <oz...@gm...>
+2005-10-12; Alexandru Csete <oz9aec at gmail.com>
* src/sgpsdp/sgp2sdp4.h:
Added some fields to allow direct copy of SGP/SDP driver from ktrack.
@@ -2867,7 +2867,7 @@
Added Orbit Lab menu item.
-2005-10-10; Alexandru Csete <oz...@gm...>
+2005-10-10; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref.c:
Create window with signals. Add widgets to window.
@@ -2876,7 +2876,7 @@
Open sat-pref dialog when Preferences is selected in the menubar.
-2005-10-07; Alexandru Csete <oz...@gm...>
+2005-10-07; Alexandru Csete <oz9aec at gmail.com>
* src/sat-pref.c, src/sat-pref.h:
Created files. Top level preferences dialog.
@@ -2885,7 +2885,7 @@
Created files.
-2005-10-06; Alexandru Csete <oz...@gm...>
+2005-10-06; Alexandru Csete <oz9aec at gmail.com>
* src/config-keys.h:
Added MOD_CFG_SATS_KEY, MOD_CFG_TIMEOUT_KEY and MOD_CFG_WARP_FACTOR_KEY.
@@ -2909,7 +2909,7 @@
Added file.
-2005-10-05; Alexandru Csete <oz...@gm...>
+2005-10-05; Alexandru Csete <oz9aec at gmail.com>
* src/sat-monitor.c, src/sat-monitor.h:
Added files.
@@ -2918,7 +2918,7 @@
Added obs_t and obs_astro_t structures to sat_t.
-2005-10-04; Alexandru Csete <oz...@gm...>
+2005-10-04; Alexandru Csete <oz9aec at gmail.com>
* src/sat-cfg.c, src/sat-cfg.h:
Added files. This module will be responsible for reading,
@@ -2930,13 +2930,13 @@
sort the lists, which display the data.
-2005-10-03; Alexandru Csete <oz...@gm...>
+2005-10-03; Alexandru Csete <oz9aec at gmail.com>
* src/loc-tree.c:
Display N, S, W, E instead of sign according to configuration.
-2005-10-02; Alexandru Csete <oz...@gm...>
+2005-10-02; Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module, src/gtk-sat-data:
Moved files to src
@@ -2953,19 +2953,19 @@
character for lat and lon fields.
-2005-10-01; Alexandru Csete <oz...@gm...>
+2005-10-01; Alexandru Csete <oz9aec at gmail.com>
* src/widgets/gtk-sat-data.c, src/widgets/gtk-sat-data.h:
Added files containing data structures and utlity functions for QTH data.
-2005-09-22; Alexandru Csete <oz...@gm...>
+2005-09-22; Alexandru Csete <oz9aec at gmail.com>
* src/loc-tree.c, src/loc-tree.h:
Added files. Not fully implemented yet.
-2005-09-18; Alexandru Csete <oz...@gm...>
+2005-09-18; Alexandru Csete <oz9aec at gmail.com>
* src/sgpsdp/sgp4sdp4.h:
More documentation. Added extra data structure for satellite bearing and
@@ -2975,7 +2975,7 @@
Use the new data types instead of the generic vector_t.
-2005-07-28; Alexandru Csete <oz...@gm...>
+2005-07-28; Alexandru Csete <oz9aec at gmail.com>
* src/sat-log.c, src/sat-log.h:
Added skeleton.
@@ -2984,7 +2984,7 @@
Implemented.
-2005-07-27; Alexandru Csete <oz...@gm...>
+2005-07-27; Alexandru Csete <oz9aec at gmail.com>
* src/main.c, src/gui.c, src/gui.h, src/menubar.c,
* src/widgets/gtk-sat-module.c, src/widgets/gtk-sat-module.h,
@@ -2998,7 +2998,7 @@
Added new files to list.
-2005-05-31; Alexandru Csete <oz...@gm...>
+2005-05-31; Alexandru Csete <oz9aec at gmail.com>
* configure.ac:
Require Gtk+ 2.6
@@ -3007,7 +3007,7 @@
Added widget skeleton.
-2005-05-30; Alexandru Csete <oz...@gm...>
+2005-05-30; Alexandru Csete <oz9aec at gmail.com>
* src/menubar.c:
Added few more menu items.
@@ -3016,19 +3016,19 @@
Renamed gpredict-gui to plain gui.
-2005-05-13; Alexandru Csete <oz...@gm...>
+2005-05-13; Alexandru Csete <oz9aec at gmail.com>
* src/main.c:
Pack menubar in vertical box.
-2005-04-16; Alexandru Csete <oz...@gm...>
+2005-04-16; Alexandru Csete <oz9aec at gmail.com>
* src/menubar.c, menubar.h:
Added menubar skeleton.
-2005-04-13; Alexandru Csete <oz...@gm...>
+2005-04-13; Alexandru Csete <oz9aec at gmail.com>
* src/sgpsdp/sgp_in.c, sgp4sdp4.h:
Change interface for select_ephemeris() so that it takes a pointer to a
@@ -3046,7 +3046,7 @@
Created directory to contain test results.
-2005-04-10; Alexandru Csete <oz...@gm...>
+2005-04-10; Alexandru Csete <oz9aec at gmail.com>
* src/sgpsdp:
Added type definition for satellite. Optimized SDP4, SGP4 and
@@ -3054,13 +3054,13 @@
to be done.
-2005-04-09; Alexandru Csete <oz...@gm...>
+2005-04-09; Alexandru Csete <oz9aec at gmail.com>
* src/sgpsdp:
Added code to propagate elements using SGP4 and SDP4 models.
-2005-02-13; Alexandru Csete <oz...@gm...>
+2005-02-13; Alexandru Csete <oz9aec at gmail.com>
* gpredict:
Created initial code template for the Gtk+ 2 version of
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-05-24 12:40:11 UTC (rev 330)
+++ trunk/NEWS 2009-05-24 12:46:17 UTC (rev 331)
@@ -1,9 +1,3 @@
-Changes in version 1.0 (final):
-* Feature request 2691964: Doppler tuning on uplink (duplex TRX)
-* Feature request 2194621: Data recorder.
-* Windows: New installer instead of ZIP distribution.
-* Mac OS X package.
-
Changes in version 1.0 beta 5 (24 May 2005)
- Added new transponder files received from David VK5DG.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-04 20:29:14
|
Revision: 352
http://gpredict.svn.sourceforge.net/gpredict/?rev=352&view=rev
Author: csete
Date: 2009-08-04 20:28:56 +0000 (Tue, 04 Aug 2009)
Log Message:
-----------
Switch to new sat files.
Modified Paths:
--------------
trunk/configure.ac
trunk/data/Makefile.am
Added Paths:
-----------
trunk/data/satdata/Makefile.am
trunk/data/trsp/Makefile.am
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-08-04 20:16:12 UTC (rev 351)
+++ trunk/configure.ac 2009-08-04 20:28:56 UTC (rev 352)
@@ -89,6 +89,8 @@
pixmaps/maps/Makefile
pixmaps/icons/Makefile
data/Makefile
+data/satdata/Makefile
+data/trsp/Makefile
po/Makefile.in
])
Modified: trunk/data/Makefile.am
===================================================================
--- trunk/data/Makefile.am 2009-08-04 20:16:12 UTC (rev 351)
+++ trunk/data/Makefile.am 2009-08-04 20:28:56 UTC (rev 352)
@@ -1,20 +1,8 @@
+SUBDIRS = satdata trsp
gpredict_datdir = $(pkgdatadir)/data
-gpredict_dat_DATA = \
- locations.dat sample.qth Amateur.mod \
- amateur.tle cubesat.tle galileo.tle geo.tle \
- gps-ops.tle iridium.tle military.tle \
- radar.tle science.tle weather.tle \
- 7530.trsp 22825.trsp 24278.trsp 25544.trsp \
- 27607.trsp 27848.trsp 28375.trsp 28650.trsp \
- 32785.trsp \
- 24786.trsp 25338.trsp 26352.trsp 26536.trsp \
- 26871.trsp 27453.trsp 28654.trsp \
- 20439.trsp 20442.trsp 22826.trsp 23439.trsp \
- 25397.trsp 26931.trsp 27844.trsp 27939.trsp \
- 28895.trsp 32787.trsp 32789.trsp 32791.trsp \
- 33493.trsp 33498.trsp 33499.trsp
+gpredict_dat_DATA = locations.dat sample.qth Amateur.mod
EXTRA_DIST = $(gpredict_dat_DATA)
Added: trunk/data/satdata/Makefile.am
===================================================================
--- trunk/data/satdata/Makefile.am (rev 0)
+++ trunk/data/satdata/Makefile.am 2009-08-04 20:28:56 UTC (rev 352)
@@ -0,0 +1,7 @@
+
+gpredict_satdir = $(pkgdatadir)/data/satdata
+
+gpredict_sat_DATA = *.sat *.cat
+
+EXTRA_DIST = $(gpredict_sat_DATA)
+
Added: trunk/data/trsp/Makefile.am
===================================================================
--- trunk/data/trsp/Makefile.am (rev 0)
+++ trunk/data/trsp/Makefile.am 2009-08-04 20:28:56 UTC (rev 352)
@@ -0,0 +1,7 @@
+
+gpredict_trspdir = $(pkgdatadir)/data/trsp
+
+gpredict_trsp_DATA = *.trsp
+
+EXTRA_DIST = $(gpredict_trsp_DATA)
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-08 15:14:15
|
Revision: 404
http://gpredict.svn.sourceforge.net/gpredict/?rev=404&view=rev
Author: csete
Date: 2009-08-08 15:14:07 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/first-time.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-08-08 15:12:04 UTC (rev 403)
+++ trunk/ChangeLog 2009-08-08 15:14:07 UTC (rev 404)
@@ -1,3 +1,17 @@
+2009-08-09 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/compat.[ch]:
+ Added sat_file_name_from_catnum_s (gchar *catnum).
+
+
+
+2009-08-07 Alexandru Csete <oz9aec at gmail.com>
+
+ * data/satdata/*.sat:
+ Packaged .sat files into one satellites.dat file for distribution because
+ SF subversion was useless with many small files.
+
+
2009-08-06 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rig-ctrl.c:
Modified: trunk/src/first-time.c
===================================================================
--- trunk/src/first-time.c 2009-08-08 15:12:04 UTC (rev 403)
+++ trunk/src/first-time.c 2009-08-08 15:14:07 UTC (rev 404)
@@ -572,6 +572,7 @@
g_key_file_free (target);
g_free (cfgstr);
+ g_free (cfgver);
g_free (name);
g_free (nickname);
g_free (tle1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-12 17:04:13
|
Revision: 414
http://gpredict.svn.sourceforge.net/gpredict/?rev=414&view=rev
Author: csete
Date: 2009-08-12 17:04:03 +0000 (Wed, 12 Aug 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-08-12 17:03:37 UTC (rev 413)
+++ trunk/ChangeLog 2009-08-12 17:04:03 UTC (rev 414)
@@ -1,3 +1,9 @@
+2009-08-12 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/gtk-sat-module-tmg.c:
+ Fixed bug 2836265: Time controls should wrap around their limits.
+
+
2009-08-09 Alexandru Csete <oz9aec at gmail.com>
* src/compat.[ch]:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-08-12 17:03:37 UTC (rev 413)
+++ trunk/NEWS 2009-08-12 17:04:03 UTC (rev 414)
@@ -1,7 +1,15 @@
Changes in version 1.1 (TBD)
+- New satellite selector in the module config dialog that makes it easier
+ to locate and select satellites.
+- User configuration on Unix is now stored in $HOME/.config/Gpredict/
+ The old configuration is imported automatically and one can still use
+ Gpredict 1.0 with the old configuration stored in $HOME/.gpredict2/
+- Distribution now includes all satellites from CelesTrak.
+* Added new Satellite Editor that allows adding/editing/deleting satellite
+ data in a convenient UI, includ
- Fixed bug 2116693: List view does not sort properly for all time formats.
-
+* Fixed bug 2836265: Time controls should wrap around their limits.
* Binary packages for Windows, Mac OS X, Ubuntu and generic Linux.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-23 16:34:41
|
Revision: 421
http://gpredict.svn.sourceforge.net/gpredict/?rev=421&view=rev
Author: csete
Date: 2009-08-23 16:34:15 +0000 (Sun, 23 Aug 2009)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-sat-selector.c
trunk/src/gtk-sat-selector.h
trunk/src/mod-cfg.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-08-23 15:02:04 UTC (rev 420)
+++ trunk/ChangeLog 2009-08-23 16:34:15 UTC (rev 421)
@@ -1,3 +1,9 @@
+2009-08-23 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/gtk-sat-selector.[ch]:
+ Added files with new satellite selector.
+
+
2009-08-12 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module-tmg.c:
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2009-08-23 15:02:04 UTC (rev 420)
+++ trunk/src/gtk-sat-selector.c 2009-08-23 16:34:15 UTC (rev 421)
@@ -35,7 +35,9 @@
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
+#include "sgpsdp/sgp4sdp4.h"
#include "sat-log.h"
+#include "gtk-sat-data.h"
#include "compat.h"
#include "gtk-sat-selector.h"
@@ -239,24 +241,90 @@
/** FIXME: flags not needed here */
static void create_and_fill_models (GtkSatSelector *selector)
{
- GtkTreeStore *store; /* the list store data structure */
+ GtkListStore *store; /* the list store data structure */
GtkTreeIter node; /* new top level node added to the tree store */
GDir *dir;
gchar *dirname;
+ sat_t sat;
+ gint catnum;
+
gchar *path;
gchar *nodename;
gchar **buffv;
const gchar *fname;
+
guint num = 0;
- /* load all satellites into solector->models[0] */
+ /* load all satellites into selector->models[0] */
+ store = gtk_list_store_new (GTK_SAT_SELECTOR_COL_NUM,
+ G_TYPE_STRING, // name
+ G_TYPE_INT, // catnum
+ G_TYPE_STRING // epoch
+ );
+ selector->models = g_slist_append (selector->models, store);
+ dirname = get_satdata_dir ();
+ dir = g_dir_open (dirname, 0, NULL);
+ if (!dir) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Failed to open satdata directory %s."),
+ __FILE__, __FUNCTION__, dirname);
+ g_free (dirname);
+
+ return;
+ }
+
+ /* Scan data directory for .tle files.
+ For each file scan through the file and
+ add entry to the tree.
+ */
+ while ((fname = g_dir_read_name (dir))) {
+
+ if (g_strrstr (fname, ".sat")) {
+
+ buffv = g_strsplit (fname, ".", 0);
+ catnum = (gint) g_ascii_strtoll (buffv[0], NULL, 0);
+
+ if (gtk_sat_data_read_sat (catnum, &sat)) {
+ /* error */
+ }
+ else {
+ /* read satellite */
+
+ gtk_list_store_append (store, &node);
+ gtk_list_store_set (store, &node,
+ GTK_SAT_SELECTOR_COL_NAME, sat.nickname,
+ GTK_SAT_SELECTOR_COL_CATNUM, catnum,
+ -1);
+
+ g_free (sat.name);
+ g_free (sat.nickname);
+ num++;
+ }
+
+ g_strfreev (buffv);
+ }
+ }
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s:%s: Read %d satellites into MAIN group."),
+ __FILE__, __FUNCTION__, num);
+
/* load satellites from each .cat file into selector->models[i] */
+ g_dir_rewind (dir);
+ while ((fname = g_dir_read_name (dir))) {
+ if (g_strrstr (fname, ".cat")) {
+ }
+ }
+
+ g_dir_close (dir);
+ g_free (dirname);
+
+
#if 0
/* create a new tree store */
store = gtk_tree_store_new (GTK_SAT_SELECTOR_COL_NUM,
Modified: trunk/src/gtk-sat-selector.h
===================================================================
--- trunk/src/gtk-sat-selector.h 2009-08-23 15:02:04 UTC (rev 420)
+++ trunk/src/gtk-sat-selector.h 2009-08-23 16:34:15 UTC (rev 421)
@@ -55,7 +55,7 @@
-#define GTK_SAT_SELECTOR_DEFAULT_FLAGS (GTK_SAT_SELECTOR_FLAG_NAME)
+#define GTK_SAT_SELECTOR_DEFAULT_FLAGS (GTK_SAT_SELECTOR_FLAG_NAME | GTK_SAT_SELECTOR_COL_CATNUM)
#define GTK_TYPE_SAT_SELECTOR (gtk_sat_selector_get_type ())
Modified: trunk/src/mod-cfg.c
===================================================================
--- trunk/src/mod-cfg.c 2009-08-23 15:02:04 UTC (rev 420)
+++ trunk/src/mod-cfg.c 2009-08-23 16:34:15 UTC (rev 421)
@@ -71,6 +71,8 @@
#include "mod-cfg.h"
+#include "gtk-sat-selector.h"
+
extern GtkWidget *app;
@@ -597,6 +599,8 @@
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), tree, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), gtk_sat_selector_new (0), TRUE, TRUE, 0);
+
gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
return dialog;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-09-18 15:52:51
|
Revision: 422
http://gpredict.svn.sourceforge.net/gpredict/?rev=422&view=rev
Author: csete
Date: 2009-09-18 15:52:41 +0000 (Fri, 18 Sep 2009)
Log Message:
-----------
Implemented group selector.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-sat-selector.c
trunk/src/gtk-sat-selector.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-08-23 16:34:15 UTC (rev 421)
+++ trunk/ChangeLog 2009-09-18 15:52:41 UTC (rev 422)
@@ -1,3 +1,9 @@
+2009-09-18 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/gtk-sat-selector.[ch]:
+ Implemented satellite group selector.
+
+
2009-08-23 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-selector.[ch]:
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2009-08-23 16:34:15 UTC (rev 421)
+++ trunk/src/gtk-sat-selector.c 2009-09-18 15:52:41 UTC (rev 422)
@@ -52,6 +52,8 @@
static void gtk_sat_selector_destroy (GtkObject *object);
static void create_and_fill_models (GtkSatSelector *selector);
+static void load_cat_file (GtkSatSelector *selector, const gchar *fname);
+static void group_selected_cb (GtkComboBox *combobox, gpointer data);
static gint compare_func (GtkTreeModel *model,
GtkTreeIter *a,
@@ -167,6 +169,15 @@
selector->flags = flags;
+ /* create group selector combo box (needed by create_and_fill_models()) */
+ GTK_SAT_SELECTOR (widget)->groups = gtk_combo_box_new_text ();
+ gtk_widget_set_tooltip_text (GTK_SAT_SELECTOR (widget)->groups,
+ _("Select a satellite group or category to narrow your search."));
+
+ /* combo box signal handler will be connected at the end after it has
+ been populated to avoid false triggering */
+
+
/* create list and model */
selector->tree = gtk_tree_view_new ();
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (selector->tree), TRUE);
@@ -185,6 +196,11 @@
GTK_SAT_SELECTOR_COL_NAME,
GTK_SORT_ASCENDING);
+ /* we can now connect combobox signal handler */
+ g_signal_connect (GTK_SAT_SELECTOR (widget)->groups, "changed",
+ group_selected_cb, widget);
+
+
/* create tree view columns */
/* label column */
renderer = gtk_cell_renderer_text_new ();
@@ -219,10 +235,13 @@
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (GTK_SAT_SELECTOR (widget)->swin),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+
gtk_container_add (GTK_CONTAINER (GTK_SAT_SELECTOR (widget)->swin),
GTK_SAT_SELECTOR (widget)->tree);
+
//gtk_container_add (GTK_CONTAINER (widget), GTK_SAT_TREE (widget)->swin);
+ gtk_box_pack_start (GTK_BOX (widget), GTK_SAT_SELECTOR (widget)->groups, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (widget), GTK_SAT_SELECTOR (widget)->swin, TRUE, TRUE, 0);
@@ -238,17 +257,35 @@
-/** FIXME: flags not needed here */
+/** \brief Create and fill data store models.
+ * \param selector Pointer to the GtkSatSelector widget
+ *
+ * this fuinction scan for satellite data and stores them in tree models
+ * that can be displayed in a tree view. The scan is performed in two iterations:
+ *
+ * (1) First, all .sat files are scanned, read and added to a pseudo-group called
+ * "all" satellites.
+ * (2) After the first scane, the function scans and reads .cat files and creates
+ * the groups accordingly.
+ *
+ * For each group (including the "all" group) and entry is added to the
+ * selector->groups GtkComboBox, where the index of the entry corresponds to
+ * the index of the group model in selector->models.
+ */
static void create_and_fill_models (GtkSatSelector *selector)
{
GtkListStore *store; /* the list store data structure */
GtkTreeIter node; /* new top level node added to the tree store */
GDir *dir;
+ GIOChannel *catfile;
+ GIOStatus status;
+ GError *error = NULL;
gchar *dirname;
sat_t sat;
gint catnum;
gchar *path;
+ gchar *buff;
gchar *nodename;
gchar **buffv;
const gchar *fname;
@@ -265,6 +302,8 @@
G_TYPE_STRING // epoch
);
selector->models = g_slist_append (selector->models, store);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (selector->groups), _("All satellites"));
+ gtk_combo_box_set_active (GTK_COMBO_BOX (selector->groups), 0);
dirname = get_satdata_dir ();
dir = g_dir_open (dirname, 0, NULL);
@@ -278,7 +317,7 @@
return;
}
- /* Scan data directory for .tle files.
+ /* Scan data directory for .sat files.
For each file scan through the file and
add entry to the tree.
*/
@@ -318,95 +357,117 @@
while ((fname = g_dir_read_name (dir))) {
if (g_strrstr (fname, ".cat")) {
+ load_cat_file (selector, fname);
+
}
}
g_dir_close (dir);
g_free (dirname);
+}
-#if 0
- /* create a new tree store */
- store = gtk_tree_store_new (GTK_SAT_SELECTOR_COL_NUM,
- G_TYPE_STRING, // name
- G_TYPE_INT, // catnum
- G_TYPE_STRING // epoch
- );
+/** \brief Load satellites from a .cat file
+ * \param selector Pointer to the GtkSatSelector
+ * \param fname The name of the .cat file (name only, no path)
+ *
+ * This function is used to encapsulate reading the clear text name and the contents
+ * of a .cat file. It is used for building the satellite tree store models
+ */
+static void load_cat_file (GtkSatSelector *selector, const gchar *fname)
+{
+ GIOChannel *catfile;
+ GError *error = NULL;
+ GtkListStore *store; /* the list store data structure */
+ GtkTreeIter node; /* new top level node added to the tree store */
- dirname = g_strconcat (g_get_home_dir (),
- G_DIR_SEPARATOR_S, ".gpredict2",
- G_DIR_SEPARATOR_S, "tle",
- NULL);
+ gchar *path;
+ gchar *buff;
+ sat_t sat;
+ gint catnum;
+ guint num = 0;
- /* debug message */
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d: Directory is: %s"),
- __FILE__, __LINE__, dirname);
-
- dir = g_dir_open (dirname, 0, NULL);
-
- /* no tle files */
- if (!dir) {
+ /* .cat files contains clear text category name in the first line
+ then one satellite catalog number per line */
+ path = sat_file_name (fname);
+ catfile = g_io_channel_new_file (path, "r", &error);
+ if (error != NULL) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: No .tle files found in %s."),
- __FILE__, __LINE__, dirname);
+ _("%s:%s: Failed to open %s: %s"),
+ __FILE__, __FUNCTION__, fname, error->message);
+ g_clear_error (&error);
+ }
+ else {
+ /* read first line => category name */
- g_free (dirname);
+ if (g_io_channel_read_line (catfile, &buff, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) {
+ g_strstrip (buff); /* removes trailing newline */
+ gtk_combo_box_append_text (GTK_COMBO_BOX (selector->groups), buff);
+ g_free (buff);
- return GTK_TREE_MODEL (store);;
- }
+ /* we can safely create the liststore for this category */
+ store = gtk_list_store_new (GTK_SAT_SELECTOR_COL_NUM,
+ G_TYPE_STRING, // name
+ G_TYPE_INT, // catnum
+ G_TYPE_STRING // epoch
+ );
+ selector->models = g_slist_append (selector->models, store);
- /* Scan data directory for .tle files.
- For each file scan through the file and
- add entry to the tree.
- */
- while ((fname = g_dir_read_name (dir))) {
- if (g_strrstr (fname, ".tle")) {
- buffv = g_strsplit (fname, ".tle", 0);
- nodename = g_strdup (buffv[0]);
- nodename[0] = g_ascii_toupper (nodename[0]);
+ /* Remaining lines are catalog numbers for satellites.
+ Read line by line until the first error, which hopefully is G_IO_STATUS_EOF
+ */
+ while (g_io_channel_read_line (catfile, &buff, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) {
- /* create a new top level node in the tree */
- gtk_tree_store_append (store, &node, NULL);
- gtk_tree_store_set (store, &node,
- GTK_SAT_SELECTOR_COL_NAME, nodename,
- -1);
+ /* stip trailing EOL */
+ g_strstrip (buff);
- /* build full path til file and sweep it for sats */
- path = g_strconcat (dirname, G_DIR_SEPARATOR_S,
- fname, NULL);
+ /* catalog number to integer */
+ catnum = (gint) g_ascii_strtoll (buff, NULL, 0);
- num = scan_tle_file (path, store, &node);
+ /* try to read satellite data */
+ if (gtk_sat_data_read_sat (catnum, &sat)) {
+ /* error */
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Error reading satellite %d."),
+ __FILE__, __FUNCTION__, catnum);
+ }
+ else {
+ /* insert satellite into liststore */
+ gtk_list_store_append (store, &node);
+ gtk_list_store_set (store, &node,
+ GTK_SAT_SELECTOR_COL_NAME, sat.nickname,
+ GTK_SAT_SELECTOR_COL_CATNUM, catnum,
+ -1);
+ g_free (sat.name);
+ g_free (sat.nickname);
+ num++;
+ }
- g_free (path);
- g_free (nodename);
- g_strfreev (buffv);
-
+ g_free (buff);
+ }
sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s:%d: Read %d sats from %s "),
- __FILE__, __LINE__, num, fname);
+ _("%s:%s: Read %d satellites from %s"),
+ __FILE__, __FUNCTION__, num, fname);
}
+ else {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Failed to read %s"),
+ __FILE__, __FUNCTION__, fname);
+ }
}
- g_dir_close (dir);
- g_free (dirname);
-#endif
-
-
+ g_free (path);
+ g_io_channel_shutdown (catfile, TRUE, NULL);
}
-
-
-
-
/** \brief Compare two rows of the GtkSatSelector.
* \param model The tree model of the GtkSatSelector.
* \param a The first row.
@@ -437,3 +498,27 @@
return ret;
}
+
+/** \brief Signal handler for managing satellite group selections.
+ * \param combobox The GtkcomboBox widget.
+ * \param data Pointer to the GtkSatSelector widget.
+ *
+ * This function is called when the user selects a new satellite group in the
+ * filter. The function is responsible for reloading the conctents of the satellite
+ * list according to the new selection. This task is very simple because the
+ * proper liststore has already been constructed and stored in selector->models[i]
+ * where i corresponds to the index of the newly selected group in the combo box.
+ */
+static void group_selected_cb (GtkComboBox *combobox, gpointer data)
+{
+ GtkSatSelector *selector = GTK_SAT_SELECTOR (data);
+ GtkTreeModel *model;
+ gint sel;
+
+ sel = gtk_combo_box_get_active (combobox);
+
+ model = GTK_TREE_MODEL (g_slist_nth_data (selector->models, sel));
+ gtk_tree_view_set_model (GTK_TREE_VIEW (selector->tree), model);
+ g_object_unref (model);
+
+}
Modified: trunk/src/gtk-sat-selector.h
===================================================================
--- trunk/src/gtk-sat-selector.h 2009-08-23 16:34:15 UTC (rev 421)
+++ trunk/src/gtk-sat-selector.h 2009-09-18 15:52:41 UTC (rev 422)
@@ -86,7 +86,8 @@
GSList *selection; /*!< List of selected satellites. FIXME: remove */
gulong handler_id; /*!< Toggle signale handler ID (FIXME): remove. */
- GSList *models;
+ GtkWidget *groups; /*!< Combo box for selecting satellite group. */
+ GSList *models; /*!< List of models with index corresponding to groups. */
};
struct _GtkSatSelectorClass
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-09-23 17:03:00
|
Revision: 423
http://gpredict.svn.sourceforge.net/gpredict/?rev=423&view=rev
Author: csete
Date: 2009-09-23 17:02:51 +0000 (Wed, 23 Sep 2009)
Log Message:
-----------
Implemeted custom sat-activated signal for GtkSatSelector.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-sat-selector.c
trunk/src/gtk-sat-selector.h
trunk/src/mod-cfg.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-09-18 15:52:41 UTC (rev 422)
+++ trunk/ChangeLog 2009-09-23 17:02:51 UTC (rev 423)
@@ -1,3 +1,14 @@
+2009-09-23 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/gtk-sat-selector.[ch]:
+ Changed EPOCH column type to G_TYPE_DOUBLE (consistent with sat_t).
+ Implemented "sat-activated" signal that is triggered when the user
+ double click on a satellite.
+
+ * src/mod-cfg.c:
+ Connect GtkSatSelector's new "sat-activated" signal to signal handler.
+
+
2009-09-18 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-selector.[ch]:
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2009-09-18 15:52:41 UTC (rev 422)
+++ trunk/src/gtk-sat-selector.c 2009-09-23 17:02:51 UTC (rev 423)
@@ -54,6 +54,10 @@
static void create_and_fill_models (GtkSatSelector *selector);
static void load_cat_file (GtkSatSelector *selector, const gchar *fname);
static void group_selected_cb (GtkComboBox *combobox, gpointer data);
+static void row_activated_cb (GtkTreeView *view,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer data);
static gint compare_func (GtkTreeModel *model,
GtkTreeIter *a,
@@ -63,6 +67,16 @@
static GtkVBoxClass *parent_class = NULL;
+/** \brief GtkSatSelector signal IDs */
+enum {
+ SAT_ACTIVATED_SIGNAL, /*!< "sat-activated" signal */
+ LAST_SIGNAL
+};
+
+/** \brief GtkSatSelector specific signals. */
+static guint gtksatsel_signals[LAST_SIGNAL] = { 0 };
+
+
GType gtk_sat_selector_get_type ()
{
static GType gtk_sat_selector_type = 0;
@@ -108,6 +122,17 @@
object_class->destroy = gtk_sat_selector_destroy;
+ /* create GtkSatSelector specific signals */
+ gtksatsel_signals[SAT_ACTIVATED_SIGNAL] =
+ g_signal_new ("sat-activated",
+ G_TYPE_FROM_CLASS (class),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkSatSelectorClass,gtksatselector),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE,
+ 0);
}
@@ -198,7 +223,7 @@
/* we can now connect combobox signal handler */
g_signal_connect (GTK_SAT_SELECTOR (widget)->groups, "changed",
- group_selected_cb, widget);
+ G_CALLBACK(group_selected_cb), widget);
/* create tree view columns */
@@ -229,6 +254,10 @@
if (!(flags & GTK_SAT_SELECTOR_FLAG_EPOCH))
gtk_tree_view_column_set_visible (column, FALSE);
+ /* "row-activated" signal is used to catch double click events, which means
+ a satellite has been selected. This propagates to the TBD GtkSatSelector signal */
+ g_signal_connect (selector->tree, "row-activated",
+ G_CALLBACK(row_activated_cb), selector);
/* scrolled window */
GTK_SAT_SELECTOR (widget)->swin = gtk_scrolled_window_new (NULL, NULL);
@@ -299,7 +328,7 @@
store = gtk_list_store_new (GTK_SAT_SELECTOR_COL_NUM,
G_TYPE_STRING, // name
G_TYPE_INT, // catnum
- G_TYPE_STRING // epoch
+ G_TYPE_DOUBLE // epoch
);
selector->models = g_slist_append (selector->models, store);
gtk_combo_box_append_text (GTK_COMBO_BOX (selector->groups), _("All satellites"));
@@ -368,6 +397,7 @@
}
+
/** \brief Load satellites from a .cat file
* \param selector Pointer to the GtkSatSelector
* \param fname The name of the .cat file (name only, no path)
@@ -522,3 +552,74 @@
g_object_unref (model);
}
+
+
+/** \brief Signal handler for managing satellite selection.
+ * \param view Pointer to the GtkTreeView object.
+ * \param path The path of the row that was activated.
+ * \param column The column where the activation occured.
+ * \param data Pointer to the GtkSatselector widget.
+ *
+ * This function is called when the user double clicks on a satellite in the
+ * satellite selector. It is used to trigger the "sat-activated" signal of
+ * the GtkSatSelector widget.
+ */
+static void row_activated_cb (GtkTreeView *view, GtkTreePath *path,
+ GtkTreeViewColumn *column, gpointer data)
+{
+ GtkSatSelector *selector = GTK_SAT_SELECTOR (data);
+
+ /* emit the "sat-activated" signal for the GtkSatSelector */
+ g_signal_emit (G_OBJECT (selector), gtksatsel_signals[SAT_ACTIVATED_SIGNAL], 0);
+
+}
+
+
+/** \brief Get information about the selected satellite.
+ * \param selector Pointer to the GtkSatSelector widget.
+ * \param catnum Location where catnum will be stored (may be NULL).
+ * \param satname Location where the satellite name will be stored. May NOT be NULL. Must be g_freed after use.
+ * \param epoch Location where the satellite Epoch will be stored (may be NULL);
+ *
+ * This function can be used to retrieve information about the currently selected satellite
+ * a GtkSatSelector widget, e.g. after the "sat-activated" signal has been emitted.
+ */
+void gtk_sat_selector_get_selected (GtkSatSelector *selector,
+ gint *catnum, gchar **satname, gdouble *epoch)
+{
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gboolean haveselection = FALSE; /* this flag is set to TRUE if there is a selection */
+ gchar *l_satname; /* nickname of the selected satellite */
+ gint l_catnum; /* catalog number of the selected satellite */
+ gdouble l_epoch; /* TLE epoch of the selected satellite */
+
+ /* selector can not be NULL */
+ g_return_if_fail ((selector != NULL) && (satname != NULL));
+
+ /* get the selected row in the treeview */
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (selector->tree));
+ haveselection = gtk_tree_selection_get_selected (selection, &model, &iter);
+
+ if (haveselection) {
+ /* get the name and catalog number of the selected saetllite */
+ gtk_tree_model_get (model, &iter,
+ GTK_SAT_SELECTOR_COL_NAME, &l_satname,
+ GTK_SAT_SELECTOR_COL_CATNUM, &l_catnum,
+ GTK_SAT_SELECTOR_COL_EPOCH, &l_epoch,
+ -1);
+
+ if (catnum != NULL)
+ *catnum = l_catnum;
+
+ *satname = g_strdup (l_satname);
+
+ if (epoch != NULL)
+ *epoch = l_epoch;
+
+ g_free (l_satname);
+ }
+
+}
+
Modified: trunk/src/gtk-sat-selector.h
===================================================================
--- trunk/src/gtk-sat-selector.h 2009-09-18 15:52:41 UTC (rev 422)
+++ trunk/src/gtk-sat-selector.h 2009-09-23 17:02:51 UTC (rev 423)
@@ -11,17 +11,17 @@
More details can be found at the project home page:
http://gpredict.oz9aec.net/
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, visit http://www.fsf.org/
*/
@@ -39,18 +39,18 @@
/** \brief Column definitions in the tree. */
typedef enum {
- GTK_SAT_SELECTOR_COL_NAME = 0, /*!< Satellite name. */
- GTK_SAT_SELECTOR_COL_CATNUM, /*!< Catalogue Number. */
- GTK_SAT_SELECTOR_COL_EPOCH, /*!< Element set epoch. */
- GTK_SAT_SELECTOR_COL_NUM /*!< The number of columns. */
+ GTK_SAT_SELECTOR_COL_NAME = 0, /*!< Satellite name. */
+ GTK_SAT_SELECTOR_COL_CATNUM, /*!< Catalogue Number. */
+ GTK_SAT_SELECTOR_COL_EPOCH, /*!< Element set epoch. */
+ GTK_SAT_SELECTOR_COL_NUM /*!< The number of columns. */
} gtk_sat_selector_col_t;
-
+
/** \brief Flags used to indicate which columns should be visible. */
typedef enum {
- GTK_SAT_SELECTOR_FLAG_NAME = 1 << GTK_SAT_SELECTOR_COL_NAME, /*!< Satellite name. */
- GTK_SAT_SELECTOR_FLAG_CATNUM = 1 << GTK_SAT_SELECTOR_COL_CATNUM, /*!< Catalogue Number. */
- GTK_SAT_SELECTOR_FLAG_EPOCH = 1 << GTK_SAT_SELECTOR_COL_EPOCH, /*!< Element set epoch. */
+ GTK_SAT_SELECTOR_FLAG_NAME = 1 << GTK_SAT_SELECTOR_COL_NAME, /*!< Satellite name. */
+ GTK_SAT_SELECTOR_FLAG_CATNUM = 1 << GTK_SAT_SELECTOR_COL_CATNUM, /*!< Catalogue Number. */
+ GTK_SAT_SELECTOR_FLAG_EPOCH = 1 << GTK_SAT_SELECTOR_COL_EPOCH, /*!< Element set epoch. */
} gtk_sat_selector_flag_t;
@@ -78,29 +78,30 @@
/** \brief The GtkSatSelector Structure definition */
struct _gtk_sat_selector
{
- GtkVBox vbox;
+ GtkVBox vbox;
- GtkWidget *tree; /*!< The tree. */
- GtkWidget *swin; /*!< Scrolled window. */
- guint flags; /*!< Column visibility flags. */
- GSList *selection; /*!< List of selected satellites. FIXME: remove */
- gulong handler_id; /*!< Toggle signale handler ID (FIXME): remove. */
+ GtkWidget *tree; /*!< The tree. */
+ GtkWidget *swin; /*!< Scrolled window. */
+ guint flags; /*!< Column visibility flags. */
+ GSList *selection; /*!< List of selected satellites. FIXME: remove */
+ gulong handler_id; /*!< Toggle signale handler ID (FIXME): remove. */
- GtkWidget *groups; /*!< Combo box for selecting satellite group. */
- GSList *models; /*!< List of models with index corresponding to groups. */
+ GtkWidget *groups; /*!< Combo box for selecting satellite group. */
+ GSList *models; /*!< List of models with index corresponding to groups. */
};
struct _GtkSatSelectorClass
{
- GtkVBoxClass parent_class;
+ GtkVBoxClass parent_class;
+
+ void (* gtksatselector) (GtkSatSelector *sel);
};
GtkType gtk_sat_selector_get_type (void);
GtkWidget *gtk_sat_selector_new (guint flags);
guint32 gtk_sat_selector_get_flags (GtkSatSelector *selector);
-//void gtk_sat_selector_select (GtkSatTree *sat_tree, guint catnum);
-guint *gtk_sat_selector_get_selected (GtkSatSelector *selector, gsize *size);
+void gtk_sat_selector_get_selected (GtkSatSelector *selector, gint *catnum, gchar **satname, gdouble *epoch);
#ifdef __cplusplus
}
Modified: trunk/src/mod-cfg.c
===================================================================
--- trunk/src/mod-cfg.c 2009-09-18 15:52:41 UTC (rev 422)
+++ trunk/src/mod-cfg.c 2009-09-23 17:02:51 UTC (rev 423)
@@ -95,7 +95,9 @@
static void edit_advanced_settings (GtkDialog *parent, GKeyFile *cfgdata);
+static void sat_activated_cb (GtkSatSelector *selector, gpointer data);
+
/** \brief Create a new module.
*
* This function creates a new module. The name of the module is
@@ -246,8 +248,7 @@
* mod_cfg_save function.
*
*/
-mod_cfg_status_t
- mod_cfg_edit (gchar *modname, GKeyFile *cfgdata, GtkWidget *toplevel)
+mod_cfg_status_t mod_cfg_edit (gchar *modname, GKeyFile *cfgdata, GtkWidget *toplevel)
{
GtkWidget *dialog;
gint response;
@@ -449,8 +450,7 @@
-static GtkWidget *
- mod_cfg_editor_create (const gchar *modname, GKeyFile *cfgdata, GtkWidget *toplevel)
+static GtkWidget *mod_cfg_editor_create (const gchar *modname, GKeyFile *cfgdata, GtkWidget *toplevel)
{
GtkWidget *dialog;
GtkWidget *add;
@@ -599,8 +599,13 @@
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), tree, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), gtk_sat_selector_new (0), TRUE, TRUE, 0);
+ /*** EXPERIMENTAL CODE ***/
+ GtkWidget *selector = gtk_sat_selector_new (0);
+ g_signal_connect (selector, "sat-activated",
+ G_CALLBACK (sat_activated_cb), NULL);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), selector, TRUE, TRUE, 0);
+
gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
return dialog;
@@ -935,3 +940,29 @@
/* g_key_file_free (data); */
}
}
+
+
+
+/** \brief Signal handkler for "sat-activated" signals from the GtkSatSelector.
+ * \param selector Pointer to the GtkSatSelector widget.
+ * \param data Pointer to the TBD ...
+ *
+ * This function is called when the user has selected (i.e. double clicked) a satellite
+ * in the GtkSatSelector.
+ */
+static void sat_activated_cb (GtkSatSelector *selector, gpointer data)
+{
+ gchar *satname;
+ gint catnum;
+ gdouble epoch;
+
+ /*** FIXME: Change callback to include catnum into callback (for other uses */
+
+ gtk_sat_selector_get_selected (selector, &catnum, &satname, &epoch);
+
+ g_print ("===> %s (%d) updated at %.4f\n", satname, catnum, epoch);
+
+ /* Add satellite to selected list */
+
+ g_free (satname);
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-09-25 13:04:37
|
Revision: 434
http://gpredict.svn.sourceforge.net/gpredict/?rev=434&view=rev
Author: csete
Date: 2009-09-25 13:04:29 +0000 (Fri, 25 Sep 2009)
Log Message:
-----------
Finished implementation of the slider. It allows dragging of the time +/- 5 hours with a resolution of 8 seconds. It is complementary to the spin buttons.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/src/gtk-sat-module-tmg.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-09-25 10:47:21 UTC (rev 433)
+++ trunk/ChangeLog 2009-09-25 13:04:29 UTC (rev 434)
@@ -1,11 +1,20 @@
+2009-09-25 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/gtk-sat-module-tmg.c:
+ Finished implementation of the slider. It allows dragging of the time
+ +/- 5 hours with a resolution of 8 seconds. It is complementary to the
+ spin buttons.
+
+
2009-09-24 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-selector.c:
- Fixed a bug that caused tree models to be deleted when selecting a new satellite group.
+ Fixed a bug that caused tree models to be deleted when selecting a new
+ satellite group.
* src/mod-cfg.c:
- Added list of selected satellites and arrow buttons. New satellite selector is now fully
- functional and replaces GtkSatTree.
+ Added list of selected satellites and arrow buttons. New satellite selector
+ is now fully functional and replaces GtkSatTree.
* src/gtk-sat-tree.[ch]:
Removed from build list.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-09-25 10:47:21 UTC (rev 433)
+++ trunk/NEWS 2009-09-25 13:04:29 UTC (rev 434)
@@ -1,15 +1,16 @@
Changes in version 1.1 (TBD)
-- New satellite selector in the module config dialog that makes it easier
- to locate and select satellites.
+- New satellite selector in the module configuration dialog that makes
+ it easier to locate and select satellites.
- User configuration on Unix is now stored in $HOME/.config/Gpredict/
The old configuration is imported automatically and one can still use
Gpredict 1.0 with the old configuration stored in $HOME/.gpredict2/
- Distribution now includes all satellites from CelesTrak.
* Added new Satellite Editor that allows adding/editing/deleting satellite
- data in a convenient UI, includ
+ data in a convenient UI, including...
+- Added a slider control to the Time Controller.
- Fixed bug 2116693: List view does not sort properly for all time formats.
-* Fixed bug 2836265: Time controls should wrap around their limits.
+- Fixed bug 2836265: Time controls should wrap around their limits.
* Binary packages for Windows, Mac OS X, Ubuntu and generic Linux.
Modified: trunk/src/gtk-sat-module-tmg.c
===================================================================
--- trunk/src/gtk-sat-module-tmg.c 2009-09-25 10:47:21 UTC (rev 433)
+++ trunk/src/gtk-sat-module-tmg.c 2009-09-25 13:04:29 UTC (rev 434)
@@ -46,6 +46,7 @@
static void tmg_reset (GtkWidget *widget, gpointer data);
static void tmg_throttle (GtkWidget *widget, gpointer data);
static void tmg_time_set (GtkWidget *widget, gpointer data);
+static void slider_moved (GtkWidget *widget, gpointer data);
static void tmg_hour_wrap (GtkWidget *widget, gpointer data);
static void tmg_min_wrap (GtkWidget *widget, gpointer data);
static void tmg_sec_wrap (GtkWidget *widget, gpointer data);
@@ -264,9 +265,14 @@
2, 3, 4, 5, GTK_SHRINK, GTK_SHRINK, 0, 0);
/* add slider */
- mod->tmgSlider = gtk_hscale_new_with_range (-1.0, +1.0, 0.005);
+ mod->tmgSlider = gtk_hscale_new_with_range (-0.208, +0.208, 0.0001); // +/- 5 hr
+ gtk_widget_set_tooltip_text (mod->tmgSlider,
+ _("Drag the slider to change the time up to +/- 5 hours.\n"\
+ "Resolution is ~ 8 seconds."));
gtk_scale_set_draw_value (GTK_SCALE (mod->tmgSlider), FALSE);
gtk_range_set_value (GTK_RANGE (mod->tmgSlider), 0.0);
+ g_signal_connect (mod->tmgSlider, "value-changed",
+ G_CALLBACK (slider_moved), mod);
/* create the vertical box */
@@ -430,6 +436,9 @@
mod->tmgPdnum = mod->rtPrev;
mod->tmgCdnum = mod->rtNow;
+ /* RESET slider */
+ gtk_range_set_value (GTK_RANGE (mod->tmgSlider), 0.0);
+
/* update widgets; widget signals will have no effect
since the tmgReset flag is TRUE */
tmg_update_widgets (mod);
@@ -471,6 +480,7 @@
guint year, month, day;
gint hr, min, sec, msec;
struct tm tim,utim;
+ gdouble slider;
gdouble jd;
@@ -515,11 +525,36 @@
jd = jd + (gdouble)msec/8.64e+7;
- mod->tmgCdnum = jd;
+ /* get slider offset */
+ slider = gtk_range_get_value (GTK_RANGE (mod->tmgSlider));
+
+ mod->tmgCdnum = jd + slider;
}
}
+/** \brief Signal handler for slider "value-changed" signals
+ * \param widget The widget that was modified.
+ * \param data Pointer to the GtkSatModule structure.
+ *
+ * This function is called when the user moves the slider.
+ * If we are in manual control mode, the function simpley calls
+ * tmg_time_set(). In the other modes, the function switches over
+ * to amnual mode first.
+ */
+static void slider_moved (GtkWidget *widget, gpointer data)
+{
+ GtkSatModule *mod = GTK_SAT_MODULE (data);
+
+ if (mod->throttle) {
+ /* "press" the stop button to trigger a transition into manual mode */
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mod->tmgStop), TRUE);
+ }
+
+ tmg_time_set (widget, data);
+}
+
+
/** \brief Hour controller wrap
* \param widget Pointer to the hour controller widget
* \param data Pointer to the GtkSatModule structure.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X