[SCM] savi branch, master, updated. 9a17d710bc6c7ec49319343238f522166d000c3c
YunQiang Su
wzssyqa at gmail.com
Mon Jul 29 13:49:02 UTC 2013
The following commit has been merged in the master branch:
commit a836271e1e445e42e3d580d936d24181482fb198
Author: YunQiang Su <wzssyqa at gmail.com>
Date: Mon Jul 29 19:30:43 2013 +0800
Imported Upstream version 1.4.6
diff --git a/.geomview b/.geomview
new file mode 100644
index 0000000..873cc5e
--- /dev/null
+++ b/.geomview
@@ -0,0 +1 @@
+(emodule-define "SaVi" "./savi -geomview")
diff --git a/BUGS b/BUGS
index 68d05c5..548ef4b 100644
--- a/BUGS
+++ b/BUGS
@@ -1,6 +1,6 @@
BUGS recognized in SaVi
=======================
-$Id: BUGS,v 1.163 2011/04/27 09:04:31 lloydwood Exp $
+$Id: BUGS,v 1.182 2013/05/12 05:00:43 lloydwood Exp $
This list of BUGS describes caveats and problems with use of the SaVi
satellite visualization software. This document contains the following
@@ -8,10 +8,18 @@ sections:
1. Caveats in use of SaVi. Be aware of these.
-2. Caveats for Mac OS X users only.
- a. Mac compilation hints
- b. 10.5 (Leopard)-specific issues
- c. Other minor Mac-specific issues
+2. Platform-specific issues.
+ a. Mac OS X
+ i. Mac compilation hints
+ -- for SaVi
+ -- for Geomview
+ ii. 10.5 (Leopard)-specific issues
+ -- for SaVi
+ -- for Geomview
+ iii. Other minor Mac-specific issues
+ -- for SaVi
+ -- for Geomview
+ b. Cygwin on Microsoft Windows
3. A detailed SaVi wishlist. Notes on issues in these SaVi releases.
a. Coding and build issues
@@ -51,15 +59,6 @@ Improving this would make SaVi much more practical.
(Sidereal time and the Earth's motion around the sun is not
simulated; noted by Tom Tessier.)
-Using sinusoidal coverage map, full coverage reads from 99.6% to 99.8%
-due to rounding at curved edges of map. Coverage calculations for all
-projections are estimates at best, and are limited to not exceed
-the 100% threshold. Calculations should really reflect degree of
-coverage overlap and be consistent across all views. See
-Kantsiper and Weiss, An Analytic Approach to Calculating Earth
-Coverage, AAS 97-620, while they were at MIT, for an analytical
-integration approach using the inclusion/exclusion principle.
-
Selection: selected satellite is not visible as selected in Geomview
until a marker type is first selected or satellite orbital elements
are edited. Operations on multiple satellites (e.g. Cut) only work
@@ -67,15 +66,33 @@ on the last satellite selected.
-2. CAVEATS FOR MAC OS X USERS ONLY
-==================================
+2. PLATFORM-SPECIFIC ISSUES
+===========================
+
+a. MAC OS X
+
+i. Mac compilation hints
-a. Mac compilation hints
+-- for SaVi
SaVi and Geomview need Xcode (included in Developer Tools with the
Mac OS X system installer copy, or downloadable from Apple) to provide
the tools that can compile these and other programs.
+As of Mac OS X 10.7, Xcode is now an app available from the Mac App
+Store. As well as downloading and installing the Xcode app, it is
+necessary to explicitly enable command line tools so that e.g. gcc
+is available. The command line tools must be selected in:
+Xcode > Preferences > Downloads > Components > Command Line Tools
+
+The Tcl/Tk libraries shipped with Mac OS X releases have some
+user-interface problems. It is possible to install a later
+ActiveTcl release and then choose to build with that instead;
+to do so, uncomment the TCL_LIBS = line in src/Makefile_defs_macosx
+before compiling savi with make ARCH=macosx.
+
+-- for Geomview
+
To build Geomview on Mac OS X, you must first install a Motif clone
such as Lesstif (available via www.geomview.org's Downloads section.)
In Lesstif's directory you will need to
@@ -101,14 +118,10 @@ and then optionally to make Geomview available from the command line
everywhere:
sudo make install
-The Tcl/Tk libraries shipped with Mac OS X releases have some
-user-interface problems. It is possible to install a later
-ActiveTcl release and then choose to build with that instead;
-to do so, uncomment the TCL_LIBS = line in src/Makefile_defs_macosx.
-
+ii. 10.5 (Leopard)-specific issues
-b. 10.5 (Leopard)-specific issues
+-- for SaVi
The Tk 8.4.7 supplied with Mac OS X 10.5 (Leopard) has problems
displaying SaVi's menubar.
@@ -123,30 +136,51 @@ The ./savi launch script attempts to detect 10.5, and adds the
This avoids having to add the parameter at the command line each
time SaVi is launched.
-In 10.5 (Leopard), if make fails to link at end with a 'cycle in dylib
-re-exports with /usr/X11/lib/libGL.dylib' error, use the following
-single-line, no-breaks command:
+Installing ActiveTcl, uncommenting the TCL_LIBS line before compiling,
+as described above, and removing the -redrawn-menus flag from the
+./savi launch script is another way to work around the menu
+problems of the Tk supplied with 10.5.
+
+-- for Geomview
+
+If doing make of Geomview fails to link at end with a
+'cycle in dylib re-exports with /usr/X11/lib/libGL.dylib'
+error, use the following single-line, no-breaks command:
export LDFLAGS="-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
then repeat the previous instructions. This problem is caused by a
linking bug in Leopard.
+iii. Other minor Mac-specific issues
-c. Other minor Mac-specific issues
+-- for SaVi
- Menu shortcuts are disabled on the Mac unless -redrawn-menus is
used. This is to prevent a freeze on using a keypress to open
- a window (seen in 10.6 with Tk 8.5.7).
+ a window (seen in 10.6 with Tk 8.5.7). 10.7 is unaffected,
+ and shortcuts can be enabled by editing disable_mac in tcl/utils.tcl.
- On compilation, two binaries are produced: bin/SaVi-macosx.bin and
bin/SaVi. Tiger and Snow Leopard users can delete bin/SaVi-macosx.bin
to get just 'SaVi' in the menubar as the application name.
+- Under the Tcl/Tk supplied with 10.5, coverage colour buttons are
+ only fully coloured when another application is frontmost.
+- Under the Tcl/Tk supplied with 10.6, menu highlight colours are
+ incorrect; highlighted text remains black.
+
+-- for Geomview
+
- With X11 rendering, Geomview does not appear to be able to control
its background colour, which is always grey. OpenGL rendering is
fine.
-- Under 10.5, coverage colour buttons are only fully coloured when another
- application is frontmost.
-- Under 10.6, menu highlight colours are incorrect; highlighted text
- remains black.
+
+
+b. CYGWIN ON MICROSOFT WINDOWS
+
+Tk issues have appeared with the migration from Insight Tcl/Tk 8.4
+to a more Unix-like Tcl/Tk 8.5.
+
+When expanding the coverage window to show a tiled coverage map, there
+is now a line of pixels where coverage is not drawn on the background.
@@ -169,6 +203,11 @@ experience and the spare time and interest. Others are difficult.
a. CODING AND BUILD ISSUES
+- make install is needed. That should probably match the current debian
+ package. Early creation of it may have been able to prevent the previous
+ package problems caused by maintainers unfamiliar with the savi tree,
+ described below.
+
- The savi-1.4.3 package available from getdeb.net from December 2009 onward
(and available in Ubuntu's Synaptic package manager) removed the
textfiles and manual from SaVi. This package installed SaVi under
@@ -283,6 +322,8 @@ needs more work.
at end is drawn below the bottom of a 1024x768 screen, which
is a problem if you can't move windows from available edges.
Reaching the coverage angle options also becomes tricky.
+ Clicking and dragging the map sideways to shift the view would
+ be cool - esa's Space Trajectory Analysis v3.0 does this.
* Edit satellite:
Dialog layout can be improved, with better alignment of captions,
@@ -314,7 +355,7 @@ A couple of pixels of west Mexican coastline are missing from the
Provide menu of colour choices for highlights etc.
It's possible to type into the help menu text windows. That should be
-prevented.
+prevented. But that is not simple in Tk: http://wiki.tcl.tk/1152
@@ -323,6 +364,23 @@ e. COVERAGE VIEW IMPROVEMENTS
Now that we have satellite names, an option to show them in the
coverage view would be useful.
+Blue diversity colours could be masked onto black areas of the
+map as coverage colours suitable for the ocean. Add maps
+where the oceans are blacked out/marked in another colour requiring
+a different four-colour filetype, and an option to have 'Ocean
+Blue', which hides/changes decay colour boxes. Could also do
+blending with the detailed earth map, but that means uncompressing
+it and blending on a pixel-by-pixel basis, or setting alpha
+transparency in Geomview for a coverage sphere over the earth sphere.
+
+Decay/sunlight options are really mutually exclusive, and could
+be done via a popup menu that could also include the 'diversity
+shades used over black ocean' option discussed above:
+Diversity
+Diversity and decay
+Diversity and sunlight
+Diversity and sea
+
As well as allowing coverage angles to be set per satellite, having
multiple fooprints per satellite at set elevation angles (5 degrees,
10 degrees) would be very useful. Either approach could be used
@@ -348,10 +406,25 @@ Look at drawing SaVi logo on coverage maps - this makes most sense
in corners of spherical and sinusoidal maps, but area used would
need to be discounted from coverage calculations
+The coverage slider position should be updated when a script
+loaded from the menu changes the coverage angle.
+
Longitude calculation for spherical fisheye clicks are inaccurate.
Edge calculation methods have visible differences (as does
sinusoidal). Area calculation hasn't been attempted; calculations
of areas in general for all projections are poor estimates anyway.
+Using sinusoidal coverage map, full coverage reads from 99.6% to 99.8%
+due to rounding at curved edges of map. Coverage calculations for all
+projections are estimates at best, reflect the map projection in use
+by changing with latitude, and are limited to not exceed
+the 100% threshold. Calculations should really reflect degree of
+coverage overlap and be consistent across all views. See
+Kantsiper and Weiss, An Analytic Approach to Calculating Earth
+Coverage, AAS 97-620, while they were at MIT, for an analytical
+integration approach using the inclusion/exclusion principle.
+Calculating amount of coverage overlap for 1/2/3 etc. satellites
+is possible by counting pixels, but still depends on choice of
+projection and latitude of satellite.
When choosing new colour shades after animating forwards then
stopping, the satellites move on an interval unexpectedly as
@@ -436,9 +509,18 @@ Look at altering sleep code to give longer sleeps when Geomview
is running and animating, so that more CPU time is devoted to
Geomview and overall performance is made more responsive.
+Being able to control and program camera position, to e.g. show
+exactly what a satellite sees at nadir as the satellite moves,
+would be very useful to have.
+
Geomview's light source positioning appears to be buggy at present,
as shown by savi -geomview -sun-lighting.
+Quitting SaVi as a Geomview module can leave the blue Earth sphere
+behind. This was identified as a bug in Geomview exposed by chosen
+-O3 optimisation when building, which vanishes when -O2 is chosen -
+see the January 2012 geomview-users archives.
+
With Geomview 1.8.1, the large list structures used in writing
footprints and cones cause complaints about not being able to 'seek
back far enough in pipe.' This is related to how piping is handled,
@@ -582,7 +664,7 @@ rather than { : numesh_h } in oogl/earth.oogl, which means at least
Geomview 1.9.0 for support. They're large, even once run through
jpegtopnm and compressed, so would have to be optional.
-A way of drawing coverage on a translucenT sphere just over the
+A way of drawing coverage on a translucent sphere just over the
planet map (but just under e.g. the Earth boundary vectors) would
be useful, so that colourful maps could be combined with coverage
and diversity. But this needs alpha rendering support; easier to
diff --git a/COPYRIGHT b/COPYRIGHT
index 8ae82fe..2b74ba6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
COPYRIGHT for SaVi
==================
-$Id: COPYRIGHT,v 1.17 2011/02/14 21:03:46 lloydwood Exp $
+$Id: COPYRIGHT,v 1.20 2013/05/05 05:19:25 lloydwood Exp $
This contains:
@@ -15,8 +15,8 @@ This contains:
Enhancements to and modifications of SaVi 1.0, expressed in the
SaVi 1.2, 1.3 and 1.4 releases, are:
-Copyright (c) 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010, 2011 Lloyd Wood.
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006
+2007, 2008, 2009, 2010, 2011, 2012, 2013 Lloyd Wood.
Lloyd Wood maintains SaVi, and welcomes bug reports and fixes from
users. Contact Lloyd at: lloydwood at users.sourceforge.net.
@@ -24,9 +24,12 @@ users. Contact Lloyd at: lloydwood at users.sourceforge.net.
SaVi continues to be provided "as is", and no warranty or guarantee of
fitness for use is expressed or implied.
-Use of SaVi images should credit SaVi. A suggested reference is:
-L. Wood, P. Worfolk et al., SaVi - Satellite constellation
-Visualisation software, http://savi.sf.net/, 2011.
+Use of SaVi images should credit SaVi. Suggested references are:
+- L. Wood, SaVi: satellite constellation visualization,
+ First Annual CCSR Research Symposium (CRS 2011),
+ Centre for Communication Systems Research, 30 June 2011.
+- L. Wood, P. Worfolk et al., SaVi - Satellite constellation
+ Visualisation software, http://savi.sf.net/, 2011.
diff --git a/PACKAGING b/PACKAGING
index 5d8ee45..5310561 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -1,6 +1,6 @@
PACKAGING SaVi FOR RELEASES AND BINARY DISTRIBUTION
==================================================
-$Id: PACKAGING,v 1.11 2011/04/27 21:51:11 lloydwood Exp $
+$Id: PACKAGING,v 1.13 2013/04/26 04:54:16 lloydwood Exp $
1. Packaging SaVi for binary distribution
2. Packaging SaVi for releases
@@ -15,8 +15,7 @@ Please go ahead. I hope that the following notes will be helpful.
If these notes could be improved, please let me know.
SaVi requires Tcl and Tk as package dependencies. The makefiles and
-savi launch script expect 8.5 (except for Cygwin, where Insight Tcl is
-still at 8.4), but any version of 8.x can be compiled with.
+savi launch script expect 8.5, but any version of 8.x can be compiled with.
You will want to compile SaVi with zlib (steps are detailed in
README-COVERAGE-TEXTUREMAP) and have zlib as an additional package dependency.
Once you have compiled SaVi, check that the SaVi help menu's 'About SaVi...'
@@ -43,8 +42,8 @@ names, with the more recent build overwriting bin/SaVi. (SaVi can't make
assumptions about the availability of symlinks, and creating bin/SaVi
supports src/Makefile_defs_anything and 'make ARCH=anything'.) If packaging
for one binary platform, you can delete one executable to save space.
-On a Mac, keeping bin/SaVi is preferred, as the executable name is shown in
-the menubar as the application name.
+On Mac OS X, keeping bin/SaVi is preferred, as the executable name is shown
+in the menubar as the application name.
To create a 64-bit package, you could 'make ARCH=x86_64' (or just make)
on a 64-bit linux system -- but the savi launch script will give an
@@ -59,7 +58,7 @@ defaulting to 32-bit appears safest.
==============================
This is an aide-memoire for the SaVi maintainers when preparing development
-for release. Don't package on a Mac, to avoid invisible files.
+for release. Don't package on Mac OS X, to avoid invisible files.
If repackaging to fix a packaging problem with version a/b/c,
include a RELEASE-NOTE file indicating changes. Do not change VERSION.
@@ -83,12 +82,12 @@ j. touch -t all directories with a suitable timestamp, starting with
src/include, ending with savi1.4.X. Also touch configure and VERSION.
k. Create tarball (tar cvf savi1.4.X-release.tar savi1.4.X), touch, gzip -9.
l. tar xvfz elsewhere and build to check all works.
-m. Mark CVS HEAD with cvs tag savi_1_4_X.
-n. Pull copy of savi-dev/ from CVS for further work.
-o. Put tarball on sourceforge, local webpages. Remember freshmeat!
-p. Announce on mailing lists etc.
+m. Pull copy of savi-dev/ from CVS and build for further work.
+n. Put tarball on sourceforge, local webpages. Remember freshcode!
+o. Announce on mailing lists etc.
+
Lloyd Wood
lloydwood at users.sourceforge.net
-April 2011
+last updated April 2013
diff --git a/README b/README
index f268c72..c9523ba 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
README for SaVi distribution
============================
-$Id: README,v 1.100 2011/04/30 19:57:16 lloydwood Exp $
+$Id: README,v 1.106 2013/05/12 05:20:21 lloydwood Exp $
This README supplied with the SaVi satellite visualization software
contains the following sections:
@@ -60,7 +60,7 @@ to the savi-users mailing list.
The original authors could be contacted at: savi at geom.umn.edu.
SaVi is originally Copyright (c) 1995-1997 by The Geometry Center.
-SaVi is also Copyright (c) 2001-2011 by Lloyd Wood.
+SaVi is also Copyright (c) 2001-2012 by Lloyd Wood.
See the textfile COPYRIGHT for full details.
@@ -70,7 +70,9 @@ See the textfile COPYRIGHT for full details.
SaVi requires:
- an ANSI C compiler, e.g. gcc from http://gcc.gnu.org/
- - tested and builds with gcc 2.95, 3.2, 3.3, 3.4, 4.0, 4.2, 4.4.
+ - tested and builds with gcc 2.95, 3.2, 3.3, 3.4, 4.0, 4.2, 4.4, 4.5.
+ or clang from http://clang.llvm.org/
+ - tested and builds with clang 3.1.
- Tcl and Tk, from http://www.tcl.tk/
- most recently tested with Tcl/Tk 8.5 releases and ActiveTcl 8.6b1.2.
@@ -99,15 +101,20 @@ SaVi can optionally use:
SaVi has been successfully compiled and run on the following architectures
and unix-like operating systems:
- - Intel x86 and PowerPC / Macintosh OS X (10.4.11, 10.5.8, 10.6.7)
+ - Intel x86 and PowerPC / Macintosh OS X (10.4.11, 10.5.8, 10.6.8, 10.7.2)
Mac users - you must read the BUGS file! A section there discusses
Mac-specific problems and workarounds for those problems.
- - Intel x86 / Windows running Cygwin (1.7.9; 1.5.9-1 to .25-11)
+ - Intel x86 / Windows running Cygwin (1.7.10; 1.5.9-1 to .25-11)
+ Cygwin users - Insight Tcl/Tk 8.4 was replaced by a more conventional
+ unix port of 8.5 in October 2011. If you are still using Insight and
+ haven't updated, build with:
+ make ARCH=cygwin84
+ instead of cygwin.
- Intel x86 / Linux (Fedora 12.0; Red Hat 6.x, 7.0, 7.2; Enterprise
3.0; Mandrake 9.0; Debian, Ubuntu 8.04, 9.10, 10.04; Mandriva One 2010)
Ubuntu users - you must read the instructions in
src/Makefile_defs_ubuntu!
- - Intel x86 / FreeBSD (6.0)
+ - Intel x86 / FreeBSD (6.0, 8.1)
- Sun SPARC / Solaris (2.4 and later, 10)
- SGI / Irix5
@@ -320,7 +327,7 @@ directory. Do not run the binary executable directly.
Create a file here called ".geomview-savi" containing e.g.:
- (emodule-define "SaVi" "/usr/local/savi1.4.3/savi -geomview")
+ (emodule-define "SaVi" "/usr/local/savi1.4.6/savi -geomview")
where the right-hand side is the absolute path name for the savi
script. The .geomview file can be modified to say e.g.:
@@ -345,6 +352,8 @@ an indent of two spaces, while Tcl code uses an indent of four spaces.
7. VERSION HISTORY OF SAVI
==========================
+1.4.6. Minor bugfixes. Cygwin unix Tcl/Tk 8.5 compatibility. May 2013.
+
1.4.5 Minor bugfixes. Mac ActiveTcl compatibility. April 2011.
1.4.4 Minor bugfixes. Tcl/Tk 8.6b1 compatibility. February 2011.
diff --git a/VERSION b/VERSION
index 6120646..9a1172f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.5 release (30 April 2011)
+1.4.7 development (13 May 2013)
diff --git a/configure b/configure
index b8e0a9b..b4ebec4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,7 @@
#! /bin/sh
+# $Id: configure,v 1.29 2013/01/29 12:16:08 lloydwood Exp $
-VERSION="savi1.4.5"
+VERSION="savi-dev"
echo "Please read the $VERSION/README file."
echo
@@ -35,6 +36,8 @@ if [ "${ARCH}" = unknown ]; then
echo "This system isn't familiar. You could try building SaVi with just:"
echo " cd $VERSION; make; ./savi"
echo "You may need to edit the generic $VERSION/src/Makefile_defs_ to build."
+ # set for citing with Makefile_defs_
+ ARCH=""
else
echo "This appears to have a $NAME operating system installed."
echo "A brief getting-started summary is given here:"
@@ -43,10 +46,10 @@ else
echo
echo "Replace ARCH value with the name of another platform"
echo "(linux, ubuntu, freebsd, cygwin, macosx, sun or irix) if needed."
- echo
fi
if [ "${ARCH}" = macosx ]; then
+ echo
echo "Please read the BUGS file for Mac-specific problems and workarounds!"
if [ -d /Library/Frameworks/Tcl.framework/Headers -a -d /Library/Frameworks/Tk.framework/Headers ]; then
echo "ActiveTcl appears to already be installed, and can be used."
@@ -61,7 +64,7 @@ elif [ "${ARCH}" = freebsd ]; then
fi
if [ -f /usr/include/zlib.h -o -f /usr/local/include/zlib.h ]; then
- if [ -f /usr/lib/libz.a -o -f /usr/local/lib/libz.a ]; then
+ if [ -f /usr/lib/libz.a -o -f /usr/local/lib/libz.a -o -f /usr/lib64/libz.a -o -f /usr/ocal/lib64/libz.a ]; then
echo
echo "zlib appears to be installed on this system."
echo "You can edit $VERSION/src/Makefile to remove the -DNO_ZLIB flag."
@@ -74,7 +77,7 @@ if [ -f /usr/include/zlib.h -o -f /usr/local/include/zlib.h ]; then
fi
echo
-echo "You will also need to edit the $VERSION/savi wrapper script that runs"
+echo "You may also need to edit the $VERSION/savi wrapper script that runs"
echo "the SaVi binary to set environment variables appropriately."
echo "You may need to edit the Tcl/Tk library locations set in this ./savi"
echo "script by TCL_LIBRARY and TK_LIBRARY when building dynamically."
diff --git a/data/deligo.tcl b/data/deligo.tcl
index c3fd848..9269925 100644
--- a/data/deligo.tcl
+++ b/data/deligo.tcl
@@ -1,6 +1,8 @@
#
# * Deligo
# *
+# * A satellite constellation designed at the University of Surrey.
+# *
# * This "provides 100% single satellite visibility between +/-74deg
# * latitudes and 100% dual diversity between +/-62deg latitudes
# * at a minimum elevation angle of 14deg" with a repetitive ground
@@ -12,7 +14,7 @@
# * constellation for S-PCN, IEE Electronics Letters, vol. 13
# * no. 17, 17 August 1995, pp. 1407-1408.
#
-# $Id: deligo.tcl,v 1.1 2011/02/28 18:06:49 lloydwood Exp $
+# $Id: deligo.tcl,v 1.2 2011/05/15 16:14:25 lloydwood Exp $
set SATS_PER_PLANE 8
set NUM_PLANES 8
diff --git a/data/dmc.tcl b/data/dmc.tcl
index 6f24142..0d0a396 100644
--- a/data/dmc.tcl
+++ b/data/dmc.tcl
@@ -1,9 +1,10 @@
#
# * OPERATIONAL CONSTELLATIONS
# *
-# * Disaster Monitoring Constellation (DMC)
+# * Disaster Monitoring Constellation (DMC), circa 2006.
# *
-# * Five satellites built by Surrey Satellite Technology Ltd.
+# * A satellite constellation designed at the University of Surrey,
+# * and built by Surrey Satellite Technology Ltd.
# *
# * Four satellites are spaced equally in a sun-synchronous plane,
# * which ascends over the Equator at 10:15 am, in order after one
@@ -17,27 +18,28 @@
# *
# * This script turns on sunlight to show the sun-synchronous orbits.
# *
-# * BilSAT-1 is no longer operational due to batteries no longer
-# * charging. UK-DMC has been moved to a slightly lower orbit as it
-# * nears end of life.
-# *
# * Orbital details from a presentation on the DMC and its
# * capabilities:
# * David Hodgson, 11th Conference on Control with Remote Sensing of
# * Area-based Subsidies, Krakow, Poland, 25 November 2005 (slide 5).
# *
# * This simulation has not yet been updated to reflect the later
-# * launch of UK-DMC2 and Deimos-1 on 29 July 2009, which led to seven
-# * satellites in orbit, six operational.
+# * launches of:
+# * - UK-DMC2 and Deimos-1 on 29 July 2009.
+# * - NigeriaSat-2 and NigeriaSat-X on 17 August 2011.
+# *
+# * BilSAT-1 is no longer operational due to batteries no longer
+# * charging. UK-DMC has now reached end of life, and is no longer
+# * in operational use.
# *
# * See also http://www.dmcii.com/.
# *
-# * These satellite use the Internet Protocol to communicate. The
+# * These satellites use the Internet Protocol to communicate. The
# * UK-DMC satellite has acted as a networking testbed with an onboard
# * Internet router from Cisco Systems, and became the first satellite
# * to run IPv6 and the Delay-Tolerant Networking 'Bundle Protocol'.
#
-# $Id: dmc.tcl,v 1.13 2011/04/27 09:02:38 lloydwood Exp $
+# $Id: dmc.tcl,v 1.17 2012/01/20 06:20:54 lloydwood Exp $
# sun-synchronous, so turn on sunlight
upvar #0 sun_flag sun_flag
diff --git a/data/draim-4.tcl b/data/draim-4.tcl
index bddc734..bb43200 100644
--- a/data/draim-4.tcl
+++ b/data/draim-4.tcl
@@ -13,8 +13,12 @@
# * global coverage constellation, AIAA Journal of Guidance,
# * Control and Dynamics, vol. 10, no. 5, September-October 1987,
# * pp. 492-499. Orbital parameters from Table 1.
+# *
+# * John E. Draim, Tetrahedral multi-satellite continuous-coverage
+# * constellation, US Patent 4,854,527, August 1989.
+# http://www.freepatentsonline.com/4854527.html
#
-# $Id: draim-4.tcl,v 1.11 2011/04/08 15:42:11 lloydwood Exp $
+# $Id: draim-4.tcl,v 1.12 2011/09/02 07:59:05 lloydwood Exp $
set NUM_PLANES 4
diff --git a/data/leqo.tcl b/data/leqo.tcl
index e44fac5..a7c3193 100644
--- a/data/leqo.tcl
+++ b/data/leqo.tcl
@@ -3,6 +3,8 @@
# *
# * LEqO
# *
+# * A satellite constellation designed at the University of Surrey.
+# *
# * A number of small satellites in a low equatorial orbit for
# * near-real-time communications for the tropics. Not built.
# *
@@ -16,7 +18,7 @@
# this script for SaVi by Lloyd Wood (lloydwood at users.sourceforge.net)
# http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/
#
-# $Id: leqo.tcl,v 1.9 2008/12/28 23:48:11 lloydwood Exp $
+# $Id: leqo.tcl,v 1.10 2011/05/15 16:14:25 lloydwood Exp $
set NUM_SATS 8
diff --git a/data/mm.tcl b/data/mm.tcl
index a8f34ed..47d640f 100644
--- a/data/mm.tcl
+++ b/data/mm.tcl
@@ -6,8 +6,15 @@
# * Described in: A. H. Jackson and P. Christopher, A LEO Concept for
# * Millimeter Wave Satellite Communication, Proceedings of the Fourth
# * International Mobile Satellite Conference, Ottawa, 1995, pp. 185-192.
+# *
+# * A slightly different system is described in:
+# * A. H Jackson and P. Christopher, Angle diversity for millimeter wave
+# * satellite communications, Proceedings of the Fifth International
+# * Conference on Satellite Systems for Mobile Communications and
+# * Navigation, May 1996, pp. 51-54.
+# http://dx.doi.org/10.1049/cp:19960407
#
-# $Id: mm.tcl,v 1.7 2011/04/27 21:06:25 lloydwood Exp $
+# $Id: mm.tcl,v 1.8 2011/07/18 14:52:08 lloydwood Exp $
# number of satellites
set IMAX 30
diff --git a/data/o3b-networks.tcl b/data/o3b-networks.tcl
index e4795c0..6b604d1 100644
--- a/data/o3b-networks.tcl
+++ b/data/o3b-networks.tcl
@@ -8,7 +8,7 @@
# *
# * Announced with much publicity in September 2008. Some investment
# * from Google and others. Not yet built; first launch now expected
-# * in 2012.
+# * in 2013.
# *
# * See http://www.o3bnetworks.com/
# *
@@ -31,12 +31,18 @@
# this script for SaVi by Lloyd Wood (lloydwood at users.sourceforge.net)
# http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/
#
-# $Id: o3b-networks.tcl,v 1.9 2011/04/27 09:02:38 lloydwood Exp $
+# $Id: o3b-networks.tcl,v 1.11 2013/05/05 05:19:25 lloydwood Exp $
-# * An initial deployment of eight satellites; sixteen more to follow.
-# http://www.o3bnetworks.com/AboutUs/faq.html 24 May 2010.
+# * An initial deployment of eight satellites.
set NUM_SATS 8
+# sixteen more to follow.
+# http://www.o3bnetworks.com/AboutUs/faq.html 24 May 2010.
+# Contract signed for four more, taking to 12:
+# O3b Networks set to virtually double fleet capacity as financing is
+# secured to build four more satellites, O3b press release, 10 November
+# 2012.
+
# setup orbital elements
set a [expr 8063.0+$RADIUS_OF_EARTH]
set e 0.0
diff --git a/data/tundra.tcl b/data/tundra.tcl
index d9d6f6d..2c79bf9 100644
--- a/data/tundra.tcl
+++ b/data/tundra.tcl
@@ -9,13 +9,13 @@
# * continuous coverage of the chosen point.
# *
# * Information from 'Satellite Communication Systems', Maral and
-# * Bouquet, 2nd/3rd edition, chapter 7; values are set to match
+# * Bousquet, 2nd/3rd edition, chapter 7; values are set to match
# * Figure 7.13.
#
# this script for SaVi by Lloyd Wood (lloydwood at users.sourceforge.net)
# http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/
#
-# $Id: tundra.tcl,v 1.11 2011/04/27 09:02:38 lloydwood Exp $
+# $Id: tundra.tcl,v 1.12 2011/07/18 14:44:46 lloydwood Exp $
# setup orbital elements
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 2e642f3..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-savi (1.4.5-1) unstable; urgency=low
-
- * Initial release (Closes: #436511)
-
- -- YunQiang Su <wzssyqa at gmail.com> Fri, 22 Apr 2011 19:10:37 +0800
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 9bd7d96..0000000
--- a/debian/control
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: savi
-Section: science
-Priority: optional
-Maintainer: YunQiang Su <wzssyqa at gmail.com>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, tcl-dev, tk-dev
-Standards-Version: 3.9.2
-Homepage: http://savi.sourceforge.net/
-Vcs-Git: git://git.debian.org/collab-maint/savi.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/savi.git
-
-Package: savi
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: geomview
-Description: satellite constellation visualisation
- SaVi allows you to simulate satellite orbits and coverage,
- in two and three dimensions. SaVi is particularly useful for
- simulating satellite constellations such as Iridium and Globalstar.
- .
- SaVi can use Geomview, an optional but useful package,
- for 3D rendering.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 0edfc4e..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,97 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: savi
-Source: http://savi.sourceforge.net/
-
-Files: *
-Copyright:
- 1. ADDITIONAL COPYRIGHT FOR THE SAVI 1.2, 1.3 and 1.4 RELEASES
- ==============================================================
-
- Enhancements to and modifications of SaVi 1.0, expressed in the
- SaVi 1.2, 1.3 and 1.4 releases, are:
-
- Copyright (c) 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008, 2009, 2010, 2011 Lloyd Wood.
-
- Lloyd Wood maintains SaVi, and welcomes bug reports and fixes from
- users. Contact Lloyd at: lloydwood at users.sourceforge.net.
-
- SaVi continues to be provided "as is", and no warranty or guarantee of
- fitness for use is expressed or implied.
-
- Use of SaVi images should credit SaVi. A suggested reference is:
- L. Wood, P. Worfolk et al., SaVi - Satellite constellation
- Visualisation software, http://savi.sf.net/, 2011.
-
- 2. ORIGINAL COPYRIGHT FOR SAVI 1.0
- ==================================
-
- SaVi
-
- by Robert Thurman (thurman at geom.umn.edu) and
- Patrick Worfolk (worfolk at alum.mit.edu).
-
-
- Copyright (c) 1997
-
- The National Science and Technology Research Center for
- Computation and Visualization of Geometric Structures
- (The Geometry Center)
- University of Minnesota
-
- email: savi at geom.umn.edu
-
-
-License:
-This software is copyrighted as noted above. It is free software and
-may be obtained by emailing savi at geom.umn.edu or contacting the
-authors. It may be freely copied, modified, and redistributed under
-the following conditions:
-
-1. All copyright notices must remain intact in all files.
-
-2. A copy of this file (COPYRIGHT) must be distributed along with any
- copies which you redistribute; this includes copies which you have
- modified, or copies of programs or other software products which
- include this software or portions of it.
-
-3. When distributing modified versions of this software,
- you must provide notice clearly stating that it is modified software
- and that the original software may be obtained freely as noted
- above.
- When distributing other software products which include this
- software or portions of it, you must also provide notice that the
- original software may be obtained freely as noted above.
-
-4. There is no warranty or other guarantee of fitness for this
- software, it is provided solely "as is". Bug reports or fixes may
- be sent to the email address above; the authors may or may not act
- on them as they desire.
-
-If you use an image produced by this software in a publication or
-presentation, we request that you credit the Geometry Center with a
-notice such as the following:
-
- Figures 1, 2, and 5-300 were generated with SaVi, software written
- at the Geometry Center, University of Minnesota.
-
-
-
-Files: debian/*
-Copyright: 2011 YunQiang Su <wzssyqa at gmail.com>
-License: GPL-2+
- This package 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 package 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, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 4894219..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-BUGS
-README
-README-COVERAGE-TEXTUREMAP
diff --git a/debian/geomview-savi b/debian/geomview-savi
deleted file mode 100644
index ac7d78f..0000000
--- a/debian/geomview-savi
+++ /dev/null
@@ -1 +0,0 @@
-(emodule-define "SaVi" "/usr/bin/savi -geomview")
diff --git a/debian/patches/data_to_share.diff b/debian/patches/data_to_share.diff
deleted file mode 100644
index 360042e..0000000
--- a/debian/patches/data_to_share.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: savi-1.4.4/tcl/main.tcl
-===================================================================
---- savi-1.4.4.orig/tcl/main.tcl 2011-04-22 22:37:59.870447882 +0800
-+++ savi-1.4.4/tcl/main.tcl 2011-04-22 22:43:43.990952601 +0800
-@@ -640,7 +640,7 @@
-
- # coverage(update_decay)
-
-- main(load_file) "data/$filename"
-+ main(load_file) "/usr/share/savi/data/$filename"
- }
-
- proc main(source_file) {filename} {
diff --git a/debian/patches/enable_zlib.diff b/debian/patches/enable_zlib.diff
deleted file mode 100644
index b537613..0000000
--- a/debian/patches/enable_zlib.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Enable -lz and change to generic tcl/tk from fixed 8.5
-
-Index: savi-1.4.4/src/Makefile_defs_ubuntu
-===================================================================
---- savi-1.4.4.orig/src/Makefile_defs_ubuntu 2011-04-22 20:38:40.729947634 +0800
-+++ savi-1.4.4/src/Makefile_defs_ubuntu 2011-04-22 20:38:46.000000000 +0800
-@@ -45,7 +45,7 @@
- # match. #
- # #
- ########################################################
--TCL_INCLUDES = -I/usr/include/tcl8.5 -I/usr/include/tk8.5
-+TCL_INCLUDES = -I/usr/include/tcl -I/usr/include/tk
-
- ########################################################
- # #
-@@ -56,9 +56,9 @@
- # Debian requires a dot here: -ltcl8.4 -ltk8.4
- # as does Red Hat Enterprise.
-
--TCL_LIBS = -ltcl8.5 -ltk8.5
-+#TCL_LIBS = -ltcl8.5 -ltk8.5
-
--# TCL_LIBS = -ltcl -ltk
-+TCL_LIBS = -ltcl -ltk
- # is a generic alternative to try.
-
-
-@@ -70,6 +70,6 @@
- ########################################################
- OTHER_LIBS = -ldl
-
--# OTHER_LIBS = -lz
-+OTHER_LIBS = -lz
- # if zlib compression of textures to Geomview is desired.
- # OTHER_LIBS = -static
-Index: savi-1.4.4/src/Makefile
-===================================================================
---- savi-1.4.4.orig/src/Makefile 2011-04-22 20:48:31.150813600 +0800
-+++ savi-1.4.4/src/Makefile 2011-04-22 20:48:51.330843197 +0800
-@@ -26,7 +26,7 @@
- # zlib enables transparent gzip compression of dynamic texture scratchfiles.
- # OTHER_LIBS = -lz should be inserted at end of definitions file.
-
-- GCC_FLAGS = -O2 -DNO_ZLIB
-+ GCC_FLAGS = -O2
-
- LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm
-
diff --git a/debian/patches/maps_to_share.diff b/debian/patches/maps_to_share.diff
deleted file mode 100644
index 3ae5c12..0000000
--- a/debian/patches/maps_to_share.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: savi-1.4.5/src/include/coverage_vis.h
-===================================================================
---- savi-1.4.5.orig/src/include/coverage_vis.h 2011-06-27 23:52:56.446814707 +0800
-+++ savi-1.4.5/src/include/coverage_vis.h 2011-06-27 23:55:33.759594777 +0800
-@@ -30,19 +30,19 @@
- #include "Satellite.h"
-
- /* bitmap of geographical boundaries for coverage */
--#define CYLINDRICAL_BITMAP_NAME "maps/world.cyl.pbm"
--#define UNPROJECTED_BITMAP_NAME "maps/world.unp.pbm"
--#define SPHERICAL_BITMAP_NAME "maps/world.sph.pbm"
--#define SPHERICAL_90_BITMAP_NAME "maps/world90W.sph.pbm"
--#define SINUSOIDAL_BITMAP_NAME "maps/world.sinu.pbm"
--#define SINUSOIDAL_90_BITMAP_NAME "maps/world90W.sinu.pbm"
-+#define CYLINDRICAL_BITMAP_NAME "/usr/share/savi/maps/world.cyl.pbm"
-+#define UNPROJECTED_BITMAP_NAME "/usr/share/savi/maps/world.unp.pbm"
-+#define SPHERICAL_BITMAP_NAME "/usr/share/savi/maps/world.sph.pbm"
-+#define SPHERICAL_90_BITMAP_NAME "/usr/share/savi/maps/world90W.sph.pbm"
-+#define SINUSOIDAL_BITMAP_NAME "/usr/share/savi/maps/world.sinu.pbm"
-+#define SINUSOIDAL_90_BITMAP_NAME "/usr/share/savi/maps/world90W.sinu.pbm"
-
--#define CYLINDRICAL_LARGE_BITMAP_NAME "maps/world1024.cyl.pbm"
--#define UNPROJECTED_LARGE_BITMAP_NAME "maps/world1024.unp.pbm"
--#define SPHERICAL_LARGE_BITMAP_NAME "maps/world1024.sph.pbm"
--#define SPHERICAL_90_LARGE_BITMAP_NAME "maps/world90W1024.sph.pbm"
--#define SINUSOIDAL_LARGE_BITMAP_NAME "maps/world1024.sinu.pbm"
--#define SINUSOIDAL_90_LARGE_BITMAP_NAME "maps/world90W1024.sinu.pbm"
-+#define CYLINDRICAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.cyl.pbm"
-+#define UNPROJECTED_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.unp.pbm"
-+#define SPHERICAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.sph.pbm"
-+#define SPHERICAL_90_LARGE_BITMAP_NAME "/usr/share/savi/maps/world90W1024.sph.pbm"
-+#define SINUSOIDAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.sinu.pbm"
-+#define SINUSOIDAL_90_LARGE_BITMAP_NAME "/usr/share/savi/maps/world90W1024.sinu.pbm"
-
- #define LONGITUDE_CENTER_LINE 0.0
- #define LONGITUDE_CENTER_LINE_90W (-90.0)
-Index: savi-1.4.5/tcl/about.tcl
-===================================================================
---- savi-1.4.5.orig/tcl/about.tcl 2011-06-27 23:56:26.403855824 +0800
-+++ savi-1.4.5/tcl/about.tcl 2011-06-27 23:56:50.483975233 +0800
-@@ -36,7 +36,7 @@
- set cmd [build_CmdFrame $name cmd]
-
- set logo [canvas $cmd.logo -width 150 -height 75]
-- image create photo graphic -file "maps/savi-logo.gif"
-+ image create photo graphic -file "/usr/share/savi/maps/savi-logo.gif"
- $logo create image 75 0 -image graphic -anchor n
- pack $logo
-
diff --git a/debian/patches/oogl_to_share.diff b/debian/patches/oogl_to_share.diff
deleted file mode 100644
index 762258a..0000000
--- a/debian/patches/oogl_to_share.diff
+++ /dev/null
@@ -1,156 +0,0 @@
-Index: savi-1.4.5/src/coverage_vis.c
-===================================================================
---- savi-1.4.5.orig/src/coverage_vis.c 2011-06-28 00:02:23.781627968 +0800
-+++ savi-1.4.5/src/coverage_vis.c 2011-06-28 00:05:05.154428175 +0800
-@@ -655,9 +655,9 @@
- coverage_dynamic_disk_initialised(void)
- {
- char line[LENGTH_LINE];
-- const char name[] = "oogl/earth.oogl";
-+ const char name[] = "/usr/share/savi/oogl/earth.oogl";
- const char fallback_tmpnam[] = "coverage";
-- const char static_name[] = "oogl/Earth.ppm.Z";
-+ const char static_name[] = "/usr/share/savi/oogl/Earth.ppm.Z";
- const char file_separator[] = "/";
- const char file_start[] = "file \"";
- const char file_end[] = "\"\n";
-Index: savi-1.4.5/src/earth.c
-===================================================================
---- savi-1.4.5.orig/src/earth.c 2011-06-28 00:05:20.438503977 +0800
-+++ savi-1.4.5/src/earth.c 2011-06-28 00:07:14.975071910 +0800
-@@ -115,23 +115,23 @@
-
- if (texture_flag) {
- if (!earth_texture_loaded) {
-- earth_texture_loaded = gv_sendfile("oogl/earth_texture_h.oogl");
-+ earth_texture_loaded = gv_sendfile("/usr/share/savi/oogl/earth_texture_h.oogl");
- }
- if (geomview_stream_textures && geomview_dynamic_texture_flag) {
- if (coverage_projection == UNPROJECTED) {
- if (debug) error("texturemap sphere, dynamic unprojected map.");
-- gv_sendfile("oogl/earth_coverage_unp_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_coverage_unp_h.oogl");
- redraw_coverage_display();
- } else if (coverage_projection == CYLINDRICAL) {
- if (debug) error("texturemap sphere, dynamic cylindrical map.");
-- gv_sendfile("oogl/earth_coverage_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_coverage_h.oogl");
- redraw_coverage_display();
- } else {
- if (debug) error("texturemap sphere, dynamic mapping of this projection not supported.");
- if (use_fancy_earth) {
-- gv_sendfile("oogl/earth_fancy_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_fancy_h.oogl");
- } else {
-- gv_sendfile("oogl/earth_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_h.oogl");
- }
- geomview_dynamic_coverage = FALSE;
- }
-@@ -143,7 +143,7 @@
- } else if (use_simple_earth) {
- /* static texture - blue and gold map */
- if (debug) error ("texturemap sphere, simple static Earth image.\n");
-- gv_sendfile("oogl/earth_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_h.oogl");
- gv_create_geom("Central_Body", "central_t", "earth_vect_texture_sphere_h");
- } else if (use_fancy_earth) {
- /* static texture - detailed texturemap */
-@@ -152,7 +152,7 @@
- /* 1.9.0 supports streaming and CYLINDRICAL/RECTANGULAR */
- error("Detailed Earth map requires later Geomview. Please upgrade.");
- }
-- gv_sendfile("oogl/earth_fancy_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_fancy_h.oogl");
- gv_create_geom("Central_Body", "central_t", "earth_vect_texture_sphere_h");
- } else {
- if (debug) error ("texturemap sphere, do not draw detailed Earth.\n");
-@@ -168,7 +168,7 @@
- /* no texturing */
- if (use_fancy_earth || use_simple_earth) {
- if (debug) error ("ordinary sphere, detailed vector Earth.\n");
-- earth_texture_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
-+ earth_texture_loaded = gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
- gv_create_geom("Central_Body", "central_t", "earth_vect_sphere_h");
- } else {
- if (debug) error ("ordinary sphere.");
-@@ -238,7 +238,7 @@
- if (geomview_module) gv_start();
-
- if (!earth_vectors_loaded) {
-- earth_vectors_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
-+ earth_vectors_loaded = gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
- }
-
- if (earth_on_flag) {
-@@ -247,7 +247,7 @@
- } else {
- /* clear sphere */
- if (debug) error("clear sphere, invisible Earth body.");
-- gv_sendfile("oogl/earth_vect_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
- gv_create_geom("Central_Body", "central_t", "earth_vect_clear_h");
- earth_geom_exists = TRUE;
- }
-@@ -304,7 +304,7 @@
- if (geomview_module) gv_start();
-
- if (!earth_vectors_loaded) {
-- earth_vectors_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
-+ earth_vectors_loaded = gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
- }
-
- if (earth_on_flag) {
-@@ -313,7 +313,7 @@
- } else {
- /* clear sphere */
- if (debug) error("clear sphere, invisible Earth body.");
-- gv_sendfile("oogl/earth_vect_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
- gv_create_geom("Central_Body", "central_t", "earth_vect_clear_h");
- earth_geom_exists = TRUE;
- }
-Index: savi-1.4.5/src/gv_init.c
-===================================================================
---- savi-1.4.5.orig/src/gv_init.c 2011-06-28 00:07:36.067176508 +0800
-+++ savi-1.4.5/src/gv_init.c 2011-06-28 00:08:10.307346297 +0800
-@@ -37,7 +37,7 @@
- #include "sats.h"
- #include "globals.h"
-
--#define DETAILED_TEXTUREMAP_NAME "oogl/blue_marble_land_shallow_topo_2048.jpeg"
-+#define DETAILED_TEXTUREMAP_NAME "/usr/share/savi/oogl/blue_marble_land_shallow_topo_2048.jpeg"
-
- static char tname[] = "trans_ ";
-
-Index: savi-1.4.5/src/include/constants.h
-===================================================================
---- savi-1.4.5.orig/src/include/constants.h 2011-06-28 00:08:33.547461538 +0800
-+++ savi-1.4.5/src/include/constants.h 2011-06-28 00:09:17.183677922 +0800
-@@ -40,10 +40,10 @@
- /* for file-handling routines */
- #define NOT_OK -1
-
--#define HANDLE_FILE_SAVI "oogl/savi.oogl"
--#define HANDLE_FILE_LOGO "oogl/savilogo.oogl"
-+#define HANDLE_FILE_SAVI "/usr/share/savi/oogl/savi.oogl"
-+#define HANDLE_FILE_LOGO "/usr/share/savi/oogl/savilogo.oogl"
-
--#define AMBIENT_LIGHTING "oogl/ambient_light.oogl"
-+#define AMBIENT_LIGHTING "/usr/share/savi/oogl/ambient_light.oogl"
- #define EARTH_YEAR (365.25*24*3600)
- #define EARTH_TILT 23.5
-
-Index: savi-1.4.5/src/stars.c
-===================================================================
---- savi-1.4.5.orig/src/stars.c 2011-06-28 00:09:35.755770017 +0800
-+++ savi-1.4.5/src/stars.c 2011-06-28 00:10:03.247906337 +0800
-@@ -48,7 +48,7 @@
- {
- gv_start();
- if (!stars_loaded) {
-- stars_loaded = gv_sendfile("oogl/stars_h.oogl");
-+ stars_loaded = gv_sendfile("/usr/share/savi/oogl/stars_h.oogl");
- }
- if (stars_loaded) {
- gv_create_geomh("Stars", "stars_h");
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8b69e46..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-data_to_share.diff
-enable_zlib.diff
-maps_to_share.diff
-oogl_to_share.diff
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index a65fbfe..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/make -f
-
-%:
- dh $@
-
-override_dh_auto_configure:
-
-override_dh_auto_build:
- make ARCH=ubuntu
-
-override_dh_auto_install:
-
-override_dh_install:
- dh_install
- cp debian/savi-bin debian/savi/usr/bin/savi
- cp debian/geomview-savi debian/savi/usr/lib/geomview/.geomview-savi
- find debian/savi/usr/ -name "Makefile*" -exec rm {} \;
diff --git a/debian/savi-bin b/debian/savi-bin
deleted file mode 100644
index 65bee7a..0000000
--- a/debian/savi-bin
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-sh /usr/lib/savi/savi $*
diff --git a/debian/savi.1 b/debian/savi.1
deleted file mode 100644
index 338bdbe..0000000
--- a/debian/savi.1
+++ /dev/null
@@ -1,30 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4.
-.TH SAVI "1" "June 2011" "SaVi " "User Commands"
-.SH NAME
-SaVi \- satellite constellation visualisation
-.SH DESCRIPTION
-SaVi: supported command\-line options include:
-savi [\-large\-map] [\-levels <n>] [\-debug] [\-fake\-geomview] [\-redrawn\-menus]
-.IP
-[\-map\-view\-height <no. of pixels>] [\-map\-view\-middle <longitude>]
-[\-orbit\-model <J0|J2>] [filename]
-.IP
-when SaVi is run standalone. Further flags:
-.PP
-savi [\-geomview] [\-dynamic\-texture\-with\-map] [\-dynamic\-texture\-to\-file]
-.IP
-[\-gzip\-compressed\-textures] [\-uncompressed] [\-no\-logo] [\-sun\-lighting]
-.IP
-are available when SaVi is run from Geomview.
-.PP
-SaVi:
-savi \fB\-help\fR shows this help information at the command line.
-savi \fB\-version\fR provides version information at the command line.
-savi \fB\-splash\fR shows copyright and version information in a window.
-.PP
-SaVi was compiled with 'make ARCH=ubuntu'
-Version 1.4.5 release (30 April 2011)
-.SH "SEE ALSO"
-The full documentation for
-.B SaVi
-is maintained as a html manual. Please see /usr/share/savi/manual/index.html
diff --git a/debian/savi.dirs b/debian/savi.dirs
deleted file mode 100644
index 8835a5d..0000000
--- a/debian/savi.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/bin/
-/usr/lib/
-/usr/share/
-/usr/lib/geomview/
diff --git a/debian/savi.install b/debian/savi.install
deleted file mode 100644
index af59757..0000000
--- a/debian/savi.install
+++ /dev/null
@@ -1,15 +0,0 @@
-COPYRIGHT /usr/lib/savi
-BUGS /usr/lib/savi
-README /usr/lib/savi
-README-COVERAGE-TEXTUREMAP /usr/lib/savi
-
-savi /usr/lib/savi
-bin/SaVi /usr/lib/savi/bin/
-data /usr/share/savi/
-maps /usr/share/savi/
-manual /usr/share/savi/
-oogl /usr/share/savi/
-
-debian/savi.1 /usr/share/man/man1/
-
-tcl /usr/lib/savi/
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/manual/index.html b/manual/index.html
index 74cc7da..8bdfb35 100644
--- a/manual/index.html
+++ b/manual/index.html
@@ -1,7 +1,7 @@
<html>
<head>
<title>SaVi satellite constellation visualization - user manual</title>
-<!-- $Id: index.html,v 1.54 2011/04/26 20:41:31 lloydwood Exp $ -->
+<!-- $Id: index.html,v 1.55 2013/05/05 05:37:01 lloydwood Exp $ -->
<link rel="icon" href="images/savi-spot.png" TYPE="image/png">
</head>
<style type="text/css" media="screen, projection">
@@ -134,8 +134,8 @@ see the <b>File</b> menu in the main window's menubar.</p>
<p>
Clicking a line listing satellite parameters highlights it, giving it a purple
cross in the Coverage and Fisheye windows, and a yellow surround in Geomview's
-Camera window. Shift-clicking a line adds it to or removes it from the current
-selection. Control-clicking a line includes the range of satellites from the
+Camera window. Control-clicking a line adds it to or removes it from the current
+selection. Shift-clicking a line includes the range of satellites from the
current selection to that line.
</p>
diff --git a/oogl/ambient_light.oogl b/oogl/ambient_light.oogl
old mode 100644
new mode 100755
diff --git a/oogl/blue_marble_land_shallow_topo_2048.jpeg b/oogl/blue_marble_land_shallow_topo_2048.jpeg
old mode 100644
new mode 100755
diff --git a/oogl/savi.oogl b/oogl/savi.oogl
index f496f0a..06761ba 100644
--- a/oogl/savi.oogl
+++ b/oogl/savi.oogl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -23,7 +23,7 @@
# General description - axes, planes, coverage, satellites.
# Loads in always-available vector Earth description.
#
-# $Id: savi.oogl,v 1.21 2011/01/09 20:20:01 lloydwood Exp $
+# $Id: savi.oogl,v 1.23 2013/05/05 05:19:25 lloydwood Exp $
(progn
(normalization allgeoms none)
diff --git a/savi b/savi
index 2e55f13..60cdcd7 100755
--- a/savi
+++ b/savi
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2010 by Lloyd Wood.
+# Also Copyright (c) 2012 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,27 @@
#
# Script that is always used to launch the binary SaVi executable
#
-# $Id: savi,v 1.59 2011/04/17 20:47:53 lloydwood Exp $
+# $Id: savi,v 1.70 2012/03/25 09:06:46 lloydwood Exp $
+
+#
+# If SAVI environment variable is not defined
+# then set it to be the path of this file
+#
+: ${SAVI:=`dirname "$0"`}
+
+#
+# If this script is moved from the SaVi installation tree and run
+# elsewhere, then uncomment the following line:
+# SAVI=/usr/lib/savi
+# and replace /usr/lib/savi with the location of
+# your SaVi installation.
+#
+export SAVI
+
+#
+# Default executable absolute location and name
+#
+SAVIBIN="${SAVI}/bin/SaVi"
#
# Set locations of tcl and tk library code needed at runtime
@@ -41,35 +61,14 @@ fi
if [ ! -d "$TK_LIBRARY" ]; then
TCL_LIBRARY=/usr/local/lib/tcl8.5
TK_LIBRARY=/usr/local/lib/tk8.5
-fi
-if [ ! -d "$TK_LIBRARY" ]; then
- # Mandriva One 2010
- TCL_LIBRARY=/usr/include
- TK_LIBRARY=/usr/include
+ if [ ! -d "$TK_LIBRARY" ]; then
+ # Mandriva One 2010
+ TCL_LIBRARY=/usr/include
+ TK_LIBRARY=/usr/include
+ fi
fi
-#
-# If SAVI environment variable is not defined
-# then set it to be the path of this file
-#
-: ${SAVI:=`dirname "$0"`}
-
-#
-# If you copy this script from the SaVi installation and run it
-# elsewhere, then you should uncomment the following line:
-# SAVI=/usr/local/savi
-# and replace /usr/local/savi with the location of
-# your SaVi installation.
-#
-export SAVI
-
-
-#
-# Default executable relative location and name
-#
-SAVIBIN=bin/SaVi
-
#
# Default parameters to pass to executable
@@ -80,32 +79,45 @@ params=""
#
# Check for known machine types
#
-if [ -f /vmlinuz -o -f /boot/vmlinuz ]; then
+if [ -f /etc/debian_version ]; then
+ # Debian GNU/kFreeBSD is Debian, but not Linux, so we test first.
+ # Ubuntu is the most popular Debian variant; clue for ubuntu users.
+ ARCH=ubuntu
+elif [ -f /vmlinuz -o -f /boot/vmlinuz ]; then
+ # test doesn't handle changed vmlinuz-<version> directories.
ARCH=linux
- if [ -f /etc/debian_version ]; then
- # Ubuntu is the most popular Debian variant.
- ARCH=ubuntu
- fi
elif [ -d /devices ]; then
ARCH=sun
elif [ -d /usr/bsd -a -d /usr/sbin ]; then
ARCH=irix
elif [ -d /cygdrive ]; then
ARCH=cygwin
+ if [ ! -d /usr/lib/tk8.5 ]; then
+ # unix port of Tk 8.5 not installed
+ if [ ! -d /usr/share/tk/8.4 ]; then
+ # Insight Tk 8.4 not installed.
+ echo "SaVi: A Tk package is not installed in Cygwin." >&2
+ else
+ ARCH=cygwin84
+ fi
+ fi
elif [ -d /System ]; then
ARCH=macosx
# Tk in 10.5 Leopard has menubar bugs.
# Not required by 10.6 Snow Leopard or 10.4 Tiger users
if [ -d /Developer/SDKs ]; then
# we can guess version from libraries available
- if [ ! -d /Developer/SDKs/MacOSX10.6.sdk ]; then
- # We're not later than 10.5
- if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then
- # We are 10.5 - use popup menus instead.
- # Comment out these lines if ActiveTcl is installed
- # and SaVi has been compiled with it - see src/Makefile_defs_macosx
- echo "SaVi: using popup menus to work around a Mac OS X 10.5-specific problem." >&2
- params="-redrawn-menus ${params}"
+ if [ ! -d /Developer/SDKs/MacOSX10.7.sdk ]; then
+ # We're not later than 10.6. 10.7 has 10.7+10.6 SDKs.
+ if [ ! -d /Developer/SDKs/MacOSX10.6.sdk ]; then
+ # We're not later than 10.5
+ if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then
+ # We are 10.5 - use popup menus instead.
+ # Comment out below lines if ActiveTcl is installed on 10.5
+ # and SaVi has been compiled with it - see src/Makefile_defs_macosx
+ echo "SaVi: using popup menus to work around a Mac OS X 10.5-specific problem." >&2
+ params="-redrawn-menus ${params}"
+ fi
fi
fi
fi
@@ -126,10 +138,14 @@ fi
#
# Set platform-specific Tcl/Tk locations if needed
#
-if [ ${ARCH} = "cygwin" ]; then
- # Cygwin installs Insight Tcl/Tk here.
+if [ ${ARCH} = "cygwin84" ]; then
+ # Cygwin installs Insight Tcl/Tk 8.4 here.
TCL_LIBRARY=/usr/share/tcl8.4
TK_LIBRARY=/usr/share/tk8.4
+elif [ ${ARCH} = "cygwin" ]; then
+ # ...but new Tcl/Tk 8.5 port (Oct 2011) is installed here:
+ TCL_LIBRARY=/usr/lib/tk8.5
+ TK_LIBRARY=/usr/lib/tk8.5
elif [ ${ARCH} = "macosx" ]; then
# Mac OS X installs libraries in shared folder
TCL_LIBRARY=/usr/lib
@@ -174,32 +190,31 @@ NOTFOUND=no
COMPLAIN=no
MAKEFILE=no
+SAVIBIN="${SAVI}/${SAVIBIN}"
#
# Try specific binary, then default to filename without extension
#
if [ ! ${ARCH} = "unknown" ]; then
- SAVIBIN="${SAVI}/${SAVIBIN}"
- PLATFORMSAVIBIN="${SAVI}/${SAVIBIN}-${ARCH}.bin"
+ PLATFORMSAVIBIN="${SAVIBIN}-${ARCH}.bin"
if [ -f "${PLATFORMSAVIBIN}" ]; then
# found the platform-specific executable
if [ -f "${SAVIBIN}" ]; then
# if default as well, indicate a choice was made - the safer choice.
- echo "SaVi: selected platform-specific binary $SAVI/$PLATFORMSAVIBIN" >&2
+ echo "SaVi: selected platform-specific binary $PLATFORMSAVIBIN" >&2
fi
SAVIBIN="${PLATFORMSAVIBIN}"
else
# try default SaVi binary; assuming it's for our platform.
if [ ! -f "${SAVIBIN}" ]; then
- echo "nofied">&2
# couldn't find default binary. Are we 64-bit?
if [ ${SIXTYFOUR} = yes ]; then
- SAVI64BIN="${SAVI}/${SAVIBIN}-${KNOWN64}.bin"
+ SAVI64BIN="${SAVIBIN}-${KNOWN64}.bin"
if [ -f "${SAVI64BIN}" ]; then
# found the 64-bit executable
SAVIBIN="${SAVI64BIN}"
- echo "SaVi: found 64-bit binary $SAVI/$SAVI64BIN" >&2
+ echo "SaVi: found 64-bit binary $SAVI64BIN" >&2
else
- echo "SaVi: couldn't find 64-bit binary $SAVI/$SAVI64BIN" >&2
+ echo "SaVi: couldn't find 64-bit binary $SAVI64BIN" >&2
NOTFOUND=yes
fi
else
@@ -211,8 +226,8 @@ if [ ! ${ARCH} = "unknown" ]; then
fi
if [ ${NOTFOUND} = yes ]; then
- echo "SaVi: couldn't find platform-specific binary $SAVI/$PLATFORMSAVIBIN" >&2
- echo "SaVi: couldn't find generic executable binary $SAVI/$SAVIBIN." >&2
+ echo "SaVi: couldn't find platform-specific binary $PLATFORMSAVIBIN" >&2
+ echo "SaVi: couldn't find generic executable binary $SAVIBIN." >&2
COMPLAIN=yes
if [ ! -f "${SAVI}/src/main.o" ]; then
echo "SaVi: can't see expected main.o object file in the $SAVI/src/ directory." >&2
@@ -243,31 +258,40 @@ fi
# Run binary
#
if [ ! -f ${SAVIBIN} ]; then
- echo "SaVi: did not attempt to launch a missing binary executable.">&2
+ echo "SaVi: did not attempt to launch a binary executable that was not found.">&2
+ exit
+fi
+
+#
+# Find what directory this script was invoked from
+#
+OLDCWD=`pwd`; export OLDCWD
+
+#
+# If savi tree has been split, with files (data/ oogl/ tcl/ maps/ and textfiles)
+# placed elsewhere, then uncomment and edit the following line to reset SAVI to
+# that other tree location.
+# SAVI=/usr/share/savi
+# This is required by Debian packagers.
+
+#
+# Change directory
+#
+cd "$SAVI"
+
+#
+# See if we need to add a -geomview flag
+#
+if [ -t 1 ]; then
+ exec > /dev/null
else
- #
- # Find what directory this script was invoked from
- #
- OLDCWD=`pwd`; export OLDCWD
-
- #
- # Change directory
- #
- cd "$SAVI"
-
- #
- # See if we need to add a -geomview flag
- #
- if [ -t 1 ]; then
- exec > /dev/null
- else
- case "$*" in
- *-geomview*) ;;
- *) set -- -geomview $*;;
- esac
+ case "$*" in
+ *-geomview*) ;;
+ *) set -- -geomview $*;;
+ esac
- # send SAVI env variable to geomview
- echo "(setenv SAVI \"$SAVI\")"
- fi
- exec ${SAVIBIN} $* ${params}
-fi
\ No newline at end of file
+ # send SAVI env variable to geomview
+ echo "(setenv SAVI \"$SAVI\")"
+fi
+
+exec ${SAVIBIN} $* ${params}
diff --git a/src/Makefile b/src/Makefile
index bc40440..cdf4ab2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for SaVi - src directory. Run top-level Makefile instead.
#
-# $Id: Makefile,v 1.43 2011/04/26 20:41:31 lloydwood Exp $
+# $Id: Makefile,v 1.45 2012/02/19 20:03:18 lloydwood Exp $
# Used for the version string. Can be overriden per-platform.
LINEEND = \\
@@ -26,12 +26,12 @@ include Makefile_defs_$(ARCH)
# zlib enables transparent gzip compression of dynamic texture scratchfiles.
# OTHER_LIBS = -lz should be inserted at end of definitions file.
- GCC_FLAGS = -O2
+ GCC_FLAGS = -O2 -DNO_ZLIB
LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm
- DEBUGFLAGS = -Wall -Wconversion -pedantic -ansi
+ DEBUGFLAGS = -Wall -Wextra -Wconversion -pedantic -ansi
# These do not find anything to warn about:
# DEBUGFLAGS = -Wshadow -Wpointer-arith -Wcast-qual \
@@ -93,7 +93,8 @@ include Makefile_defs_$(ARCH)
OTHER_SRCS = Makefile_defs_ Makefile_defs_linux Makefile_defs_cygwin \
Makefile_defs_macosx Makefile_defs_freebsd \
Makefile_defs_irix Makefile_defs_sun Makefile_defs_sun4 \
- Makefile_defs_ubuntu Makefile_defs_x86_64
+ Makefile_defs_ubuntu Makefile_defs_x86_64 \
+ Makefile_defs_cygwin84
#
# commands and flags
diff --git a/src/Makefile_defs_cygwin b/src/Makefile_defs_cygwin
index 3fccbe8..7b2899d 100644
--- a/src/Makefile_defs_cygwin
+++ b/src/Makefile_defs_cygwin
@@ -1,9 +1,11 @@
#
# Makefile_defs_cygwin
+# Definitions which work for a Windows/cygwin system running Tcl/Tk 8.5.
+# Insight Tcl/Tk was replaced in Cygwin October 2011 by a more conventional
+# unix port.
#
-# Definitions which work for a Win32/cygwin system:
+# Definitions which work for a Windows/cygwin system:
# http://www.cygwin.com/
-# Originally ported by Matthias Foehl <matthias.foehl at gmx.de>
#
# Always run make ARCH=platform from the top-level savi directory.
#
@@ -21,13 +23,7 @@
# X11 binaries are only needed if Geomview is installed. See:
# http://personal.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/building-under-Windows/
#
-# You may also need to alter the name of the tclsh
-# executable set in ~savi/tcl/Makefile
-# only if running a much older version of Cygwin.
-#
-# TK_LIBRARY = /usr/lib/tk8.4
-#
-# $Id: Makefile_defs_cygwin,v 1.7 2011/04/26 20:41:31 lloydwood Exp $
+# $Id: Makefile_defs_cygwin,v 1.9 2012/02/19 12:36:55 lloydwood Exp $
########################################################
@@ -59,7 +55,6 @@ LINEEND =
# match. #
# #
########################################################
-TCL_INCLUDES =
########################################################
# #
@@ -67,7 +62,7 @@ TCL_INCLUDES =
# libtcl.a and libtk.a. Alter to suit - see above. #
# #
########################################################
-TCL_LIBS = -ltk84 -ltcl84
+TCL_LIBS = -ltk8.5 -ltcl8.5
########################################################
# #
diff --git a/src/Makefile_defs_cygwin b/src/Makefile_defs_cygwin84
similarity index 89%
copy from src/Makefile_defs_cygwin
copy to src/Makefile_defs_cygwin84
index 3fccbe8..3c310c4 100644
--- a/src/Makefile_defs_cygwin
+++ b/src/Makefile_defs_cygwin84
@@ -1,7 +1,14 @@
#
# Makefile_defs_cygwin
#
-# Definitions which work for a Win32/cygwin system:
+# Definitions which work for a Win32/cygwin system running Insight Tcl 8.4.
+# Insight Tcl/Tk was replaced in Cygwin October 2011 by a more conventional
+# unix port.
+#
+# If you still use Insight Tcl and haven't updated, use this:
+# make ARCH=cygwin84
+# in top-level directory.
+#
# http://www.cygwin.com/
# Originally ported by Matthias Foehl <matthias.foehl at gmx.de>
#
@@ -27,7 +34,7 @@
#
# TK_LIBRARY = /usr/lib/tk8.4
#
-# $Id: Makefile_defs_cygwin,v 1.7 2011/04/26 20:41:31 lloydwood Exp $
+# $Id: Makefile_defs_cygwin84,v 1.2 2012/02/19 12:36:55 lloydwood Exp $
########################################################
diff --git a/src/Makefile_defs_freebsd b/src/Makefile_defs_freebsd
index d2ed6ab..4f3f7c7 100644
--- a/src/Makefile_defs_freebsd
+++ b/src/Makefile_defs_freebsd
@@ -1,19 +1,20 @@
#
# Makefile_defs_freebsd
#
-# Definitions which work for a FreeBSD 6.0 system
+# You must modify tcl/Makefile to call tclsh8.5 where indicated.
+
+# Definitions which first worked for FreeBSD 6.0 using Tcl/Tk 8.4
# tested at Swinburne CAIA, Melbourne, with thanks to
# Lawrence Stewart (lstewart at room52.net).
+# Now updated to Tcl/Tk 8.5 for FreeBSD 8.1.
#
# The FreeBSD ports install of Tcl and Tk seems to call everything
# blahN.N where N.N is the version number. So, you run
-# e.g. tclsh8.4. You will need to modify tcl/Makefile to
-# call tclsh8.4 where indicated.
-# Naming of libraries, e.g. -ltk84, is similar.
+# e.g. tclsh8.5. Naming of libraries, e.g. -ltk85, is similar.
# Always run make ARCH=platform from the top-level savi directory.
#
-# $Id: Makefile_defs_freebsd,v 1.5 2011/04/26 20:41:31 lloydwood Exp $
+# $Id: Makefile_defs_freebsd,v 1.7 2011/08/07 06:58:38 lloydwood Exp $
########################################################
@@ -50,7 +51,7 @@ TCL_INCLUDES = -I/usr/local/include/tcl8.5 -I/usr/local/include/tk8.5 -I/usr/X11
# libtcl.a and libtk.a. Alter to suit - see above. #
# #
########################################################
-TCL_LIBS = -ltcl84 -ltk84
+TCL_LIBS = -ltcl85 -ltk85
########################################################
# #
diff --git a/src/Makefile_defs_ubuntu b/src/Makefile_defs_ubuntu
index 72ed51b..e4b5f21 100644
--- a/src/Makefile_defs_ubuntu
+++ b/src/Makefile_defs_ubuntu
@@ -45,7 +45,7 @@ CC = gcc
# match. #
# #
########################################################
-TCL_INCLUDES = -I/usr/include/tcl -I/usr/include/tk
+TCL_INCLUDES = -I/usr/include/tcl8.5 -I/usr/include/tk8.5
########################################################
# #
@@ -56,9 +56,9 @@ TCL_INCLUDES = -I/usr/include/tcl -I/usr/include/tk
# Debian requires a dot here: -ltcl8.4 -ltk8.4
# as does Red Hat Enterprise.
-#TCL_LIBS = -ltcl8.5 -ltk8.5
+TCL_LIBS = -ltcl8.5 -ltk8.5
-TCL_LIBS = -ltcl -ltk
+# TCL_LIBS = -ltcl -ltk
# is a generic alternative to try.
@@ -70,6 +70,6 @@ TCL_LIBS = -ltcl -ltk
########################################################
OTHER_LIBS = -ldl
-OTHER_LIBS = -lz
+# OTHER_LIBS = -lz
# if zlib compression of textures to Geomview is desired.
# OTHER_LIBS = -static
diff --git a/src/Satellite.c b/src/Satellite.c
index 89871cf..572edd3 100644
--- a/src/Satellite.c
+++ b/src/Satellite.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,10 +22,10 @@
*
* Routines for Satellite object
*
- * $Id: Satellite.c,v 1.14 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: Satellite.c,v 1.17 2013/05/05 05:19:25 lloydwood Exp $
*/
-#include <strings.h>
+#include <string.h>
#include "constants.h"
#include "orbit_utils.h"
diff --git a/src/axes.c b/src/axes.c
index 85f49b7..cd3f851 100644
--- a/src/axes.c
+++ b/src/axes.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* axes.c
*
- * $Id: axes.c,v 1.15 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: axes.c,v 1.17 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdlib.h>
diff --git a/src/cones.c b/src/cones.c
index 7a3ace5..efc5da4 100644
--- a/src/cones.c
+++ b/src/cones.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* routines for cones in Geomview
*
- * $Id: cones.c,v 1.31 2011/04/26 20:41:31 lloydwood Exp $
+ * $Id: cones.c,v 1.33 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/coverage.c b/src/coverage.c
index e4f72b4..a36602c 100644
--- a/src/coverage.c
+++ b/src/coverage.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -21,7 +21,7 @@
*
* coverage.c
*
- * $Id: coverage.c,v 1.39 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: coverage.c,v 1.41 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <math.h>
#include <stdlib.h>
diff --git a/src/coverage_vis.c b/src/coverage_vis.c
index ccfcffa..d1f92fd 100644
--- a/src/coverage_vis.c
+++ b/src/coverage_vis.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* Coverage visualization routines.
*
- * $Id: coverage_vis.c,v 1.117 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: coverage_vis.c,v 1.120 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <math.h>
@@ -655,9 +655,9 @@ static int
coverage_dynamic_disk_initialised(void)
{
char line[LENGTH_LINE];
- const char name[] = "/usr/share/savi/oogl/earth.oogl";
+ const char name[] = "oogl/earth.oogl";
const char fallback_tmpnam[] = "coverage";
- const char static_name[] = "/usr/share/savi/oogl/Earth.ppm.Z";
+ const char static_name[] = "oogl/Earth.ppm.Z";
const char file_separator[] = "/";
const char file_start[] = "file \"";
const char file_end[] = "\"\n";
@@ -922,7 +922,7 @@ overlay_bitmap(unsigned int h, unsigned int w, unsigned char *b,
if (c & mask) {
*(b++) = 1;
} else {
- b++;
+ *(b++) = 0;
}
mask = mask / 2;
}
diff --git a/src/earth.c b/src/earth.c
index ec90f2b..5159475 100644
--- a/src/earth.c
+++ b/src/earth.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* Routines for creating fancy earth model
*
- * $Id: earth.c,v 1.37 2011/04/26 20:41:31 lloydwood Exp $
+ * $Id: earth.c,v 1.39 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdio.h>
#include <math.h>
@@ -115,23 +115,23 @@ earth_on_cmd(int argc, char *argv[])
if (texture_flag) {
if (!earth_texture_loaded) {
- earth_texture_loaded = gv_sendfile("/usr/share/savi/oogl/earth_texture_h.oogl");
+ earth_texture_loaded = gv_sendfile("oogl/earth_texture_h.oogl");
}
if (geomview_stream_textures && geomview_dynamic_texture_flag) {
if (coverage_projection == UNPROJECTED) {
if (debug) error("texturemap sphere, dynamic unprojected map.");
- gv_sendfile("/usr/share/savi/oogl/earth_coverage_unp_h.oogl");
+ gv_sendfile("oogl/earth_coverage_unp_h.oogl");
redraw_coverage_display();
} else if (coverage_projection == CYLINDRICAL) {
if (debug) error("texturemap sphere, dynamic cylindrical map.");
- gv_sendfile("/usr/share/savi/oogl/earth_coverage_h.oogl");
+ gv_sendfile("oogl/earth_coverage_h.oogl");
redraw_coverage_display();
} else {
if (debug) error("texturemap sphere, dynamic mapping of this projection not supported.");
if (use_fancy_earth) {
- gv_sendfile("/usr/share/savi/oogl/earth_fancy_h.oogl");
+ gv_sendfile("oogl/earth_fancy_h.oogl");
} else {
- gv_sendfile("/usr/share/savi/oogl/earth_h.oogl");
+ gv_sendfile("oogl/earth_h.oogl");
}
geomview_dynamic_coverage = FALSE;
}
@@ -143,7 +143,7 @@ earth_on_cmd(int argc, char *argv[])
} else if (use_simple_earth) {
/* static texture - blue and gold map */
if (debug) error ("texturemap sphere, simple static Earth image.\n");
- gv_sendfile("/usr/share/savi/oogl/earth_h.oogl");
+ gv_sendfile("oogl/earth_h.oogl");
gv_create_geom("Central_Body", "central_t", "earth_vect_texture_sphere_h");
} else if (use_fancy_earth) {
/* static texture - detailed texturemap */
@@ -152,7 +152,7 @@ earth_on_cmd(int argc, char *argv[])
/* 1.9.0 supports streaming and CYLINDRICAL/RECTANGULAR */
error("Detailed Earth map requires later Geomview. Please upgrade.");
}
- gv_sendfile("/usr/share/savi/oogl/earth_fancy_h.oogl");
+ gv_sendfile("oogl/earth_fancy_h.oogl");
gv_create_geom("Central_Body", "central_t", "earth_vect_texture_sphere_h");
} else {
if (debug) error ("texturemap sphere, do not draw detailed Earth.\n");
@@ -168,7 +168,7 @@ earth_on_cmd(int argc, char *argv[])
/* no texturing */
if (use_fancy_earth || use_simple_earth) {
if (debug) error ("ordinary sphere, detailed vector Earth.\n");
- earth_texture_loaded = gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
+ earth_texture_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
gv_create_geom("Central_Body", "central_t", "earth_vect_sphere_h");
} else {
if (debug) error ("ordinary sphere.");
@@ -238,7 +238,7 @@ simple_on_cmd(int argc, char *argv[])
if (geomview_module) gv_start();
if (!earth_vectors_loaded) {
- earth_vectors_loaded = gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
+ earth_vectors_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
}
if (earth_on_flag) {
@@ -247,7 +247,7 @@ simple_on_cmd(int argc, char *argv[])
} else {
/* clear sphere */
if (debug) error("clear sphere, invisible Earth body.");
- gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
+ gv_sendfile("oogl/earth_vect_h.oogl");
gv_create_geom("Central_Body", "central_t", "earth_vect_clear_h");
earth_geom_exists = TRUE;
}
@@ -304,7 +304,7 @@ fancy_on_cmd(int argc, char *argv[])
if (geomview_module) gv_start();
if (!earth_vectors_loaded) {
- earth_vectors_loaded = gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
+ earth_vectors_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
}
if (earth_on_flag) {
@@ -313,7 +313,7 @@ fancy_on_cmd(int argc, char *argv[])
} else {
/* clear sphere */
if (debug) error("clear sphere, invisible Earth body.");
- gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
+ gv_sendfile("oogl/earth_vect_h.oogl");
gv_create_geom("Central_Body", "central_t", "earth_vect_clear_h");
earth_geom_exists = TRUE;
}
diff --git a/src/fisheye.c b/src/fisheye.c
index a97aef1..4cb60e5 100644
--- a/src/fisheye.c
+++ b/src/fisheye.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* fisheye.c
*
- * $Id: fisheye.c,v 1.50 2011/04/26 20:41:31 lloydwood Exp $
+ * $Id: fisheye.c,v 1.52 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <math.h>
diff --git a/src/footprints.c b/src/footprints.c
index 543373d..f2c53b9 100644
--- a/src/footprints.c
+++ b/src/footprints.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* routines for footprints in Geomview
*
- * $Id: footprints.c,v 1.27 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: footprints.c,v 1.29 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/globals.c b/src/globals.c
index 6dcd54a..c98d1d8 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* declaration and initialization of global variables.
*
- * $Id: globals.c,v 1.40 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: globals.c,v 1.42 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <limits.h>
diff --git a/src/gv_init.c b/src/gv_init.c
index 7fce93d..1ddd456 100644
--- a/src/gv_init.c
+++ b/src/gv_init.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* Routines for displaying satellites in geomview.
*
- * $Id: gv_init.c,v 1.36 2011/04/26 20:41:31 lloydwood Exp $
+ * $Id: gv_init.c,v 1.39 2013/05/05 05:28:13 lloydwood Exp $
*/
#include <math.h>
#include <stdio.h>
@@ -37,7 +37,7 @@
#include "sats.h"
#include "globals.h"
-#define DETAILED_TEXTUREMAP_NAME "/usr/share/savi/oogl/blue_marble_land_shallow_topo_2048.jpeg"
+#define DETAILED_TEXTUREMAP_NAME "oogl/blue_marble_land_shallow_topo_2048.jpeg"
static char tname[] = "trans_ ";
@@ -169,8 +169,10 @@ gv_init()
} else {
if (strncmp(firstgoodzlibstreaming, ver, 5) > 0) {
geomview_compress2_textures = FALSE;
- error("can't talk zlib direct down a pipe to this version of Geomview.");
- error("falling back on older Geomview-spawns-gzip method used by 1.9.4 and older.");
+ if (debug) {
+ error("can't talk zlib direct down a pipe to this version of Geomview.");
+ error("falling back on older Geomview-spawns-gzip method used by 1.9.4 and older.");
+ }
}
{
FILE *f;
diff --git a/src/gv_utils.c b/src/gv_utils.c
index 6019a50..62ea18e 100644
--- a/src/gv_utils.c
+++ b/src/gv_utils.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* gv_utils.c
*
- * $Id: gv_utils.c,v 1.28 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: gv_utils.c,v 1.30 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdio.h>
#include <math.h>
diff --git a/src/include/Satellite.h b/src/include/Satellite.h
index f424e71..b8f6c07 100644
--- a/src/include/Satellite.h
+++ b/src/include/Satellite.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* Satellite.h
*
- * $Id: Satellite.h,v 1.14 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: Satellite.h,v 1.15 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _SATELLITE_H_
diff --git a/src/include/constants.h b/src/include/constants.h
index ecd2820..ac56570 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* constants.h
*
- * $Id: constants.h,v 1.22 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: constants.h,v 1.23 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef NULL
@@ -40,10 +40,10 @@
/* for file-handling routines */
#define NOT_OK -1
-#define HANDLE_FILE_SAVI "/usr/share/savi/oogl/savi.oogl"
-#define HANDLE_FILE_LOGO "/usr/share/savi/oogl/savilogo.oogl"
+#define HANDLE_FILE_SAVI "oogl/savi.oogl"
+#define HANDLE_FILE_LOGO "oogl/savilogo.oogl"
-#define AMBIENT_LIGHTING "/usr/share/savi/oogl/ambient_light.oogl"
+#define AMBIENT_LIGHTING "oogl/ambient_light.oogl"
#define EARTH_YEAR (365.25*24*3600)
#define EARTH_TILT 23.5
diff --git a/src/include/coverage_vis.h b/src/include/coverage_vis.h
index 577136b..14c12c1 100644
--- a/src/include/coverage_vis.h
+++ b/src/include/coverage_vis.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* coverage_vis.h
*
- * $Id: coverage_vis.h,v 1.33 2011/04/26 20:41:31 lloydwood Exp $
+ * $Id: coverage_vis.h,v 1.34 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _COVERAGE_VIS_H_
@@ -30,19 +30,19 @@
#include "Satellite.h"
/* bitmap of geographical boundaries for coverage */
-#define CYLINDRICAL_BITMAP_NAME "/usr/share/savi/maps/world.cyl.pbm"
-#define UNPROJECTED_BITMAP_NAME "/usr/share/savi/maps/world.unp.pbm"
-#define SPHERICAL_BITMAP_NAME "/usr/share/savi/maps/world.sph.pbm"
-#define SPHERICAL_90_BITMAP_NAME "/usr/share/savi/maps/world90W.sph.pbm"
-#define SINUSOIDAL_BITMAP_NAME "/usr/share/savi/maps/world.sinu.pbm"
-#define SINUSOIDAL_90_BITMAP_NAME "/usr/share/savi/maps/world90W.sinu.pbm"
+#define CYLINDRICAL_BITMAP_NAME "maps/world.cyl.pbm"
+#define UNPROJECTED_BITMAP_NAME "maps/world.unp.pbm"
+#define SPHERICAL_BITMAP_NAME "maps/world.sph.pbm"
+#define SPHERICAL_90_BITMAP_NAME "maps/world90W.sph.pbm"
+#define SINUSOIDAL_BITMAP_NAME "maps/world.sinu.pbm"
+#define SINUSOIDAL_90_BITMAP_NAME "maps/world90W.sinu.pbm"
-#define CYLINDRICAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.cyl.pbm"
-#define UNPROJECTED_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.unp.pbm"
-#define SPHERICAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.sph.pbm"
-#define SPHERICAL_90_LARGE_BITMAP_NAME "/usr/share/savi/maps/world90W1024.sph.pbm"
-#define SINUSOIDAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.sinu.pbm"
-#define SINUSOIDAL_90_LARGE_BITMAP_NAME "/usr/share/savi/maps/world90W1024.sinu.pbm"
+#define CYLINDRICAL_LARGE_BITMAP_NAME "maps/world1024.cyl.pbm"
+#define UNPROJECTED_LARGE_BITMAP_NAME "maps/world1024.unp.pbm"
+#define SPHERICAL_LARGE_BITMAP_NAME "maps/world1024.sph.pbm"
+#define SPHERICAL_90_LARGE_BITMAP_NAME "maps/world90W1024.sph.pbm"
+#define SINUSOIDAL_LARGE_BITMAP_NAME "maps/world1024.sinu.pbm"
+#define SINUSOIDAL_90_LARGE_BITMAP_NAME "maps/world90W1024.sinu.pbm"
#define LONGITUDE_CENTER_LINE 0.0
#define LONGITUDE_CENTER_LINE_90W (-90.0)
diff --git a/src/include/fisheye.h b/src/include/fisheye.h
index 55761e2..c477497 100644
--- a/src/include/fisheye.h
+++ b/src/include/fisheye.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* fisheye.h
*
- * $Id: fisheye.h,v 1.16 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: fisheye.h,v 1.17 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _FISHEYE_H_
diff --git a/src/include/globals.h b/src/include/globals.h
index dbcf3fe..39e5592 100644
--- a/src/include/globals.h
+++ b/src/include/globals.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* Global variable declarations
*
- * $Id: globals.h,v 1.47 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: globals.h,v 1.48 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _GLOBALS_H_
diff --git a/src/include/gv_file.h b/src/include/gv_file.h
index 6b48c18..8455737 100644
--- a/src/include/gv_file.h
+++ b/src/include/gv_file.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* gv_file.h
*
- * $Id: gv_file.h,v 1.8 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: gv_file.h,v 1.9 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _GV_FILE_H_
diff --git a/src/include/gv_utils.h b/src/include/gv_utils.h
index 1bafa50..844e2c1 100644
--- a/src/include/gv_utils.h
+++ b/src/include/gv_utils.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* gv_utils.h
*
- * $Id: gv_utils.h,v 1.17 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: gv_utils.h,v 1.18 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _GV_UTILS_H_
diff --git a/src/include/int_types.h b/src/include/int_types.h
index c9e242f..41949b2 100644
--- a/src/include/int_types.h
+++ b/src/include/int_types.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* int_types.h
*
- * $Id: int_types.h,v 1.6 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: int_types.h,v 1.7 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _INT_TYPES_H_
diff --git a/src/include/orbit_utils.h b/src/include/orbit_utils.h
index 2320603..c8eeb27 100644
--- a/src/include/orbit_utils.h
+++ b/src/include/orbit_utils.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* orbit_utils.h
*
- * $Id: orbit_utils.h,v 1.12 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: orbit_utils.h,v 1.13 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _ORBIT_UTILS_H_
diff --git a/src/include/sats.h b/src/include/sats.h
index 8fdafcf..9c23490 100644
--- a/src/include/sats.h
+++ b/src/include/sats.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* sats.h
*
- * $Id: sats.h,v 1.16 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: sats.h,v 1.17 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _SATS_H_
diff --git a/src/include/savi.h b/src/include/savi.h
index 23382fc..cdda2d4 100644
--- a/src/include/savi.h
+++ b/src/include/savi.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* headers for the different functions
*
- * $Id: savi.h,v 1.27 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: savi.h,v 1.28 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _SAVI_H_
diff --git a/src/include/stats_utils.h b/src/include/stats_utils.h
index 8095b1e..0782d00 100644
--- a/src/include/stats_utils.h
+++ b/src/include/stats_utils.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* stats_utils.h
*
- * $Id: stats_utils.h,v 1.18 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: stats_utils.h,v 1.19 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _STATS_UTILS_H_
diff --git a/src/include/tcl_utils.h b/src/include/tcl_utils.h
index 0c26511..ca3f986 100644
--- a/src/include/tcl_utils.h
+++ b/src/include/tcl_utils.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* tcl_utils.h
*
- * $Id: tcl_utils.h,v 1.16 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: tcl_utils.h,v 1.17 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _TCL_UTILS_H_
diff --git a/src/include/time.h b/src/include/time.h
index dc9fad0..46a0ac0 100644
--- a/src/include/time.h
+++ b/src/include/time.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* time.h
*
- * $Id: time.h,v 1.3 2011/01/09 20:20:02 lloydwood Exp $
+ * $Id: time.h,v 1.4 2012/01/01 02:48:41 lloydwood Exp $
*/
#ifndef _TIME_H_
diff --git a/src/include/utils.h b/src/include/utils.h
index b8247ef..3ff2ed1 100644
--- a/src/include/utils.h
+++ b/src/include/utils.h
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2012 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
diff --git a/src/logo.c b/src/logo.c
index cd45276..042abd0 100644
--- a/src/logo.c
+++ b/src/logo.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* logo.c
*
- * $Id: logo.c,v 1.12 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: logo.c,v 1.14 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdlib.h>
#include "gv_utils.h"
diff --git a/src/main.c b/src/main.c
index 392263a..2ca4b81 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* main.c
*
- * $Id: main.c,v 1.77 2011/04/26 20:41:31 lloydwood Exp $
+ * $Id: main.c,v 1.79 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdio.h>
diff --git a/src/modules.c b/src/modules.c
index c5447b7..983659e 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -26,7 +26,7 @@
* Right now, most of the calls to the modules are sprinkled
* throughout the code :(
*
- * $Id: modules.c,v 1.9 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: modules.c,v 1.11 2013/05/05 05:19:25 lloydwood Exp $
*/
#include "Satellite.h"
diff --git a/src/orbit_utils.c b/src/orbit_utils.c
index 8e6fe4f..e7d177e 100644
--- a/src/orbit_utils.c
+++ b/src/orbit_utils.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* orbit_utils.c
*
- * $Id: orbit_utils.c,v 1.18 2011/04/26 20:41:31 lloydwood Exp $
+ * $Id: orbit_utils.c,v 1.20 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdio.h>
#include <math.h>
diff --git a/src/orbits.c b/src/orbits.c
index dc87fd3..01d646a 100644
--- a/src/orbits.c
+++ b/src/orbits.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* routines to display orbits
*
- * $Id: orbits.c,v 1.21 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: orbits.c,v 1.23 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/plane.c b/src/plane.c
index 78f9a61..eb7c243 100644
--- a/src/plane.c
+++ b/src/plane.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* plane.c
*
- * $Id: plane.c,v 1.10 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: plane.c,v 1.12 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <math.h>
#include <stdlib.h>
diff --git a/src/satCmd.c b/src/satCmd.c
index aa8d9f7..ea244bd 100644
--- a/src/satCmd.c
+++ b/src/satCmd.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* procedure to implement tcl command "satellites"
*
- * $Id: satCmd.c,v 1.27 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: satCmd.c,v 1.29 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <string.h>
diff --git a/src/satellites.c b/src/satellites.c
index cc921c0..934413f 100644
--- a/src/satellites.c
+++ b/src/satellites.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* routines for satellites in Geomview
*
- * $Id: satellites.c,v 1.21 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: satellites.c,v 1.23 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/sats.c b/src/sats.c
index cf6fee2..217ce26 100644
--- a/src/sats.c
+++ b/src/sats.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* sats.c
*
- * $Id: sats.c,v 1.54 2011/04/26 20:41:31 lloydwood Exp $
+ * $Id: sats.c,v 1.56 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdlib.h>
#include <string.h>
diff --git a/src/stars.c b/src/stars.c
index b0fe091..a5c7609 100644
--- a/src/stars.c
+++ b/src/stars.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
*
* Routines for creating star field
*
- * $Id: stars.c,v 1.10 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: stars.c,v 1.12 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdio.h>
#include <math.h>
@@ -48,7 +48,7 @@ stars_on_cmd(int argc, char *argv[])
{
gv_start();
if (!stars_loaded) {
- stars_loaded = gv_sendfile("/usr/share/savi/oogl/stars_h.oogl");
+ stars_loaded = gv_sendfile("oogl/stars_h.oogl");
}
if (stars_loaded) {
gv_create_geomh("Stars", "stars_h");
diff --git a/src/stats_utils.c b/src/stats_utils.c
index 150a815..c41e346 100644
--- a/src/stats_utils.c
+++ b/src/stats_utils.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* stats_utils.c
*
- * $Id: stats_utils.c,v 1.36 2011/04/26 20:41:31 lloydwood Exp $
+ * $Id: stats_utils.c,v 1.38 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdio.h>
diff --git a/src/sun.c b/src/sun.c
index feb5a66..a0ac019 100644
--- a/src/sun.c
+++ b/src/sun.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -23,7 +23,7 @@
*
* Routines for creating fancy sun model
*
- * $Id: sun.c,v 1.11 2011/04/26 20:41:31 lloydwood Exp $
+ * $Id: sun.c,v 1.13 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdio.h>
#include <math.h>
diff --git a/src/tcl_utils.c b/src/tcl_utils.c
index cb40a5b..8745cfc 100644
--- a/src/tcl_utils.c
+++ b/src/tcl_utils.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* tcl_utils.c
*
- * $Id: tcl_utils.c,v 1.31 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: tcl_utils.c,v 1.33 2013/05/05 05:19:25 lloydwood Exp $
*/
#include "constants.h"
diff --git a/src/time.c b/src/time.c
index f229990..8f16879 100644
--- a/src/time.c
+++ b/src/time.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* time.c
*
- * $Id: time.c,v 1.14 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: time.c,v 1.16 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <math.h>
#include <stdio.h>
diff --git a/src/utils.c b/src/utils.c
index b53cc97..8c0ce97 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -6,7 +6,7 @@
* Robert Thurman.
*
* Copyright (c) 1997 by The Geometry Center.
- * Also Copyright (c) 2011 by Lloyd Wood.
+ * Also Copyright (c) 2013 by Lloyd Wood.
*
* This file is part of SaVi. SaVi is free software;
* you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
*
* utils.c
*
- * $Id: utils.c,v 1.15 2011/01/09 20:20:01 lloydwood Exp $
+ * $Id: utils.c,v 1.17 2013/05/05 05:19:25 lloydwood Exp $
*/
#include <stdlib.h>
#include <stdio.h>
diff --git a/tcl/Makefile b/tcl/Makefile
index 806993b..d8144da 100644
--- a/tcl/Makefile
+++ b/tcl/Makefile
@@ -1,7 +1,7 @@
#
# Makefile - SaVi tcl directory. Run top-level Makefile instead.
#
-# $Id: Makefile,v 1.17 2011/02/17 16:56:43 lloydwood Exp $
+# $Id: Makefile,v 1.18 2011/08/06 15:20:26 lloydwood Exp $
SHELL = /bin/sh
RM = /bin/rm -f
@@ -15,7 +15,7 @@
TCLSH = tclsh
# FreeBSD will require this uncommented
-# TCLSH = tclsh8.4
+# TCLSH = tclsh8.5
# older Cygwin and Insight Tcl may require this uncommented
# TCLSH = cygtclsh80.exe
diff --git a/tcl/about.tcl b/tcl/about.tcl
index c247017..90324e0 100644
--- a/tcl/about.tcl
+++ b/tcl/about.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -19,7 +19,7 @@
######################################################
#
# about.tcl
-# $Id: about.tcl,v 1.25 2011/04/27 21:10:07 lloydwood Exp $
+# $Id: about.tcl,v 1.27 2013/05/05 05:19:25 lloydwood Exp $
proc about(build) {} {
if {[eval window(raise) about]} return
@@ -36,7 +36,7 @@ proc about(build) {} {
set cmd [build_CmdFrame $name cmd]
set logo [canvas $cmd.logo -width 150 -height 75]
- image create photo graphic -file "/usr/share/savi/maps/savi-logo.gif"
+ image create photo graphic -file "maps/savi-logo.gif"
$logo create image 75 0 -image graphic -anchor n
pack $logo
@@ -67,7 +67,7 @@ which you should have received along with your copy of SaVi.
Copyright (c) 1995-1997 by The Geometry Center
http://www.geom.uiuc.edu/locate/SaVi
-Also Copyright (c) 2001-2011 by Lloyd Wood.
+Also Copyright (c) 2001-2013 by Lloyd Wood.
[satellites VERSION]
diff --git a/tcl/constellations.tcl b/tcl/constellations.tcl
index 78d0c71..26bd16e 100644
--- a/tcl/constellations.tcl
+++ b/tcl/constellations.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -29,7 +29,7 @@
# hard to get right. Use at own risk.
# These need considerable expansion and work.
#
-# $Id: constellations.tcl,v 1.27 2011/01/09 20:20:03 lloydwood Exp $
+# $Id: constellations.tcl,v 1.29 2013/05/05 05:19:25 lloydwood Exp $
proc walker {T P F alt inc lan_offset phase_offset} {
diff --git a/tcl/coverage.tcl b/tcl/coverage.tcl
index d35867c..a9b19de 100644
--- a/tcl/coverage.tcl
+++ b/tcl/coverage.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# coverage.tcl
#
-# $Id: coverage.tcl,v 1.141 2011/04/26 20:41:31 lloydwood Exp $
+# $Id: coverage.tcl,v 1.143 2013/05/05 05:19:25 lloydwood Exp $
# Note: IM_W and IM_H are linked to C variables for the image size
diff --git a/tcl/coverage_size.tcl b/tcl/coverage_size.tcl
index 1a37a62..74ee23a 100644
--- a/tcl/coverage_size.tcl
+++ b/tcl/coverage_size.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# coverage_size.tcl
#
-# $Id: coverage_size.tcl,v 1.12 2011/04/26 20:41:31 lloydwood Exp $
+# $Id: coverage_size.tcl,v 1.14 2013/05/05 05:19:25 lloydwood Exp $
proc coverage_size(build) {} {
global NUM_COLORS NUM_COLORS_PREV IM_H
diff --git a/tcl/details.tcl b/tcl/details.tcl
index 9a29ab3..fcf8642 100644
--- a/tcl/details.tcl
+++ b/tcl/details.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -19,7 +19,7 @@
######################################################
#
# details.tcl
-# $Id: details.tcl,v 1.14 2011/04/12 08:26:57 lloydwood Exp $
+# $Id: details.tcl,v 1.16 2013/05/05 05:19:25 lloydwood Exp $
proc details(build) {} {
global last_filename source_comments comments_text comments_file details_source
diff --git a/tcl/edit.tcl b/tcl/edit.tcl
index 3697445..f817158 100644
--- a/tcl/edit.tcl
+++ b/tcl/edit.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# edit.tcl
#
-# $Id: edit.tcl,v 1.25 2011/01/09 20:20:03 lloydwood Exp $
+# $Id: edit.tcl,v 1.27 2013/05/05 05:19:25 lloydwood Exp $
proc edit(build) {} {
global edit_oe geomview_module
diff --git a/tcl/empty.tcl b/tcl/empty.tcl
index 3e4b646..606b5dc 100644
--- a/tcl/empty.tcl
+++ b/tcl/empty.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# empty.tcl
#
-# $Id: empty.tcl,v 1.13 2011/01/09 20:20:03 lloydwood Exp $
+# $Id: empty.tcl,v 1.15 2013/05/05 05:19:26 lloydwood Exp $
proc empty(build) {} {
if {[eval window(raise) empty]} return
diff --git a/tcl/fisheye.tcl b/tcl/fisheye.tcl
index bee4f4e..e054d14 100644
--- a/tcl/fisheye.tcl
+++ b/tcl/fisheye.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# fisheye.tcl
#
-# $Id: fisheye.tcl,v 1.51 2011/02/21 17:50:46 lloydwood Exp $
+# $Id: fisheye.tcl,v 1.55 2013/05/05 05:19:26 lloydwood Exp $
proc fisheye(init) {} {
global fisheye_flag fisheye_reverse_view_flag fisheye_names_flag fisheye_numbers_flag \
@@ -118,6 +118,7 @@ proc fisheye(build) {} {
{"Bombay, India" "fisheye(set_location) 19 0 72 48 {Bombay, India}"} \
{"Brussels, Belgium" "fisheye(set_location) 50 52 4 22 {Brussels, Belgium}"} \
{"Buenos Aires, Argentina" "fisheye(set_location) -34 35 -58 22 {Buenos Aires, Argentina}"} \
+ {"Canberra, Australia" "fisheye(set_location) -35 18 149 7 {Canberra, Australia}"} \
{"Copenhagen, Denmark" "fisheye(set_location) 55 40 12 34 {Copenhagen, Denmark}"} \
{"Dublin, Eire" "fisheye(set_location) 53 20 -6 15 {Dublin, Eire}"} \
{"Lima, Peru" "fisheye(set_location) -12 0 -77 2 {Lima, Peru}"} \
@@ -130,6 +131,8 @@ proc fisheye(build) {} {
{"New York, USA" "fisheye(set_location) 40 47 -73 58 {New York, USA}"} \
{"Oslo, Norway" "fisheye(set_location) 59 57 10 42 {Oslo, Norway}"} \
{"Paris, France" "fisheye(set_location) 48 48 2 20 {Paris, France}"} \
+ {"Perth, Australia" "fisheye(set_location) -31 57 115 51 {Perth, Australia}"} \
+ {"Port Moresby, Papua New Guinea" "fisheye(set_location) -9 25 147 17 {Port Moresby, Papua New Guinea}"} \
{"Quito, Ecuador" "fisheye(set_location) 0 -14 -78 30 {Quito, Ecuador}"} \
{"San Francisco, USA" "fisheye(set_location) 37 47 -122 26 {San Francisco, USA}"} \
{"Reykjavik, Iceland" "fisheye(set_location) 64 4 -21 58 {Reykjavik, Iceland}"} \
@@ -151,6 +154,7 @@ proc fisheye(build) {} {
{"Show numbers" fisheye_numbers_flag} \
{"Show names" fisheye_names_flag} \
{"Show time in view" fisheye_times_flag} \
+ {"Plot location on map" fisheye_viewpoint_flag} \
{} \
{"Reverse fisheye view" fisheye_reverse_view_flag}
@@ -173,7 +177,7 @@ proc fisheye(build) {} {
{"Show numbers" fisheye_numbers_flag} \
{"Show names" fisheye_names_flag} \
{"Show time in view" fisheye_times_flag} \
- {"Plot location on map" fisheye_viewpoint_flag}
+ {"Plot location on map" fisheye_viewpoint_flag}
set cmdb [build_StdFrame $cmd b]
build_LabelEntryColumns $cmdb le2 \
diff --git a/tcl/geomview.tcl b/tcl/geomview.tcl
index a0547e6..8cd9515 100644
--- a/tcl/geomview.tcl
+++ b/tcl/geomview.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# geomview.tcl
#
-# $Id: geomview.tcl,v 1.14 2011/01/09 20:20:03 lloydwood Exp $
+# $Id: geomview.tcl,v 1.16 2013/05/05 05:19:26 lloydwood Exp $
proc geomview(new_camera) {} {
diff --git a/tcl/helpfile.tcl b/tcl/helpfile.tcl
index 056eb51..70b8568 100644
--- a/tcl/helpfile.tcl
+++ b/tcl/helpfile.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -19,7 +19,7 @@
######################################################
#
# textfile.tcl
-# $Id: helpfile.tcl,v 1.16 2011/04/03 22:04:07 lloydwood Exp $
+# $Id: helpfile.tcl,v 1.18 2013/05/05 05:19:26 lloydwood Exp $
proc helpfile(build) {helpfile} {
global helpfile_name helpfile_text
diff --git a/tcl/init.tcl b/tcl/init.tcl
index 3a12151..544531f 100644
--- a/tcl/init.tcl
+++ b/tcl/init.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# init.tcl
#
-# $Id: init.tcl,v 1.77 2011/04/26 20:41:31 lloydwood Exp $
+# $Id: init.tcl,v 1.80 2013/05/05 05:19:26 lloydwood Exp $
proc geomview_init {} {
global satellites_flag box_sat_flag planes_sat_flag fancy_sat_flag \
@@ -113,7 +113,7 @@ proc app_init {} {
set modifier "Command"
set modifier_indicator "Command"
set PLATFORM 1
- } elseif {[string equal [tk windowingsystem] win32]} {
+ } elseif {[string equal [tk windowingsystem] win32]||[file exists /cygdrive]} {
# Tcl on Windows - grey
set COLOR(bg) #d4d0c8
set COLOR(abg) #bbb
diff --git a/tcl/load.tcl b/tcl/load.tcl
index 8e25631..f829c17 100644
--- a/tcl/load.tcl
+++ b/tcl/load.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# load.tcl
#
-# $Id: load.tcl,v 1.15 2011/01/09 20:20:03 lloydwood Exp $
+# $Id: load.tcl,v 1.17 2013/05/05 05:19:26 lloydwood Exp $
proc load(build) {} {
diff --git a/tcl/main.tcl b/tcl/main.tcl
index 09d004d..8a683ee 100644
--- a/tcl/main.tcl
+++ b/tcl/main.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,10 +20,10 @@
#
# main.tcl
#
-# $Id: main.tcl,v 1.141 2011/04/26 20:41:31 lloydwood Exp $
+# $Id: main.tcl,v 1.146 2013/05/05 05:37:01 lloydwood Exp $
proc main(build) {} {
- global main_name COLOR FONT TITLE geomview_module last_filename
+ global main_name COLOR FONT TITLE geomview_module last_filename PLATFORM
if {[eval window(raise) main]} return
@@ -105,11 +105,17 @@ proc main(build) {} {
set cmd [build_StdFrame $main_name cmd]
+ # needs to be 78 on old 10.4 Mac with supplied Tcl/Tk to avoid crash.
+ set WIDTH 99
+ if {$PLATFORM == 1} {
+ set WIDTH 78
+ }
+
label $cmd.l -text \
- "no. semi-major axis eccentricity inclination long. asc. node arg. periapsis time to periapsis satellite name" \
+ "no. semi-major axis eccentricity inclination longitude asc. node arg. periapsis time to periapsis satellite name" \
-font $FONT(label)
listbox $cmd.lb -yscrollcommand "$cmd.scroll set" \
- -height 2 -width 78 -selectmode single \
+ -height 2 -width $WIDTH -selectmode single \
-font $FONT(fixed) -bg $COLOR(entry)
pack $cmd.l -side top -anchor w
pack $cmd.l -fill none
@@ -117,10 +123,10 @@ proc main(build) {} {
pack $cmd.lb -fill both -expand 1
bind $cmd.lb <Button-1> {main(select) [%W nearest %y]}
bind $cmd.lb <Double-Button-1> {main(dblselect) [%W nearest %y]}
- bind $cmd.lb <Shift-Button-1> {main(shiftselect) [%W nearest %y]}
- bind $cmd.lb <Shift-Double-Button-1> {main(shiftdblselect) [%W nearest %y]}
- bind $cmd.lb <Control-Button-1> {main(controlselect) [%W nearest %y]}
- bind $cmd.lb <Control-Double-Button-1> {main(controldblselect) [%W nearest %y]}
+ bind $cmd.lb <Shift-Button-1> {main(rangeselect) [%W nearest %y]}
+ bind $cmd.lb <Shift-Double-Button-1> {main(rangedblselect) [%W nearest %y]}
+ bind $cmd.lb <Control-Button-1> {main(itemselect) [%W nearest %y]}
+ bind $cmd.lb <Control-Double-Button-1> {main(itemdblselect) [%W nearest %y]}
scrollbar $cmd.scroll -command "$cmd.lb yview"
pack $cmd.scroll -side right -fill y
@@ -186,14 +192,14 @@ proc main(constellations_menu) {submenu} {
{} \
{"Clarke geostationary" "main(constellation) clarke.tcl"} \
{"Draim tetrahedral" "main(constellation) draim-4.tcl"} \
- {"Molnya" "main(constellation) molnya.tcl"} \
- {"Tundra" "main(constellation) tundra.tcl"} \
+ {"Molnya elliptical" "main(constellation) molnya.tcl"} \
+ {"Tundra elliptical" "main(constellation) tundra.tcl"} \
{"Quasi-geostationary" "main(constellation) quasi-geo.tcl"} \
{} \
{"Globalstar" "main(constellation) globalstar.tcl"} \
{"Iridium" "main(constellation) iridium-66.tcl"} \
{"Orbcomm" "main(constellation) orbcomm.tcl"} \
- {"Sirius Radio" "main(constellation) sirius-radio.tcl"} \
+ {"Sirius Radio elliptical" "main(constellation) sirius-radio.tcl"} \
{"DMC disaster monitoring" "main(constellation) dmc.tcl"} \
{"RapidEye" "main(constellation) rapideye.tcl"} \
{} \
@@ -221,7 +227,7 @@ proc main(constellations_menu) {submenu} {
{"GS2" "main(constellation) gs2.tcl"} \
{"ICO" "main(constellation) ico.tcl"} \
{"Macrocell" "main(constellation) macrocell.tcl"} \
- {"Millimeter" "main(constellation) mm.tcl"} \
+ {"Millimeter elliptical" "main(constellation) mm.tcl"} \
{"NUONCE" "main(constellation) nuonce.tcl"} \
{"Odyssey" "main(constellation) odyssey.tcl"} \
{"Spaceway NGSO" "main(constellation) spaceway-ngso.tcl"} \
@@ -499,7 +505,7 @@ proc main(dblselect) {n} {
edit(build)
}
-proc main(shiftselect) {n} {
+proc main(itemselect) {n} {
set s [.main.cmd.lb curselection]
set found [lsearch -exact $s $n]
@@ -514,12 +520,12 @@ proc main(shiftselect) {n} {
}
-proc main(shiftdblselect) {n} {
- main(shiftselect) $n
+proc main(itemdblselect) {n} {
+ main(itemselect) $n
edit(build)
}
-proc main(controlselect) {n} {
+proc main(rangeselect) {n} {
global sun_flag
set s [.main.cmd.lb curselection]
@@ -560,8 +566,8 @@ proc main(controlselect) {n} {
main(update_selection) [expr $n + (1 - $sun_flag)]
}
-proc main(controldblselect) {n} {
- main(controlselect) $n
+proc main(rangedblselect) {n} {
+ main(rangeselect) $n
edit(build)
}
@@ -641,7 +647,7 @@ proc main(constellation) {filename} {
# coverage(update_decay)
- main(load_file) "/usr/share/savi/data/$filename"
+ main(load_file) "data/$filename"
}
proc main(source_file) {filename} {
diff --git a/tcl/no_frames.tcl b/tcl/no_frames.tcl
index a35d4b4..a4fb94f 100644
--- a/tcl/no_frames.tcl
+++ b/tcl/no_frames.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# no_frames.tcl
#
-# $Id: no_frames.tcl,v 1.16 2011/04/26 20:41:31 lloydwood Exp $
+# $Id: no_frames.tcl,v 1.18 2013/05/05 05:19:26 lloydwood Exp $
proc no_frames(build) {} {
if {[eval window(raise) no_frames]} return
diff --git a/tcl/oe.tcl b/tcl/oe.tcl
index 94fe108..aacb27d 100644
--- a/tcl/oe.tcl
+++ b/tcl/oe.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -22,7 +22,7 @@
#
# Procedures for computing with orbital elements
#
-# $Id: oe.tcl,v 1.10 2011/01/09 20:20:03 lloydwood Exp $
+# $Id: oe.tcl,v 1.12 2013/05/05 05:19:26 lloydwood Exp $
proc oe_to_period {a mu} {
global PI
diff --git a/tcl/params.tcl b/tcl/params.tcl
index 598dbc7..b0f4940 100644
--- a/tcl/params.tcl
+++ b/tcl/params.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# params.tcl
#
-# $Id: params.tcl,v 1.12 2011/01/09 20:20:03 lloydwood Exp $
+# $Id: params.tcl,v 1.14 2013/05/05 05:19:26 lloydwood Exp $
proc params(build) {} {
diff --git a/tcl/random.tcl b/tcl/random.tcl
index 50e4467..71a2e8f 100644
--- a/tcl/random.tcl
+++ b/tcl/random.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -23,7 +23,7 @@
# now try:
# http://www.mit.edu/afs/sipb/project/eichin/common/public_html/random-tcl.html
#
-# $Id: random.tcl,v 1.12 2011/01/09 20:20:03 lloydwood Exp $
+# $Id: random.tcl,v 1.14 2013/05/05 05:19:26 lloydwood Exp $
proc rand(raw) {} {
global rand_seed
diff --git a/tcl/rosette.tcl b/tcl/rosette.tcl
index 394e95d..8ac4517 100644
--- a/tcl/rosette.tcl
+++ b/tcl/rosette.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# rosette.tcl
#
-# $Id: rosette.tcl,v 1.19 2011/04/08 16:44:04 lloydwood Exp $
+# $Id: rosette.tcl,v 1.21 2013/05/05 05:19:26 lloydwood Exp $
proc rosette(build) {} {
global rosette_oe coverage_angle
diff --git a/tcl/save.tcl b/tcl/save.tcl
index c2a0caf..5a087ea 100644
--- a/tcl/save.tcl
+++ b/tcl/save.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# save.tcl
#
-# $Id: save.tcl,v 1.24 2011/03/30 17:18:22 lloydwood Exp $
+# $Id: save.tcl,v 1.26 2013/05/05 05:19:26 lloydwood Exp $
proc save(build) {} {
global last_filename
diff --git a/tcl/snapshot.tcl b/tcl/snapshot.tcl
index 4ed41dc..d474735 100644
--- a/tcl/snapshot.tcl
+++ b/tcl/snapshot.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# large_snapshot.tcl
#
-# $Id: snapshot.tcl,v 1.8 2011/01/09 20:20:03 lloydwood Exp $
+# $Id: snapshot.tcl,v 1.10 2013/05/05 05:19:26 lloydwood Exp $
proc snapshot(build) {} {
global rendering_size
diff --git a/tcl/star.tcl b/tcl/star.tcl
index d606d84..09bb11a 100644
--- a/tcl/star.tcl
+++ b/tcl/star.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# star.tcl
#
-# $Id: star.tcl,v 1.6 2011/01/09 20:20:03 lloydwood Exp $
+# $Id: star.tcl,v 1.8 2013/05/05 05:19:26 lloydwood Exp $
proc star(build) {} {
global star_oe coverage_angle
diff --git a/tcl/sunlight.tcl b/tcl/sunlight.tcl
index 1d13f68..65696fd 100644
--- a/tcl/sunlight.tcl
+++ b/tcl/sunlight.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# sunlight.tcl
#
-# $Id: sunlight.tcl,v 1.8 2011/04/26 20:41:31 lloydwood Exp $
+# $Id: sunlight.tcl,v 1.10 2013/05/05 05:19:26 lloydwood Exp $
# Sunlight on Earth
diff --git a/tcl/utils.tcl b/tcl/utils.tcl
index bc9cb5b..9ed6c6b 100644
--- a/tcl/utils.tcl
+++ b/tcl/utils.tcl
@@ -6,7 +6,7 @@
# Robert Thurman.
#
# Copyright (c) 1997 by The Geometry Center.
-# Also Copyright (c) 2011 by Lloyd Wood.
+# Also Copyright (c) 2013 by Lloyd Wood.
#
# This file is part of SaVi. SaVi is free software;
# you can redistribute it and/or modify it only under
@@ -20,7 +20,7 @@
#
# utils.tcl
#
-# $Id: utils.tcl,v 1.50 2011/04/26 20:41:31 lloydwood Exp $
+# $Id: utils.tcl,v 1.54 2013/05/05 05:19:26 lloydwood Exp $
proc window(raise) {window} {
if [winfo exists .$window] {
@@ -293,8 +293,14 @@ proc build_Menu {parent args} {
set parent_window [string range $parent 0 [expr [string wordend $parent 1]-1]]
- # Do we disable on Mac to work around Mac menu+accelerator then window draw freeze bug?
+ # Do we disable on Mac to work around Mac menu+accelerator then
+ # window draw freeze bug? This problem affects 10.6 with the default
+ # supplied Tcl/Tk 8.5.7, when accelerator keys are used with Mac
+ # menus.
set disable_mac [expr ([string compare $modifier "Command"] == 0) && !$buttons_menu]
+ # Tcl 8.5.9 under 10.7.2 or ActiveTcl 8.6b1.2 don't need this,
+ # so the following line can be uncommented.
+ # set disable_mac 0
# add commands to menu
foreach arg $args {
--
satellite constellation visualisation
More information about the Pkg-grass-devel
mailing list