[savi] 07/16: Imported Upstream version 1.5.0
Bas Couwenberg
sebastic at debian.org
Fri Oct 21 16:44:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository savi.
commit 60ae864761974c9b5a2f90742137715eb9723419
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Sep 30 16:56:27 2016 +0200
Imported Upstream version 1.5.0
---
BUGS | 106 ++--
COPYRIGHT | 10 +-
PACKAGING | 29 +-
README | 61 +-
README-COVERAGE-TEXTUREMAP | 46 +-
VERSION | 2 +-
configure | 3 +-
data/ellipso.tcl | 8 +-
data/globalstar.tcl | 7 +-
data/iridium-66.tcl | 6 +-
data/nels.tcl | 7 +-
data/o3b-networks.tcl | 24 +-
manual/images/Makefile | 4 +-
manual/images/savi-fisheye.png | Bin 27774 -> 45612 bytes
manual/index.html | 38 +-
oogl/Makefile | 4 +-
oogl/ambient_light.oogl | 0
oogl/blue_marble_land_shallow_topo_2048.jpeg | Bin
oogl/earth.oogl | 7 +-
oogl/earth_texture_h.oogl | 3 +-
oogl/numesh.oogl | 844 ---------------------------
savi | 30 +-
src/Makefile | 3 +-
src/Makefile_defs_irix | 14 +-
src/Makefile_defs_linux | 4 +-
src/coverage_vis.c | 13 +-
src/fisheye.c | 26 +-
src/gv_utils.c | 6 +-
src/main.c | 10 +-
src/satCmd.c | 9 +-
src/tcl_utils.c | 18 +-
tcl/Makefile | 7 +-
tcl/about.tcl | 10 +-
tcl/coverage.tcl | 55 +-
tcl/coverage_frames.tcl | 95 +++
tcl/fisheye.tcl | 17 +-
tcl/init.tcl | 15 +-
tcl/load_url_tle.tcl | 165 ++++++
tcl/main.tcl | 10 +-
tcl/no_frames.tcl | 4 +-
40 files changed, 645 insertions(+), 1075 deletions(-)
diff --git a/BUGS b/BUGS
index e6ec624..4c4763f 100644
--- a/BUGS
+++ b/BUGS
@@ -1,9 +1,9 @@
BUGS recognized in SaVi
=======================
-$Id: BUGS,v 1.236 2016/01/27 23:41:18 lloydwood Exp $
+$Id: BUGS,v 1.246 2016/09/03 06:49:39 lloydwood Exp $
-This list of BUGS describes caveats and problems with use of
-the SaVi satellite visualization software.
+This list of BUGS describes caveats and problems with
+use of the SaVi satellite visualization software.
This document contains the following sections:
@@ -59,9 +59,10 @@ to zero - with a warning.
Two-line-element (TLE or 'elset') reading and constellation code
in tcl/constellations.tcl still needs considerable work. Reading
.tle files is experimental. This is not guaranteed for multiple
-satellites of different epochs, so you can't yet just download
-a .tle file, load it in and go.
-Improving this would make SaVi much more practical.
+satellites of different epochs, so you can't really just expect to
+download a .tle file, load it in and go.
+Improving this and introducing clock time would make SaVi far more
+practical.
(Sidereal time and the Earth's motion around the sun is not
simulated; noted by Tom Tessier.)
@@ -92,7 +93,7 @@ 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
+Store. As well as downloading and installing the Xcode app, it may be
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
@@ -102,11 +103,11 @@ install the app and necessary command-line tools. Alternatively,
the command-line tools can be installed by typing:
xcode-select --install
-Although later releases of Mac OS X include Tcl/Tk headers, they do
+Although recent releases of Mac OS X include Tcl/Tk headers, they do
not include the X11 headers that Tk needs to compile. One way to
get these headers is to install the XQuartz package from
-http://xquartz.macosforge.org/
-The XQuartz copy of X11 headers are looked for during compilation.
+http://www.xquartz.org/
+The XQuartz copies of X11 headers are looked for during compilation.
The Tcl/Tk libraries shipped with Mac OS X releases have some
user-interface problems and are prone to crashing. It is preferable
@@ -125,6 +126,9 @@ Mac Tcl issues fixed in ActiveTcl include:
-- for Geomview
+On Mac OS X 10.8 or later, you will need to install XQuartz from
+http://www.xquartz.org/ to provide an X11 environment.
+
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
@@ -135,7 +139,7 @@ and okay the sudo with a password to place Motif files where Geomview
expects to find them.
Geomview works well with OpenGL, but the OpenGL header files needed
-are not included in Xcode by default. They are an extra optional
+are not included in Xcode by default. They were an extra optional
package provided with the Mac OS X system installer. Building Geomview
with
./configure --without-opengl
@@ -209,8 +213,8 @@ iii. Other minor Mac-specific issues
b. CYGWIN ON MICROSOFT WINDOWS
-32-bit and the new 64-bit Cygwin can coexist on a PC. 32-bit Cygwin has
-better Geomview interaction, and so is preferable for SaVi.
+32-bit Cygwin and the newer 64-bit Cygwin can coexist on a Windows PC.
+32-bit Cygwin has better Geomview interaction, and so is preferable for SaVi.
If both 32-bit and 64-bit Cygwin are installed:
- Depending on which XWin the Start menu Cygwin-X folder launches,
@@ -381,7 +385,7 @@ As well as scripts that get results there needs to be a
scriptable interface to record tracefiles. Scriptable recording of
satellite-related values over time periods would be very useful;
the self-scheduling Tcl procedure model that is used in the
-network simulator ns (see below) may be worth emulating.
+network simulator ns2 (see below) may be worth emulating.
Having Tcl/C interaction daisy-chained as keywords off the 'satellites'
keyword is awkward, particularly for Geomview interaction, where a
@@ -447,10 +451,6 @@ Edit parameters) on and the feature visible for all satellites.
When checked off, disable the feature for all satellites. These would
be entries on the Rendering menu, under 'Real-time mode'.
-Update all Earth maps to track more recent political boundaries.
-A couple of pixels of west Mexican coastline are missing from the
-1024 unprojected map.
-
Provide menu of colour choices for highlights etc.
It's possible to type into the help menu text windows. That should be
@@ -521,7 +521,14 @@ will need to be updated in real time. If fisheye is open, then we
likely already know it from within the red circle, and can just
repeat it in coverage? Useful reality check by comparing the two.
-Should opening coverage panel turn on vector Geomview map overlay?.
+Should opening coverage panel turn on vector Geomview map overlay?
+
+Saving maps now supports .gif, as that's integral to Tcl. Support
+for handling .png requires a non-buggy version of Tcl 8.6 or
+later, and produces larger non-indexed files, so it's not
+a menu option - but if .png is given in the filename, an
+attempt to save as .png will be made. May need to revisit
+filetypes here at some much later point.
There are alternatives to plotting full circular footprints:
- just plotting only edges of footprints - hollow circles.
@@ -537,6 +544,15 @@ Look at masking SaVi logo onto coverage maps - this makes most sense
in corners of spherical and sinusoidal maps, but area used would
need to be discounted from coverage calculations.
+Update all Earth maps to track more recent political boundaries.
+A couple of pixels of west Mexican coastline are missing from the
+1024 unprojected map.
+
+Consider producing better outline and landmass mask maps across
+all projections, and even new projections, by generating them
+using the d3.js map drawing functionality. Unfortunately, this
+means first understanding d3.js.
+
The coverage slider position should be updated when a script
loaded from the menu changes the coverage angle.
@@ -607,8 +623,8 @@ less when the backdrop is set to black to match the outline.
How much work would be required to enable multiple coverage windows
to be spawned, so that multiple projections could be seen, and
-any available cylindrical projection used for texturemapping if
-desired? Probably a lot.
+any available cylindrical or unprojected projection is used for
+texturemapping if desired? Probably a lot.
Opening the coverage window when animating means that the coverage
playbar is not immediately updated with playbar status, and
@@ -652,7 +668,9 @@ marker list, since parallels table wraps around. Do we space markers
in RAAN or time? Would need to cut down on satellite info to just
the minimum and create a special marker group, then simplify equator
code to use it? Would this even make sense with HEO orbits, where
-markers won't be spaced evenly?
+markers won't be spaced evenly? Could we create markers for each
+satellite as lists hanging off the Satellite in the satellites
+list? Hard to keep updated.
How much work would be required to enable multiple fisheye windows
to be spawned? Probably a lot, if pass times are to be recorded in the
@@ -674,7 +692,7 @@ Saving bitmaps would be nice to have as an option. Postscript can
always be converted to a bitmap via GhostScript:
gs -dNOPAUSE -sDEVICE=png256 -r300x300 -sOutputFile=out.png -q -dBATCH out.ps
but Ghostscript is a tad unwieldy, and since you'll end up cropping the
-results anyway.... it's simpler to just take a screen capture.
+results anyway... it's simpler to just take a screen capture.
@@ -766,8 +784,7 @@ Check deleting central body and turning off simple earth.
only works in one order, should work in both.
Loading in constellation updates texturemapped coverage slowly.
-Because we need to change earth types? Might be a reason to dump
-numesh.oogl to try and simplify?
+Because we need to change earth types?
Geomview 1.8.1 points:
@@ -887,27 +904,38 @@ j. INTERACTION WITH OTHER 3D RENDERERS
Are there other 3D renderers with piped input for which SaVi could
add support?
+An alternative is to simply render the constellation in a web browser
+using d3.js. This is shown to be possible by the animations in:
+Ashlee Vance, The New Space Race: One Man's Mission To Build
+A Galactic Internet, Bloomberg News, 23 January 2015.
+http://www.bloomberg.com/news/features/2015-01-22/the-new-space-race-one-man-s-mission-to-build-a-galactic-internet-i58i2dp6
+so scripts in Javascript would replace Tcl, and d3 driving
+the browser would replace Geomview.
+
k. INTERACTION WITH OTHER SIMULATORS
-network simulator ns - http://www.isi.edu/nsnam/
+network simulator ns2 - http://www.isi.edu/nsnam/
SaVi could generate output in a format suitable for Lloyd Wood's perl
-ns satplotscripts. This really requires working intersatellite-link
-functionality to be useful; satellite positions alone doesn't give
-much unless you need a postscript map.
+ns2 satplotscripts. This really requires working intersatellite-link
+functionality to be useful; drawing satellite positions alone doesn't
+give much over the coverage panel unless you need a postscript map.
-ns could write the simplest SaVi format that describes satellites
+ns2 could write the simplest SaVi format that describes satellites
(the simple Tcl scripts that SaVi saves files as...) to allow SaVi
-to show where ns satellites are. Over time the ns and SaVi simulations
+to show where ns2 satellites are. Over time the ns2 and SaVi simulations
will diverge if SaVi is using the more complex J2 orbital model -
-the simpler J0 model should b preferable in this case.
+the simpler J0 model should be preferable in this case.
-As of ns 2.1b8, the default ns output format for Lloyd Wood's perl ns
+The default ns output format for Lloyd Wood's perl ns2
satplotscripts describes long/lat position, but does not include
-orbital information such as altitude, making it useless for SaVi as
-it stands. A new format is needed.
+orbital information such as altitude, making it useless for SaVi
+to simulate from files in that format as it stands. A new format
+would be needed.
+
+ns3 does not yet include satellite simulation functionality.
@@ -916,10 +944,14 @@ l. DESIRABLE CONSTELLATIONS TO SIMULATE
Newly-announced large satellite constellations, e.g. OneWeb, LeoSat,
are not yet simulated well because their geometries are not known.
Unlike the efforts of the 1990s, these have not filed public
-designs with the US FCC, and are less open about their technical
-choices. Adding simulations of these once they are public would
+designs with the US FCC, and seem less open about their technical
+choices. Better simulations of these once they are public would
be good. Details are at http://www.oneweb.net http://www.leosat.com
+Add a Chinese BeiDou-2 navigation constellation simulation script.
+The complete perfect BeiDou-2 constellation has five geostationary,
+three inclined geosynchronous, and 27 medium earth orbit satellites.
+
4. REMAINING INTEGRATION WORK FROM UNRELEASED SAVI 1.1
diff --git a/COPYRIGHT b/COPYRIGHT
index 4d6cd3c..3e32c72 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,19 +1,19 @@
COPYRIGHT FOR SaVi
==================
-$Id: COPYRIGHT,v 1.27 2016/01/28 00:28:42 lloydwood Exp $
+$Id: COPYRIGHT,v 1.28 2016/04/21 06:11:34 lloydwood Exp $
This contains:
-1. Additional copyright for the SaVi 1.2, 1.3 and 1.4 releases.
+1. Additional copyright for the SaVi 1.2, 1.3, 1.4 and 1.5 releases.
2. Original copyright for SaVi 1.0.
-1. ADDITIONAL COPYRIGHT FOR THE SaVi 1.2, 1.3 AND 1.4 RELEASES
-==============================================================
+1. ADDITIONAL COPYRIGHT FOR THE SaVi 1.2, 1.3, 1.4 AND 1.5 RELEASES
+===================================================================
Enhancements to and modifications of SaVi 1.0, expressed in the
-SaVi 1.2, 1.3 and 1.4 releases, are:
+SaVi 1.2, 1.3, 1.4 and 1.5 releases, are:
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Lloyd Wood.
diff --git a/PACKAGING b/PACKAGING
index e7064d7..c6b0134 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -1,6 +1,6 @@
PACKAGING SaVi FOR RELEASES AND BINARY DISTRIBUTION
==================================================
-$Id: PACKAGING,v 1.21 2016/01/26 08:23:38 lloydwood Exp $
+$Id: PACKAGING,v 1.24 2016/09/03 03:39:36 lloydwood Exp $
1. Packaging SaVi for binary distribution
2. Packaging SaVi for releases
@@ -18,6 +18,8 @@ SaVi requires Tcl and Tk as package dependencies. Most makefiles and
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.
+geomview and gifsicle are optional dependencies.
+
Once you have compiled SaVi, check that the SaVi help menu's 'About SaVi...'
dialog indicating the compilation date and build source is suitable.
@@ -78,27 +80,28 @@ Individual files may be replaced with files from CVS, or have CVS
information removed should changes warrant.
a. Delete /savi-dev and pull a fresh copy from the CVS repository.
-b. Mark CVS HEAD with cvs tag savi_1_4_X. Commit.
+b. Mark CVS HEAD with cvs tag savi_1_5_X. Commit.
c. Edit end of README to indicate version and major changes.
d. Update VERSION to X+1 development, commit.
e. Delete and pull another fresh copy to avoid e.g. editing backup files.
f. Remove all CVS directories. Remember src/include/CVS, manual/images/CVS.
\rm -fr CVS; \rm -fr */CVS; \rm -fr */*/CVS
g. Edit VERSION to indicate release and give date.
-h. Edit configure script variable to indicate version. Delete CVS Id line.
-i. Rename savi-dev/ to savi1.4.X/ to indicate version.
-j. Check for unneeded executable bits on all source files, e.g.
+h. Edit src/Makefile to comment DEBUGFLAGS lines. Delete CVS Id line.
+i. Edit configure script variable to indicate version. Delete CVS Id line.
+j. Rename savi-dev/ to savi1.5.X/ to indicate version.
+k. Check for unneeded executable bits on all source files, e.g.
chmod -x tcl/sunlight.tcl, src/sun.c, manual/index.html, manual/images/*,
data/o3b-networks.tcl, data/skybridge-80.tcl, data/us-patent-*, maps/*
(since permissions can't be fixed in the CVS original).
-k. touch -t all directories with a suitable timestamp, starting with
- src/include, ending with savi1.4.X. Also touch configure and VERSION.
-l. Create tarball (tar cvf savi1.4.X-release.tar savi1.4.X), touch, gzip -9.
-m. tar xvfz elsewhere and build to check all works.
-n. Pull copy of savi-dev/ from CVS and build for further work.
-o. Put tarball on sourceforge, local webpages, update pages.
-p. Announce on mailing lists etc.
- Announce on Sourceforge News: http://sourceforge.net/p/savi/news/
+l. touch -t all directories with a suitable timestamp, starting with
+ src/include, ending with savi1.5.X. Also touch configure and VERSION.
+m. Create tarball (tar cvf savi1.5.X-release.tar savi1.5.X), touch, gzip -9.
+n. tar xvfz elsewhere and build to check all works.
+o. Pull copy of savi-dev/ from CVS and build for further work.
+p. Put tarball on sourceforge, local webpages, update pages.
+q. Announce on mailing lists etc. Announce on SourceForge blog.
+ Announce on SourceForge News: http://sourceforge.net/p/savi/news/
Announce on fresh(code): http://freshcode.club
diff --git a/README b/README
index 59c734b..8e26017 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
README for SaVi - SATELLITE CONSTELLATION SIMULATION AND VISUALIZATION
======================================================================
-$Id: README,v 1.136 2016/01/29 22:09:01 lloydwood Exp $
+$Id: README,v 1.148 2016/09/04 11:48:09 lloydwood Exp $
This README supplied with the SaVi satellite visualization software
contains the following sections:
@@ -72,13 +72,15 @@ 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 5.3.0, 4.9 back to 4.0, 3.4 to 3.2,
- and 2.95.
+ - most recently tested and built with gcc 5.4.0.
+ previously tested with gcc 4.9 back to 4.0, 3.4 to 3.2, and 2.95.
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.6.4.
+ Use of the Http package for loading TLEs from the web demands
+ a minimum of Tcl/Tk 8.0.
Use of the Tk color picker and load/save file dialogs demands
a minimum of Tcl/Tk 7.6/4.2.
Tcl/Tk 8.x gives increased performance, and is recommended.
@@ -89,36 +91,50 @@ SaVi requires:
The savi wrapper script in this directory, and the Makefile_defs_
files in the src/ directory, assume that Tcl/Tk 8.5 are available,
and will need to be edited if other versions are used.
- On RedHat/Fedora/CentOS etc. try: yum install tk-devel
- On Ubuntu/Debian etc. try: apt-get install tk-dev
+ On RedHat/Fedora/CentOS etc. try: sudo yum install tk-devel
+ On Ubuntu/Debian etc. try: sudo apt-get install tk-dev
SaVi can optionally use:
- - Geomview, discussed below.
+ - Geomview, discussed below,
+ for three-dimensional animations.
- most recently tested with Geomview 1.9.5.
- the zlib compression library, from http://www.zlib.net/
+ for compressing texturemap images sent to Geomview.
- most recently tested with zlib 1.2.8. zlib is most useful with
Geomview. To build with zlib to compress dynamic texturemaps that
- are sent to Geomview, remove the -DNO_ZLIB flag from src/Makefile.
- On RedHat/Fedora/CentOS etc. try: yum install zlib-devel
- On Ubuntu/Debian etc. try: apt-get install zlib1g-dev
+ are sent to Geomview, edit src/Makefile to remove the -DNO_ZLIB flag.
+ On RedHat/Fedora/CentOS etc. try: sudo yum install zlib-devel
+ On Ubuntu/Debian etc. try: sudo apt-get install zlib1g-dev
+ - gifsicle, from http://lcdf.org/gifsicle/
+ for saving animations of satellite coverage.
+ - most recently tested with LCDF Gifsicle 1.78.
+ On Ubuntu/Debian etc. try: sudo apt-get install gifsicle
SaVi has been successfully compiled and run on the following architectures
and unix-like operating systems:
- Intel x86 and PowerPC / Macintosh OS X
- (10.9.5, 10.7.2, 10.6.8, 10.5.8, 10.4.11)
+ (10.11.6, 10.9.5, 10.7.2, 10.6.8, 10.5.8, 10.4.11)
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 (2.4.0, 1.7.10 to .29; 1.5.9-1 to .25-11)
+ - Intel x86 / Windows running Cygwin (most recently tested with 2.6.0,
+ previously Cygwin 1.7.10 to .29 and 1.5.9-1 to .25-11)
Geomview support demands 32-bit Cygwin, not 64-bit - see BUGS.
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 / Windows 10 Anniversary Update
+ Enable developer mode and install bash, install and run the Xming
+ web server from http://xming.sf.net and then launch bash and type:
+ sudo apt-get savi
+ sudo apt-get geomview
+ set DISPLAY=:0
+ geomview -run savi
- Intel x86 / Linux (Ubuntu 14, 13, 10, 9, 8; CentOS 6.5, Fedora 12;
Red Hat 6.x, 7.x and Enterprise 3.0; Mandrake 9.0; Mandriva One 2010)
Ubuntu users - you must read the instructions in
@@ -148,8 +164,8 @@ Geomview is available from:
http://geomview.sourceforge.net/
On Ubuntu/Debian etc., where these packages are maintained:
- apt-get install geomview
- apt-get install savi
+ sudo apt-get install geomview
+ sudo apt-get install savi
will save you the effort of compiling Geomview.
SaVi was most recently tested with Geomview 1.9.5.
@@ -157,8 +173,6 @@ The 1.9 releases significantly improve stability, compatibility and
performance over 1.8.1. The latest Geomview release (as of writing,
1.9.5) is strongly recommended for all platforms.
-Geomview 1.6 or later is needed for SaVi's optional texture mapping.
-Geomview 1.9 or later have vastly improved texture mapping.
For texture mapping, SaVi can optionally use the zlib compression
library to compress the dynamic coverage texturemaps that are sent to
Geomview. Compile zlib support by removing the -DNO_ZLIB flag from
@@ -197,7 +211,8 @@ as $SAVI.
That is, if you are a user and have unpacked SaVi in your home
directory, then $SAVI would be the topmost SaVi directory
~user/saviX.Y.Z that contains this README file that you are now
-reading.
+reading. This is a shorthand; $SAVI is determined by the
+$SAVI/savi script that launches SaVi.
1.) In $SAVI/src/Makefile_defs_ARCH (where ARCH is linux, cygwin,
@@ -287,16 +302,16 @@ directory. Do not run the binary executable directly.
and then select "SaVi" from Geomview's scrollable list of external
modules, where it will have appeared. Or invoke directly:
- geomview -run savi [flags] <script filename>
+ geomview -run ./savi [flags] <script filename>
Or from any directory where you can start Geomview, try
- geomview -run savi [flags] <script filename>
+ geomview -run ./savi [flags] <script filename>
You might invoke a saved one-line script, to pass parameters
through to SaVi:
- geomview -run savi [always-on flags] $*
+ geomview -run ./savi [always-on flags] $*
To see SaVi listed as an external module in Geomview's main
window whenever Geomview is launched alone, Geomview has to know
@@ -338,7 +353,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.8/savi -geomview")
+ (emodule-define "SaVi" "/usr/local/savi1.5.0/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.:
@@ -460,6 +475,12 @@ an indent of two spaces, while Tcl code uses an indent of four spaces.
8. VERSION HISTORY OF SAVI
==========================
+1.5.0 Coverage gif animations with gifsicle, can load TLES
+ from the web. September 2016.
+
+1.4.9 Coverage "Show map" now controls Geomview, removes legacy
+ disk scratchfile texturemapping method. January 2016.
+
1.4.8 Bugfixes to new colorful coverage map. Wider support for
Tcl/Tk 8.6. January 2015.
diff --git a/README-COVERAGE-TEXTUREMAP b/README-COVERAGE-TEXTUREMAP
index 46e43e2..a0cbeb4 100644
--- a/README-COVERAGE-TEXTUREMAP
+++ b/README-COVERAGE-TEXTUREMAP
@@ -1,6 +1,6 @@
TEXTUREMAPPING IN GEOMVIEW from SaVi
====================================
-$Id: README-COVERAGE-TEXTUREMAP,v 1.46 2016/01/26 08:23:38 lloydwood Exp $
+$Id: README-COVERAGE-TEXTUREMAP,v 1.48 2016/09/03 06:49:39 lloydwood Exp $
This README supplied with the SaVi satellite visualization software
supplements the main README textfile. This contains the following sections:
@@ -16,7 +16,7 @@ For SaVi and Geomview users:
4. Troubleshooting problems
- common problems and workarounds.
5. Enabling texturemap compression
- - how to improve performance by decreasing disk accesses.
+ - how to alter performance by decreasing the amount of data piped.
For programmers interested in how texturemapping with Geomview works:
@@ -44,8 +44,7 @@ circles over these texturemaps by turning on 'Show footprints'.
The simple Earth map is SaVi's traditional blue-and-gold texture. This
map is a cylindrical projection in oogl/Earth.ppm.gz, and is loaded by
-oogl/earth.oogl. This map works with Geomview 1.6 and later, and uses
-Geomview's traditional texture mesh defined in oogl/numesh.oogl.
+oogl/earth.oogl.
The detailed Earth map is freely available from NASA's Blue Marble project.
This unprojected map is in
@@ -116,7 +115,7 @@ Geomview to texturemap, at the expense of Earth maps in SaVi's coverage
panel, as the available bitmaps are not scaled to match. Smaller maps
can also be selected to reduce the amount of computing done by SaVi and
Geomview. Texturemap compression is recommended for sending large
-bitmaps to Geomview, as pipe use or disk access is decreased. See
+bitmaps to Geomview, as pipe use can be decreased. See
section 5 of this document for how to enable texturemap compression.
-uncompressed
@@ -150,9 +149,9 @@ rebuilding Geomview.
==================================
Texturemaps sent from SaVi to Geomview can be transparently compressed
-using zlib where available. This increases performance by decreasing
-the amount of writing to, reading from, and waiting for pipe or disk
-that is required.
+using zlib where available. This can alter performance by decreasing
+the amount of writing to, reading from, and waiting for pipe that is
+required.
You can tell whether compression is working by SaVi's status messages
in the console window where savi was launched.
@@ -178,25 +177,34 @@ SaVi can tell you whether compression support was included when building
SaVi in its About dialog from the Help menu.
SaVi's support for texturemapping varies depending on the version of
-Geomview used, with the default being the newest method. Older
-methods are supported via command-line options described earlier.
-Geomview 1.8.x
- - dynamic coverage texturemaps were last supported in SaVi 1.4.8.
- Static Earth texturemaps are still available.
+Geomview used, with the default being the newest method available
+for that version of Geomview. Older methods can be supported via
+command-line options described earlier.
+
Geomview 1.9.x
- static and dynamic texturemaps are supported.
Compressed and uncompressed texturemaps may be piped to Geomview
- directly, for a significant performance improvement.
+ directly.
Cylindrical and unprojected coverage projections are supported.
- * Geomview 1.9.0 to 1.9.4:
- - piped compressed texturemaps are handled by spawning a gzip
- process to uncompress them.
* Geomview 1.9.5 and later:
- Geomview handles decompression internally rather than spawning
gzip to uncompress, for a minor performance improvement.
Texturemaps may also be piped to Geomview using zlib's
compress2 (.zlib) directly without added gzip (.gz) headers,
which greatly simplifies coding.
+ * Geomview 1.9.0 to 1.9.4:
+ - piped compressed texturemaps are handled by spawning a gzip
+ process to uncompress them.
+
+Geomview 1.8.x
+ - dynamic coverage texturemaps were last supported in SaVi 1.4.8,
+ where a temporary scratchfile using the cylindrical projection
+ was written to and read from disk repeatedly. That legacy method
+ is no longer available.
+ Static Earth texturemaps were last supported in SaVi 1.4.9,
+ where numesh.oogl was used insteas of the STSPHERE command.
+ That legacy method is no longer available.
+
The following sections are only of interest to programmers.
@@ -239,8 +247,8 @@ in Geomview.
Note that Geomview 1.9's STSPHERE uses CYLINDRICAL for unprojected
maps and RECTANGULAR for cylindrical projections, which is backwards.
-(Geomview 1.8.1 does not support STSPHERE, and requires oogl/numesh.oogl
-to support only cylindrical projections.)
+(Geomview 1.8.1 does not support STSPHERE, and required the older
+oogl/numesh.oogl to support only cylindrical projections.)
More correct image/grid handling for multiple grids would probably
require a pointer to the image stored in grid structure we're passing
diff --git a/VERSION b/VERSION
index cd33552..f81457a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.9 release (30 January 2016)
+1.5.0 release (4 September 2016)
diff --git a/configure b/configure
index b4ebec4..22ab2b8 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,6 @@
#! /bin/sh
-# $Id: configure,v 1.29 2013/01/29 12:16:08 lloydwood Exp $
-VERSION="savi-dev"
+VERSION="savi1.5.0"
echo "Please read the $VERSION/README file."
echo
diff --git a/data/ellipso.tcl b/data/ellipso.tcl
index 1cc6d38..6960444 100644
--- a/data/ellipso.tcl
+++ b/data/ellipso.tcl
@@ -22,7 +22,7 @@
# * Not built. Ellipsat Inc. announced an alliance with ICO/Teledesic
# * in March 2001.
# *
-# $Id: ellipso.tcl,v 1.10 2016/01/09 23:04:34 lloydwood Exp $
+# $Id: ellipso.tcl,v 1.11 2016/05/05 08:04:44 lloydwood Exp $
# to ensure overlapping coverage in the northern hemisphere
set coverage_angle 25
@@ -80,12 +80,14 @@ set inc 0
set Omega 0.0
set omega 0.0
+set SATS_PER_PLANE 6
+
# compute period of orbit
set T_per [expr 2 * $PI * pow($a,1.5) / sqrt($MU)]
satellites GV_BEGIN
-for {set i 0} {$i < 6} {incr i} {
- set T [expr $T_per*$i/6]
+for {set i 0} {$i < $SATS_PER_PLANE} {incr i} {
+ set T [expr $T_per*$i/$SATS_PER_PLANE]
satellites LOAD $a $e $inc $Omega $omega $T "Ellipso-Concordia ($i)"
}
satellites GV_END
diff --git a/data/globalstar.tcl b/data/globalstar.tcl
index 95f420d..1fe0e24 100644
--- a/data/globalstar.tcl
+++ b/data/globalstar.tcl
@@ -30,12 +30,13 @@
# * and preventing voice service on a number of Globalstar satellites
# * are another limitation on service availability.
# *
-# * A replacement Globalstar-2 constellation is planned, with
-# * satellites under construction by Thales Alenia Space in France.
+# * A replacement Globalstar-2 constellation was completely launched
+# * and in service as of September 2013, with satellites built by
+# * Thales Alenia Space in France. Ocean coverage remains limited.
# *
# * See also http://www.globalstar.com/
#
-# $Id: globalstar.tcl,v 1.13 2016/01/09 23:04:34 lloydwood Exp $
+# $Id: globalstar.tcl,v 1.14 2016/08/16 02:02:59 lloydwood Exp $
set SATS_PER_PLANE 6
set NUM_PLANES 8
diff --git a/data/iridium-66.tcl b/data/iridium-66.tcl
index c5a70a1..a223456 100644
--- a/data/iridium-66.tcl
+++ b/data/iridium-66.tcl
@@ -29,14 +29,14 @@
# * descending (going (south) satellites overlap more to ensure
# * continuous coverage.
# *
-# * A replacement Iridium NEXT constellation is planned, with
-# * satellites under construction by Thales Alenia Space in France.
+# * A replacement Iridium NEXT constellation being launched, with
+# * satellites built by Thales Alenia Space in France.
# *
# * See http://www.iridium.com/
# *
# * Uses intersatellite links, which are not yet simulated here.
-# $Id: iridium-66.tcl,v 1.12 2016/01/09 23:04:34 lloydwood Exp $
+# $Id: iridium-66.tcl,v 1.13 2016/08/16 02:02:59 lloydwood Exp $
set SATS_PER_PLANE 11
set NUM_PLANES 6
diff --git a/data/nels.tcl b/data/nels.tcl
index a7cebbc..55f2925 100644
--- a/data/nels.tcl
+++ b/data/nels.tcl
@@ -20,7 +20,8 @@
# * of the 2003 Joint Conference on Satellite Communications (JC-SAT
# * 2003), National Museum of Emerging Science and Innovation, Tokyo,
# * 23-24 October 2003, pp. 181-193.
-# * http://register.itfind.or.kr/Report01/200401/KOSST/KOSST-0005/KOSST-0005.pdf
+# http://register.itfind.or.kr/Report01/200401/KOSST/KOSST-0005/KOSST-0005.pdf
+# *
# * This paper builds on the ideas in Lloyd Wood's PhD thesis (ch. 6)
# * and 2001 AIAA diversity paper.
#
@@ -38,7 +39,7 @@
# this script for SaVi by Lloyd Wood (lloydwood at users.sourceforge.net)
# http://personal.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/
#
-# $Id: nels.tcl,v 1.10 2015/08/31 01:29:33 lloydwood Exp $
+# $Id: nels.tcl,v 1.11 2016/08/17 03:50:02 lloydwood Exp $
set SATS_PER_PLANE 12
set NUM_PLANES 10
@@ -88,5 +89,5 @@ satellites GV_END
# * R. Suzuki and Y. Yasuda, Study on ISL network structure in LEO satellite
# * communication systems, Acta Astronautica, vol. 61, issues 7-8,
# * October 2007, pp. 648-658.
-# * http://dx.doi.org/10.1016/j.actaastro.2006.11.015
+# http://dx.doi.org/10.1016/j.actaastro.2006.11.015
# * which recommends changes to that geometry.
diff --git a/data/o3b-networks.tcl b/data/o3b-networks.tcl
index 0aa2d3b..1ef5b1d 100644
--- a/data/o3b-networks.tcl
+++ b/data/o3b-networks.tcl
@@ -12,7 +12,6 @@
# * Google, SES, and others. First four satellites launched in June 2013,
# * with operational traffic from January 2014. Second four satellites
# * launched July 2014. Third four satellites launched December 2014.
-# *
# Satellite altitude has been altered slightly over time. See:
#
@@ -34,30 +33,35 @@
# this script for SaVi by Lloyd Wood (lloydwood at users.sourceforge.net)
# http://personal.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/
#
-# $Id: o3b-networks.tcl,v 1.20 2015/08/31 01:29:33 lloydwood Exp $
+# $Id: o3b-networks.tcl,v 1.21 2016/05/13 01:41:14 lloydwood Exp $
-# * A stated deployment of eight satellites at 8,062km altitude,
-# * but only six were active, due to power converter problems with
-# * the first four satellites. Two of the faulty satellites are not
-# * in service, acting as on-orbit spares for the other two.
+# * Stated deployment of satellites at 8,062km altitude,
+# * but only six of the first eight satellites launched were active,
+# * due to power converter problems with the first four satellites.
+# * Two of the faulty satellites are not in service, acting as
+# * on-orbit spares for the other two. See:
# * 'Two O3b Satellites Taken Out of Service as a Precaution,'
# * Peter de Selding, Space News, 11 September 2014.
# *
# * After four further satellites were launched in December 2014,
-# * we presume that ten satellites are active.
+# * it was reported in May 2016 that nine satellites are active. See:
+# * 'SES to take control of O3b Networks,' Space Daily, 6 May 2016.
# *
# http://www.spacenews.com/article/satellite-telecom/41831world-satellite-business-week-two-o3b-satellites-taken-out-of-service
+# http://www.spacedaily.com/resports/SES_to_take_control_of_O3b_Networks_999.html
-# * There is a comparison with Ellipso's proposed six-satellite
-# * Concordia ring:
+# * O3b Networks has announced intent to launch satellites to
+# * high-inclination orbits to cover polar latitudes. There is
+# * a comparison with the Ellipso design, which does just that:
# *
# * Lloyd Wood, Yuxuan Lou, and Opeoluwa Olusola, 'Revisiting
# * elliptical satellite orbits to enhance the O3b constellation',
# * Journal of the British Interplanetary Society, vol. 67, no. 3,
# * pp. 110-118, March 2014.
+# http://personal.ee.surrey.ac.uk/Personal/L.Wood/O3b-polar/
# http://arxiv.org/abs/1407.2521
-set NUM_SATS [expr 4 - 2 + 4 + 4]
+set NUM_SATS [expr 4 - 2 + 4 + 4 - 1]
# setup orbital elements
set a [expr 8062.0+$RADIUS_OF_EARTH]
diff --git a/manual/images/Makefile b/manual/images/Makefile
index 1dc923b..2057d17 100644
--- a/manual/images/Makefile
+++ b/manual/images/Makefile
@@ -1,14 +1,14 @@
#
# Makefile - savi manual/images directory. Run top-level Makefile instead.
#
-# $Id: Makefile,v 1.4 2011/04/26 12:14:45 lloydwood Exp $
+# $Id: Makefile,v 1.5 2016/08/31 07:03:03 lloydwood Exp $
SHELL = /bin/sh
RM = /bin/rm -f
OTHER_SRCS = savi-choose.png savi-constants.png savi-coverage.png \
savi-edit.png savi-empty.png savi-fisheye.png savi-main.png \
- savi-rosette.png savi-spot.png
+ savi-rosette.png savi-spot.png savi-tle.png
all:
diff --git a/manual/images/savi-fisheye.png b/manual/images/savi-fisheye.png
index 5f235f9..72e4f98 100644
Binary files a/manual/images/savi-fisheye.png and b/manual/images/savi-fisheye.png differ
diff --git a/manual/index.html b/manual/index.html
index 6eb7f37..11de6a4 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.60 2014/12/26 14:18:13 lloydwood Exp $ -->
+<!-- $Id: index.html,v 1.63 2016/08/31 07:07:43 lloydwood Exp $ -->
<link rel="icon" href="images/savi-spot.png" TYPE="image/png">
</head>
<style type="text/css" media="screen, projection">
@@ -164,7 +164,7 @@ from Earth normal is not for the faint of heart.
</p>
<p align="center">
-<img src="images/savi-constants.png"><br>
+<img src="images/savi-constants.png" alt="SaVi's simulation constants"><br>
<b>Simulation constants - to see this, use the Edit menu.</b>
</p>
@@ -193,19 +193,24 @@ The simulations on this menu are split into several groups:
<li>other system proposals (not built)</li>
<li>sample TLE (two-line element) files. Although <i>SaVi</i> has very elementary TLE
parsing capabilities, simulation from TLEs is not at all accurate! This is still
-experimental, and not recommended for use.</li>
+experimental, and not recommended for use. Up-to-date TLEs can be loaded from the web
+via the command on the <b>File</b> menu.</li>
</ul>
+<p align="center">
+<img src="images/savi-tle.png" alt="SaVi's elset loading tool"><br>
+<b>TLE loading tool - to see this, use the File menu.</b>
+</p>
<p>
Decriptions of these systems are available in the Details window that is always
-accessible from the <b>Help</b> menu. Many of these constellations are described in a <a href="http://info.ee.surrey.ac.uk/Personal/L.Wood/publications/talks.html#isu-summer-06">tutorial
-introducing satellite constellations</a> given to the International Space University.
+accessible from the <b>Help</b> menu. Many of these constellations are described in
+<a href="http://savi.sourceforge.net/about/">material introducing satellite constellations</a>.
</p>
<p>
Note that loading in a constellation from the menu replaces all existing satellites.
To add a constellation to existing satellites that you wish to preserve, use Load... in
-the File menu, and load in a Tcl script from <i>SaVi</i>'s <code>data/</code> directory.
+the <b>File</b> menu, and load in a Tcl script from <i>SaVi</i>'s <code>data/</code> directory.
</p>
<p>
@@ -214,7 +219,7 @@ which can also generate a number of preset constellations.
</p>
<p align="center">
-<img src="images/savi-rosette.png"><br>
+<img src="images/savi-rosette.png" alt="SaVi's rosette generator tool"><br>
<b>Ballard rosette tool - to see this, use the Constellations menu.</b>
</p>
@@ -225,7 +230,7 @@ select Empty space, and confirm the dialog that comes up.
</p>
<p align="center">
-<img src="images/savi-empty.png"><br>
+<img src="images/savi-empty.png" alt="SaVi's 'Empty space?' dialog"><br>
<b>Empty space of all satellites dialog - to see this, use the Constellations menu.</b>
</p>
@@ -256,7 +261,7 @@ slower computers.
</p>
<p>
-The Help menu identifies <i>SaVi</i> and provides brief installation information.
+The <b>Help</b> menu identifies <i>SaVi</i> and provides brief installation information.
</p>
<h2><a name="coverage">3. The coverage panel</a></h2>
@@ -279,7 +284,7 @@ satellites, such as the GPS and Galileo navigation constellations.
</p>
<p align="center">
-<img src="images/savi-choose.png" alt="choose coverage parameters"></br>
+<img src="images/savi-choose.png" alt="SaVi's choose coverage parameters dialog"></br>
<b>Choose coverage panel size/colours - to see, use Views menu on main window.</b>
</p>
@@ -288,7 +293,7 @@ After you have chosen, the coverage panel will open. Here, the smaller
coverage panel is shown.
<p align="center">
-<img src="images/savi-coverage.png" alt="coverage panel"></br>
+<img src="images/savi-coverage.png" alt="SaVi's coverage panel"></br>
<b>Coverage panel - to see, use Views menu on main window.</b>
</p>
@@ -358,10 +363,11 @@ purple, rather than green, as will their groundtracks.
</p>
<p>
-Still map snapshots can be saved from the <b>File</b> menu. A simple <code>ppm</code>
-bitmap format is used, and compressed with gzip. These files can be read directly
-with <b>The Gimp</b> (GNU Image Manipulation Program, available from
-<a href="http://www.gimp.org/">http://www.gimp.org/</a>).
+Still and animated map snapshots can be saved from the <b>File</b> menu.
+These are saved in <code>.gif</code> format. Stills can also be saved using
+the simple <code>ppm</code> bitmap format, and <code>.png</code> if it is supported.
+Map animations require <code><a href="https://www.lcdf.org/gifsicle/">gifsicle</a></code>
+to create.
</p>
<p>
@@ -403,7 +409,7 @@ floating on the sea just off the coast of Africa).
</p>
<p align="center">
-<img src="images/savi-fisheye.png"><br>
+<img src="images/savi-fisheye.png" alt="SaVi's fisheye window"><br>
<b>Fisheye panel - to see, use Views menu on main window.</b>
</p>
diff --git a/oogl/Makefile b/oogl/Makefile
index e9456df..ecd07c1 100644
--- a/oogl/Makefile
+++ b/oogl/Makefile
@@ -1,7 +1,7 @@
#
# Makefile - savi oogl directory. Run top-level Makefile instead.
#
-# $Id: Makefile,v 1.12 2015/12/15 12:35:10 lloydwood Exp $
+# $Id: Makefile,v 1.13 2016/09/03 06:49:39 lloydwood Exp $
SHELL = /bin/sh
RM = /bin/rm -f
@@ -9,7 +9,7 @@
OTHER_SRCS = savi.oogl savilogo.oogl \
stars_h.oogl stars.oogl ambient_light.oogl \
earth_h.oogl earth.oogl earth_fancy_h.oog earth_fancy.oogl \
- numesh.oogl Earth.ppm.Z blue_marble_land_shallow_topo_2048.jpeg \
+ Earth.ppm.Z blue_marble_land_shallow_topo_2048.jpeg \
earth_vect_h.oogl earth.vect \
earth_texture_h.oogl \
earth_coverage_h.oogl earth_coverage.oogl \
diff --git a/oogl/ambient_light.oogl b/oogl/ambient_light.oogl
old mode 100755
new mode 100644
diff --git a/oogl/blue_marble_land_shallow_topo_2048.jpeg b/oogl/blue_marble_land_shallow_topo_2048.jpeg
old mode 100755
new mode 100644
diff --git a/oogl/earth.oogl b/oogl/earth.oogl
index 53766ff..be561dc 100644
--- a/oogl/earth.oogl
+++ b/oogl/earth.oogl
@@ -1,4 +1,4 @@
-# $Id: earth.oogl,v 1.5 2015/12/15 12:35:10 lloydwood Exp $
+# $Id: earth.oogl,v 1.6 2016/09/03 06:49:39 lloydwood Exp $
appearance {
material { diffuse 0.839 1.000 0.461 }
@@ -16,7 +16,4 @@ appearance {
}
}
}
-{: numesh_h }
-
-# STSPHERE RECTANGULAR 1 0 0 0
-# only works with Geomview 1.9.0 or later.
+STSPHERE RECTANGULAR 1 0 0 0
diff --git a/oogl/earth_texture_h.oogl b/oogl/earth_texture_h.oogl
index f8e5842..05d6136 100644
--- a/oogl/earth_texture_h.oogl
+++ b/oogl/earth_texture_h.oogl
@@ -10,9 +10,8 @@
# http://savi.sourceforge.net/
# http://www.geom.uiuc.edu/locate/SaVi
-# $Id: earth_texture_h.oogl,v 1.1 2008/04/02 02:21:55 lloydwood Exp $
+# $Id: earth_texture_h.oogl,v 1.2 2016/09/03 06:49:39 lloydwood Exp $
# loaded ready for Earth texturemaps.
-(read geometry { define numesh_h < "$SAVI/oogl/numesh.oogl" })
(read geometry { define earth_h < "$SAVI/oogl/earth.oogl" })
diff --git a/oogl/numesh.oogl b/oogl/numesh.oogl
deleted file mode 100644
index c799925..0000000
--- a/oogl/numesh.oogl
+++ /dev/null
@@ -1,844 +0,0 @@
-# $Id: numesh.oogl,v 1.3 2011/04/26 20:41:31 lloydwood Exp $
-# Component of all Earth sphere texturemaps.
-# mkearthtx -rectangular 40 20
-NUMESH
-41 20
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.0000 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.0250 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.0500 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.0750 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.1000 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.1250 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.1500 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.1750 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.2000 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.2250 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.2500 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.2750 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.3000 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.3250 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.3500 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.3750 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.4000 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.4250 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.4500 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.4750 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.5000 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.5250 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.5500 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.5750 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.6000 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.6250 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.6500 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.6750 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.7000 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.7250 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.7500 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.7750 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.8000 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.8250 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.8500 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.8750 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.9000 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.9250 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.9500 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 0.9750 1.0000 0
-0.0000 0.0000 1.0000 0.000 0.000 1.000 1.0000 1.0000 0
-
-0.1646 0.0000 0.9864 0.165 0.000 0.986 0.0000 0.9932 0
-0.1626 0.0257 0.9864 0.163 0.026 0.986 0.0250 0.9932 0
-0.1565 0.0509 0.9864 0.157 0.051 0.986 0.0500 0.9932 0
-0.1467 0.0747 0.9864 0.147 0.075 0.986 0.0750 0.9932 0
-0.1332 0.0967 0.9864 0.133 0.097 0.986 0.1000 0.9932 0
-0.1164 0.1164 0.9864 0.116 0.116 0.986 0.1250 0.9932 0
-0.0967 0.1332 0.9864 0.097 0.133 0.986 0.1500 0.9932 0
-0.0747 0.1467 0.9864 0.075 0.147 0.986 0.1750 0.9932 0
-0.0509 0.1565 0.9864 0.051 0.157 0.986 0.2000 0.9932 0
-0.0257 0.1626 0.9864 0.026 0.163 0.986 0.2250 0.9932 0
-0.0000 0.1646 0.9864 0.000 0.165 0.986 0.2500 0.9932 0
--0.0257 0.1626 0.9864 -0.026 0.163 0.986 0.2750 0.9932 0
--0.0509 0.1565 0.9864 -0.051 0.157 0.986 0.3000 0.9932 0
--0.0747 0.1467 0.9864 -0.075 0.147 0.986 0.3250 0.9932 0
--0.0967 0.1332 0.9864 -0.097 0.133 0.986 0.3500 0.9932 0
--0.1164 0.1164 0.9864 -0.116 0.116 0.986 0.3750 0.9932 0
--0.1332 0.0967 0.9864 -0.133 0.097 0.986 0.4000 0.9932 0
--0.1467 0.0747 0.9864 -0.147 0.075 0.986 0.4250 0.9932 0
--0.1565 0.0509 0.9864 -0.157 0.051 0.986 0.4500 0.9932 0
--0.1626 0.0257 0.9864 -0.163 0.026 0.986 0.4750 0.9932 0
--0.1646 0.0000 0.9864 -0.165 0.000 0.986 0.5000 0.9932 0
--0.1626 -0.0257 0.9864 -0.163 -0.026 0.986 0.5250 0.9932 0
--0.1565 -0.0509 0.9864 -0.157 -0.051 0.986 0.5500 0.9932 0
--0.1467 -0.0747 0.9864 -0.147 -0.075 0.986 0.5750 0.9932 0
--0.1332 -0.0967 0.9864 -0.133 -0.097 0.986 0.6000 0.9932 0
--0.1164 -0.1164 0.9864 -0.116 -0.116 0.986 0.6250 0.9932 0
--0.0967 -0.1332 0.9864 -0.097 -0.133 0.986 0.6500 0.9932 0
--0.0747 -0.1467 0.9864 -0.075 -0.147 0.986 0.6750 0.9932 0
--0.0509 -0.1565 0.9864 -0.051 -0.157 0.986 0.7000 0.9932 0
--0.0257 -0.1626 0.9864 -0.026 -0.163 0.986 0.7250 0.9932 0
-0.0000 -0.1646 0.9864 0.000 -0.165 0.986 0.7500 0.9932 0
-0.0257 -0.1626 0.9864 0.026 -0.163 0.986 0.7750 0.9932 0
-0.0509 -0.1565 0.9864 0.051 -0.157 0.986 0.8000 0.9932 0
-0.0747 -0.1467 0.9864 0.075 -0.147 0.986 0.8250 0.9932 0
-0.0967 -0.1332 0.9864 0.097 -0.133 0.986 0.8500 0.9932 0
-0.1164 -0.1164 0.9864 0.116 -0.116 0.986 0.8750 0.9932 0
-0.1332 -0.0967 0.9864 0.133 -0.097 0.986 0.9000 0.9932 0
-0.1467 -0.0747 0.9864 0.147 -0.075 0.986 0.9250 0.9932 0
-0.1565 -0.0509 0.9864 0.157 -0.051 0.986 0.9500 0.9932 0
-0.1626 -0.0257 0.9864 0.163 -0.026 0.986 0.9750 0.9932 0
-0.1646 0.0000 0.9864 0.165 0.000 0.986 1.0000 0.9932 0
-
-0.3247 0.0000 0.9458 0.325 0.000 0.946 0.0000 0.9729 0
-0.3207 0.0508 0.9458 0.321 0.051 0.946 0.0250 0.9729 0
-0.3088 0.1003 0.9458 0.309 0.100 0.946 0.0500 0.9729 0
-0.2893 0.1474 0.9458 0.289 0.147 0.946 0.0750 0.9729 0
-0.2627 0.1909 0.9458 0.263 0.191 0.946 0.1000 0.9729 0
-0.2296 0.2296 0.9458 0.230 0.230 0.946 0.1250 0.9729 0
-0.1909 0.2627 0.9458 0.191 0.263 0.946 0.1500 0.9729 0
-0.1474 0.2893 0.9458 0.147 0.289 0.946 0.1750 0.9729 0
-0.1003 0.3088 0.9458 0.100 0.309 0.946 0.2000 0.9729 0
-0.0508 0.3207 0.9458 0.051 0.321 0.946 0.2250 0.9729 0
-0.0000 0.3247 0.9458 0.000 0.325 0.946 0.2500 0.9729 0
--0.0508 0.3207 0.9458 -0.051 0.321 0.946 0.2750 0.9729 0
--0.1003 0.3088 0.9458 -0.100 0.309 0.946 0.3000 0.9729 0
--0.1474 0.2893 0.9458 -0.147 0.289 0.946 0.3250 0.9729 0
--0.1909 0.2627 0.9458 -0.191 0.263 0.946 0.3500 0.9729 0
--0.2296 0.2296 0.9458 -0.230 0.230 0.946 0.3750 0.9729 0
--0.2627 0.1909 0.9458 -0.263 0.191 0.946 0.4000 0.9729 0
--0.2893 0.1474 0.9458 -0.289 0.147 0.946 0.4250 0.9729 0
--0.3088 0.1003 0.9458 -0.309 0.100 0.946 0.4500 0.9729 0
--0.3207 0.0508 0.9458 -0.321 0.051 0.946 0.4750 0.9729 0
--0.3247 0.0000 0.9458 -0.325 0.000 0.946 0.5000 0.9729 0
--0.3207 -0.0508 0.9458 -0.321 -0.051 0.946 0.5250 0.9729 0
--0.3088 -0.1003 0.9458 -0.309 -0.100 0.946 0.5500 0.9729 0
--0.2893 -0.1474 0.9458 -0.289 -0.147 0.946 0.5750 0.9729 0
--0.2627 -0.1909 0.9458 -0.263 -0.191 0.946 0.6000 0.9729 0
--0.2296 -0.2296 0.9458 -0.230 -0.230 0.946 0.6250 0.9729 0
--0.1909 -0.2627 0.9458 -0.191 -0.263 0.946 0.6500 0.9729 0
--0.1474 -0.2893 0.9458 -0.147 -0.289 0.946 0.6750 0.9729 0
--0.1003 -0.3088 0.9458 -0.100 -0.309 0.946 0.7000 0.9729 0
--0.0508 -0.3207 0.9458 -0.051 -0.321 0.946 0.7250 0.9729 0
-0.0000 -0.3247 0.9458 0.000 -0.325 0.946 0.7500 0.9729 0
-0.0508 -0.3207 0.9458 0.051 -0.321 0.946 0.7750 0.9729 0
-0.1003 -0.3088 0.9458 0.100 -0.309 0.946 0.8000 0.9729 0
-0.1474 -0.2893 0.9458 0.147 -0.289 0.946 0.8250 0.9729 0
-0.1909 -0.2627 0.9458 0.191 -0.263 0.946 0.8500 0.9729 0
-0.2296 -0.2296 0.9458 0.230 -0.230 0.946 0.8750 0.9729 0
-0.2627 -0.1909 0.9458 0.263 -0.191 0.946 0.9000 0.9729 0
-0.2893 -0.1474 0.9458 0.289 -0.147 0.946 0.9250 0.9729 0
-0.3088 -0.1003 0.9458 0.309 -0.100 0.946 0.9500 0.9729 0
-0.3207 -0.0508 0.9458 0.321 -0.051 0.946 0.9750 0.9729 0
-0.3247 0.0000 0.9458 0.325 0.000 0.946 1.0000 0.9729 0
-
-0.4759 0.0000 0.8795 0.476 0.000 0.879 0.0000 0.9397 0
-0.4701 0.0745 0.8795 0.470 0.074 0.879 0.0250 0.9397 0
-0.4527 0.1471 0.8795 0.453 0.147 0.879 0.0500 0.9397 0
-0.4241 0.2161 0.8795 0.424 0.216 0.879 0.0750 0.9397 0
-0.3850 0.2798 0.8795 0.385 0.280 0.879 0.1000 0.9397 0
-0.3365 0.3365 0.8795 0.337 0.337 0.879 0.1250 0.9397 0
-0.2798 0.3850 0.8795 0.280 0.385 0.879 0.1500 0.9397 0
-0.2161 0.4241 0.8795 0.216 0.424 0.879 0.1750 0.9397 0
-0.1471 0.4527 0.8795 0.147 0.453 0.879 0.2000 0.9397 0
-0.0745 0.4701 0.8795 0.074 0.470 0.879 0.2250 0.9397 0
-0.0000 0.4759 0.8795 0.000 0.476 0.879 0.2500 0.9397 0
--0.0745 0.4701 0.8795 -0.074 0.470 0.879 0.2750 0.9397 0
--0.1471 0.4527 0.8795 -0.147 0.453 0.879 0.3000 0.9397 0
--0.2161 0.4241 0.8795 -0.216 0.424 0.879 0.3250 0.9397 0
--0.2798 0.3850 0.8795 -0.280 0.385 0.879 0.3500 0.9397 0
--0.3365 0.3365 0.8795 -0.337 0.337 0.879 0.3750 0.9397 0
--0.3850 0.2798 0.8795 -0.385 0.280 0.879 0.4000 0.9397 0
--0.4241 0.2161 0.8795 -0.424 0.216 0.879 0.4250 0.9397 0
--0.4527 0.1471 0.8795 -0.453 0.147 0.879 0.4500 0.9397 0
--0.4701 0.0745 0.8795 -0.470 0.074 0.879 0.4750 0.9397 0
--0.4759 0.0000 0.8795 -0.476 0.000 0.879 0.5000 0.9397 0
--0.4701 -0.0745 0.8795 -0.470 -0.074 0.879 0.5250 0.9397 0
--0.4527 -0.1471 0.8795 -0.453 -0.147 0.879 0.5500 0.9397 0
--0.4241 -0.2161 0.8795 -0.424 -0.216 0.879 0.5750 0.9397 0
--0.3850 -0.2798 0.8795 -0.385 -0.280 0.879 0.6000 0.9397 0
--0.3365 -0.3365 0.8795 -0.337 -0.337 0.879 0.6250 0.9397 0
--0.2798 -0.3850 0.8795 -0.280 -0.385 0.879 0.6500 0.9397 0
--0.2161 -0.4241 0.8795 -0.216 -0.424 0.879 0.6750 0.9397 0
--0.1471 -0.4527 0.8795 -0.147 -0.453 0.879 0.7000 0.9397 0
--0.0745 -0.4701 0.8795 -0.074 -0.470 0.879 0.7250 0.9397 0
-0.0000 -0.4759 0.8795 0.000 -0.476 0.879 0.7500 0.9397 0
-0.0745 -0.4701 0.8795 0.074 -0.470 0.879 0.7750 0.9397 0
-0.1471 -0.4527 0.8795 0.147 -0.453 0.879 0.8000 0.9397 0
-0.2161 -0.4241 0.8795 0.216 -0.424 0.879 0.8250 0.9397 0
-0.2798 -0.3850 0.8795 0.280 -0.385 0.879 0.8500 0.9397 0
-0.3365 -0.3365 0.8795 0.337 -0.337 0.879 0.8750 0.9397 0
-0.3850 -0.2798 0.8795 0.385 -0.280 0.879 0.9000 0.9397 0
-0.4241 -0.2161 0.8795 0.424 -0.216 0.879 0.9250 0.9397 0
-0.4527 -0.1471 0.8795 0.453 -0.147 0.879 0.9500 0.9397 0
-0.4701 -0.0745 0.8795 0.470 -0.074 0.879 0.9750 0.9397 0
-0.4759 0.0000 0.8795 0.476 0.000 0.879 1.0000 0.9397 0
-
-0.6142 0.0000 0.7891 0.614 0.000 0.789 0.0000 0.8946 0
-0.6067 0.0961 0.7891 0.607 0.096 0.789 0.0250 0.8946 0
-0.5842 0.1898 0.7891 0.584 0.190 0.789 0.0500 0.8946 0
-0.5473 0.2788 0.7891 0.547 0.279 0.789 0.0750 0.8946 0
-0.4969 0.3610 0.7891 0.497 0.361 0.789 0.1000 0.8946 0
-0.4343 0.4343 0.7891 0.434 0.434 0.789 0.1250 0.8946 0
-0.3610 0.4969 0.7891 0.361 0.497 0.789 0.1500 0.8946 0
-0.2788 0.5473 0.7891 0.279 0.547 0.789 0.1750 0.8946 0
-0.1898 0.5842 0.7891 0.190 0.584 0.789 0.2000 0.8946 0
-0.0961 0.6067 0.7891 0.096 0.607 0.789 0.2250 0.8946 0
-0.0000 0.6142 0.7891 0.000 0.614 0.789 0.2500 0.8946 0
--0.0961 0.6067 0.7891 -0.096 0.607 0.789 0.2750 0.8946 0
--0.1898 0.5842 0.7891 -0.190 0.584 0.789 0.3000 0.8946 0
--0.2788 0.5473 0.7891 -0.279 0.547 0.789 0.3250 0.8946 0
--0.3610 0.4969 0.7891 -0.361 0.497 0.789 0.3500 0.8946 0
--0.4343 0.4343 0.7891 -0.434 0.434 0.789 0.3750 0.8946 0
--0.4969 0.3610 0.7891 -0.497 0.361 0.789 0.4000 0.8946 0
--0.5473 0.2788 0.7891 -0.547 0.279 0.789 0.4250 0.8946 0
--0.5842 0.1898 0.7891 -0.584 0.190 0.789 0.4500 0.8946 0
--0.6067 0.0961 0.7891 -0.607 0.096 0.789 0.4750 0.8946 0
--0.6142 0.0000 0.7891 -0.614 0.000 0.789 0.5000 0.8946 0
--0.6067 -0.0961 0.7891 -0.607 -0.096 0.789 0.5250 0.8946 0
--0.5842 -0.1898 0.7891 -0.584 -0.190 0.789 0.5500 0.8946 0
--0.5473 -0.2788 0.7891 -0.547 -0.279 0.789 0.5750 0.8946 0
--0.4969 -0.3610 0.7891 -0.497 -0.361 0.789 0.6000 0.8946 0
--0.4343 -0.4343 0.7891 -0.434 -0.434 0.789 0.6250 0.8946 0
--0.3610 -0.4969 0.7891 -0.361 -0.497 0.789 0.6500 0.8946 0
--0.2788 -0.5473 0.7891 -0.279 -0.547 0.789 0.6750 0.8946 0
--0.1898 -0.5842 0.7891 -0.190 -0.584 0.789 0.7000 0.8946 0
--0.0961 -0.6067 0.7891 -0.096 -0.607 0.789 0.7250 0.8946 0
-0.0000 -0.6142 0.7891 0.000 -0.614 0.789 0.7500 0.8946 0
-0.0961 -0.6067 0.7891 0.096 -0.607 0.789 0.7750 0.8946 0
-0.1898 -0.5842 0.7891 0.190 -0.584 0.789 0.8000 0.8946 0
-0.2788 -0.5473 0.7891 0.279 -0.547 0.789 0.8250 0.8946 0
-0.3610 -0.4969 0.7891 0.361 -0.497 0.789 0.8500 0.8946 0
-0.4343 -0.4343 0.7891 0.434 -0.434 0.789 0.8750 0.8946 0
-0.4969 -0.3610 0.7891 0.497 -0.361 0.789 0.9000 0.8946 0
-0.5473 -0.2788 0.7891 0.547 -0.279 0.789 0.9250 0.8946 0
-0.5842 -0.1898 0.7891 0.584 -0.190 0.789 0.9500 0.8946 0
-0.6067 -0.0961 0.7891 0.607 -0.096 0.789 0.9750 0.8946 0
-0.6142 0.0000 0.7891 0.614 0.000 0.789 1.0000 0.8946 0
-
-0.7357 0.0000 0.6773 0.736 0.000 0.677 0.0000 0.8386 0
-0.7267 0.1151 0.6773 0.727 0.115 0.677 0.0250 0.8386 0
-0.6997 0.2274 0.6773 0.700 0.227 0.677 0.0500 0.8386 0
-0.6555 0.3340 0.6773 0.656 0.334 0.677 0.0750 0.8386 0
-0.5952 0.4324 0.6773 0.595 0.432 0.677 0.1000 0.8386 0
-0.5202 0.5202 0.6773 0.520 0.520 0.677 0.1250 0.8386 0
-0.4324 0.5952 0.6773 0.432 0.595 0.677 0.1500 0.8386 0
-0.3340 0.6555 0.6773 0.334 0.656 0.677 0.1750 0.8386 0
-0.2274 0.6997 0.6773 0.227 0.700 0.677 0.2000 0.8386 0
-0.1151 0.7267 0.6773 0.115 0.727 0.677 0.2250 0.8386 0
-0.0000 0.7357 0.6773 0.000 0.736 0.677 0.2500 0.8386 0
--0.1151 0.7267 0.6773 -0.115 0.727 0.677 0.2750 0.8386 0
--0.2274 0.6997 0.6773 -0.227 0.700 0.677 0.3000 0.8386 0
--0.3340 0.6555 0.6773 -0.334 0.656 0.677 0.3250 0.8386 0
--0.4324 0.5952 0.6773 -0.432 0.595 0.677 0.3500 0.8386 0
--0.5202 0.5202 0.6773 -0.520 0.520 0.677 0.3750 0.8386 0
--0.5952 0.4324 0.6773 -0.595 0.432 0.677 0.4000 0.8386 0
--0.6555 0.3340 0.6773 -0.656 0.334 0.677 0.4250 0.8386 0
--0.6997 0.2274 0.6773 -0.700 0.227 0.677 0.4500 0.8386 0
--0.7267 0.1151 0.6773 -0.727 0.115 0.677 0.4750 0.8386 0
--0.7357 0.0000 0.6773 -0.736 0.000 0.677 0.5000 0.8386 0
--0.7267 -0.1151 0.6773 -0.727 -0.115 0.677 0.5250 0.8386 0
--0.6997 -0.2274 0.6773 -0.700 -0.227 0.677 0.5500 0.8386 0
--0.6555 -0.3340 0.6773 -0.656 -0.334 0.677 0.5750 0.8386 0
--0.5952 -0.4324 0.6773 -0.595 -0.432 0.677 0.6000 0.8386 0
--0.5202 -0.5202 0.6773 -0.520 -0.520 0.677 0.6250 0.8386 0
--0.4324 -0.5952 0.6773 -0.432 -0.595 0.677 0.6500 0.8386 0
--0.3340 -0.6555 0.6773 -0.334 -0.656 0.677 0.6750 0.8386 0
--0.2274 -0.6997 0.6773 -0.227 -0.700 0.677 0.7000 0.8386 0
--0.1151 -0.7267 0.6773 -0.115 -0.727 0.677 0.7250 0.8386 0
-0.0000 -0.7357 0.6773 0.000 -0.736 0.677 0.7500 0.8386 0
-0.1151 -0.7267 0.6773 0.115 -0.727 0.677 0.7750 0.8386 0
-0.2274 -0.6997 0.6773 0.227 -0.700 0.677 0.8000 0.8386 0
-0.3340 -0.6555 0.6773 0.334 -0.656 0.677 0.8250 0.8386 0
-0.4324 -0.5952 0.6773 0.432 -0.595 0.677 0.8500 0.8386 0
-0.5202 -0.5202 0.6773 0.520 -0.520 0.677 0.8750 0.8386 0
-0.5952 -0.4324 0.6773 0.595 -0.432 0.677 0.9000 0.8386 0
-0.6555 -0.3340 0.6773 0.656 -0.334 0.677 0.9250 0.8386 0
-0.6997 -0.2274 0.6773 0.700 -0.227 0.677 0.9500 0.8386 0
-0.7267 -0.1151 0.6773 0.727 -0.115 0.677 0.9750 0.8386 0
-0.7357 0.0000 0.6773 0.736 0.000 0.677 1.0000 0.8386 0
-
-0.8372 0.0000 0.5469 0.837 0.000 0.547 0.0000 0.7735 0
-0.8269 0.1310 0.5469 0.827 0.131 0.547 0.0250 0.7735 0
-0.7962 0.2587 0.5469 0.796 0.259 0.547 0.0500 0.7735 0
-0.7459 0.3801 0.5469 0.746 0.380 0.547 0.0750 0.7735 0
-0.6773 0.4921 0.5469 0.677 0.492 0.547 0.1000 0.7735 0
-0.5920 0.5920 0.5469 0.592 0.592 0.547 0.1250 0.7735 0
-0.4921 0.6773 0.5469 0.492 0.677 0.547 0.1500 0.7735 0
-0.3801 0.7459 0.5469 0.380 0.746 0.547 0.1750 0.7735 0
-0.2587 0.7962 0.5469 0.259 0.796 0.547 0.2000 0.7735 0
-0.1310 0.8269 0.5469 0.131 0.827 0.547 0.2250 0.7735 0
-0.0000 0.8372 0.5469 0.000 0.837 0.547 0.2500 0.7735 0
--0.1310 0.8269 0.5469 -0.131 0.827 0.547 0.2750 0.7735 0
--0.2587 0.7962 0.5469 -0.259 0.796 0.547 0.3000 0.7735 0
--0.3801 0.7459 0.5469 -0.380 0.746 0.547 0.3250 0.7735 0
--0.4921 0.6773 0.5469 -0.492 0.677 0.547 0.3500 0.7735 0
--0.5920 0.5920 0.5469 -0.592 0.592 0.547 0.3750 0.7735 0
--0.6773 0.4921 0.5469 -0.677 0.492 0.547 0.4000 0.7735 0
--0.7459 0.3801 0.5469 -0.746 0.380 0.547 0.4250 0.7735 0
--0.7962 0.2587 0.5469 -0.796 0.259 0.547 0.4500 0.7735 0
--0.8269 0.1310 0.5469 -0.827 0.131 0.547 0.4750 0.7735 0
--0.8372 0.0000 0.5469 -0.837 0.000 0.547 0.5000 0.7735 0
--0.8269 -0.1310 0.5469 -0.827 -0.131 0.547 0.5250 0.7735 0
--0.7962 -0.2587 0.5469 -0.796 -0.259 0.547 0.5500 0.7735 0
--0.7459 -0.3801 0.5469 -0.746 -0.380 0.547 0.5750 0.7735 0
--0.6773 -0.4921 0.5469 -0.677 -0.492 0.547 0.6000 0.7735 0
--0.5920 -0.5920 0.5469 -0.592 -0.592 0.547 0.6250 0.7735 0
--0.4921 -0.6773 0.5469 -0.492 -0.677 0.547 0.6500 0.7735 0
--0.3801 -0.7459 0.5469 -0.380 -0.746 0.547 0.6750 0.7735 0
--0.2587 -0.7962 0.5469 -0.259 -0.796 0.547 0.7000 0.7735 0
--0.1310 -0.8269 0.5469 -0.131 -0.827 0.547 0.7250 0.7735 0
-0.0000 -0.8372 0.5469 0.000 -0.837 0.547 0.7500 0.7735 0
-0.1310 -0.8269 0.5469 0.131 -0.827 0.547 0.7750 0.7735 0
-0.2587 -0.7962 0.5469 0.259 -0.796 0.547 0.8000 0.7735 0
-0.3801 -0.7459 0.5469 0.380 -0.746 0.547 0.8250 0.7735 0
-0.4921 -0.6773 0.5469 0.492 -0.677 0.547 0.8500 0.7735 0
-0.5920 -0.5920 0.5469 0.592 -0.592 0.547 0.8750 0.7735 0
-0.6773 -0.4921 0.5469 0.677 -0.492 0.547 0.9000 0.7735 0
-0.7459 -0.3801 0.5469 0.746 -0.380 0.547 0.9250 0.7735 0
-0.7962 -0.2587 0.5469 0.796 -0.259 0.547 0.9500 0.7735 0
-0.8269 -0.1310 0.5469 0.827 -0.131 0.547 0.9750 0.7735 0
-0.8372 0.0000 0.5469 0.837 0.000 0.547 1.0000 0.7735 0
-
-0.9158 0.0000 0.4017 0.916 0.000 0.402 0.0000 0.7008 0
-0.9045 0.1433 0.4017 0.904 0.143 0.402 0.0250 0.7008 0
-0.8710 0.2830 0.4017 0.871 0.283 0.402 0.0500 0.7008 0
-0.8160 0.4158 0.4017 0.816 0.416 0.402 0.0750 0.7008 0
-0.7409 0.5383 0.4017 0.741 0.538 0.402 0.1000 0.7008 0
-0.6475 0.6475 0.4017 0.648 0.648 0.402 0.1250 0.7008 0
-0.5383 0.7409 0.4017 0.538 0.741 0.402 0.1500 0.7008 0
-0.4158 0.8160 0.4017 0.416 0.816 0.402 0.1750 0.7008 0
-0.2830 0.8710 0.4017 0.283 0.871 0.402 0.2000 0.7008 0
-0.1433 0.9045 0.4017 0.143 0.904 0.402 0.2250 0.7008 0
-0.0000 0.9158 0.4017 0.000 0.916 0.402 0.2500 0.7008 0
--0.1433 0.9045 0.4017 -0.143 0.904 0.402 0.2750 0.7008 0
--0.2830 0.8710 0.4017 -0.283 0.871 0.402 0.3000 0.7008 0
--0.4158 0.8160 0.4017 -0.416 0.816 0.402 0.3250 0.7008 0
--0.5383 0.7409 0.4017 -0.538 0.741 0.402 0.3500 0.7008 0
--0.6475 0.6475 0.4017 -0.648 0.648 0.402 0.3750 0.7008 0
--0.7409 0.5383 0.4017 -0.741 0.538 0.402 0.4000 0.7008 0
--0.8160 0.4158 0.4017 -0.816 0.416 0.402 0.4250 0.7008 0
--0.8710 0.2830 0.4017 -0.871 0.283 0.402 0.4500 0.7008 0
--0.9045 0.1433 0.4017 -0.904 0.143 0.402 0.4750 0.7008 0
--0.9158 0.0000 0.4017 -0.916 0.000 0.402 0.5000 0.7008 0
--0.9045 -0.1433 0.4017 -0.904 -0.143 0.402 0.5250 0.7008 0
--0.8710 -0.2830 0.4017 -0.871 -0.283 0.402 0.5500 0.7008 0
--0.8160 -0.4158 0.4017 -0.816 -0.416 0.402 0.5750 0.7008 0
--0.7409 -0.5383 0.4017 -0.741 -0.538 0.402 0.6000 0.7008 0
--0.6475 -0.6475 0.4017 -0.648 -0.648 0.402 0.6250 0.7008 0
--0.5383 -0.7409 0.4017 -0.538 -0.741 0.402 0.6500 0.7008 0
--0.4158 -0.8160 0.4017 -0.416 -0.816 0.402 0.6750 0.7008 0
--0.2830 -0.8710 0.4017 -0.283 -0.871 0.402 0.7000 0.7008 0
--0.1433 -0.9045 0.4017 -0.143 -0.904 0.402 0.7250 0.7008 0
-0.0000 -0.9158 0.4017 0.000 -0.916 0.402 0.7500 0.7008 0
-0.1433 -0.9045 0.4017 0.143 -0.904 0.402 0.7750 0.7008 0
-0.2830 -0.8710 0.4017 0.283 -0.871 0.402 0.8000 0.7008 0
-0.4158 -0.8160 0.4017 0.416 -0.816 0.402 0.8250 0.7008 0
-0.5383 -0.7409 0.4017 0.538 -0.741 0.402 0.8500 0.7008 0
-0.6475 -0.6475 0.4017 0.648 -0.648 0.402 0.8750 0.7008 0
-0.7409 -0.5383 0.4017 0.741 -0.538 0.402 0.9000 0.7008 0
-0.8160 -0.4158 0.4017 0.816 -0.416 0.402 0.9250 0.7008 0
-0.8710 -0.2830 0.4017 0.871 -0.283 0.402 0.9500 0.7008 0
-0.9045 -0.1433 0.4017 0.904 -0.143 0.402 0.9750 0.7008 0
-0.9158 0.0000 0.4017 0.916 0.000 0.402 1.0000 0.7008 0
-
-0.9694 0.0000 0.2455 0.969 0.000 0.245 0.0000 0.6227 0
-0.9575 0.1516 0.2455 0.957 0.152 0.245 0.0250 0.6227 0
-0.9220 0.2996 0.2455 0.922 0.300 0.245 0.0500 0.6227 0
-0.8637 0.4401 0.2455 0.864 0.440 0.245 0.0750 0.6227 0
-0.7843 0.5698 0.2455 0.784 0.570 0.245 0.1000 0.6227 0
-0.6855 0.6855 0.2455 0.685 0.685 0.245 0.1250 0.6227 0
-0.5698 0.7843 0.2455 0.570 0.784 0.245 0.1500 0.6227 0
-0.4401 0.8637 0.2455 0.440 0.864 0.245 0.1750 0.6227 0
-0.2996 0.9220 0.2455 0.300 0.922 0.245 0.2000 0.6227 0
-0.1516 0.9575 0.2455 0.152 0.957 0.245 0.2250 0.6227 0
-0.0000 0.9694 0.2455 0.000 0.969 0.245 0.2500 0.6227 0
--0.1516 0.9575 0.2455 -0.152 0.957 0.245 0.2750 0.6227 0
--0.2996 0.9220 0.2455 -0.300 0.922 0.245 0.3000 0.6227 0
--0.4401 0.8637 0.2455 -0.440 0.864 0.245 0.3250 0.6227 0
--0.5698 0.7843 0.2455 -0.570 0.784 0.245 0.3500 0.6227 0
--0.6855 0.6855 0.2455 -0.685 0.685 0.245 0.3750 0.6227 0
--0.7843 0.5698 0.2455 -0.784 0.570 0.245 0.4000 0.6227 0
--0.8637 0.4401 0.2455 -0.864 0.440 0.245 0.4250 0.6227 0
--0.9220 0.2996 0.2455 -0.922 0.300 0.245 0.4500 0.6227 0
--0.9575 0.1516 0.2455 -0.957 0.152 0.245 0.4750 0.6227 0
--0.9694 0.0000 0.2455 -0.969 0.000 0.245 0.5000 0.6227 0
--0.9575 -0.1516 0.2455 -0.957 -0.152 0.245 0.5250 0.6227 0
--0.9220 -0.2996 0.2455 -0.922 -0.300 0.245 0.5500 0.6227 0
--0.8637 -0.4401 0.2455 -0.864 -0.440 0.245 0.5750 0.6227 0
--0.7843 -0.5698 0.2455 -0.784 -0.570 0.245 0.6000 0.6227 0
--0.6855 -0.6855 0.2455 -0.685 -0.685 0.245 0.6250 0.6227 0
--0.5698 -0.7843 0.2455 -0.570 -0.784 0.245 0.6500 0.6227 0
--0.4401 -0.8637 0.2455 -0.440 -0.864 0.245 0.6750 0.6227 0
--0.2996 -0.9220 0.2455 -0.300 -0.922 0.245 0.7000 0.6227 0
--0.1516 -0.9575 0.2455 -0.152 -0.957 0.245 0.7250 0.6227 0
-0.0000 -0.9694 0.2455 0.000 -0.969 0.245 0.7500 0.6227 0
-0.1516 -0.9575 0.2455 0.152 -0.957 0.245 0.7750 0.6227 0
-0.2996 -0.9220 0.2455 0.300 -0.922 0.245 0.8000 0.6227 0
-0.4401 -0.8637 0.2455 0.440 -0.864 0.245 0.8250 0.6227 0
-0.5698 -0.7843 0.2455 0.570 -0.784 0.245 0.8500 0.6227 0
-0.6855 -0.6855 0.2455 0.685 -0.685 0.245 0.8750 0.6227 0
-0.7843 -0.5698 0.2455 0.784 -0.570 0.245 0.9000 0.6227 0
-0.8637 -0.4401 0.2455 0.864 -0.440 0.245 0.9250 0.6227 0
-0.9220 -0.2996 0.2455 0.922 -0.300 0.245 0.9500 0.6227 0
-0.9575 -0.1516 0.2455 0.957 -0.152 0.245 0.9750 0.6227 0
-0.9694 0.0000 0.2455 0.969 0.000 0.245 1.0000 0.6227 0
-
-0.9966 0.0000 0.0826 0.997 0.000 0.083 0.0000 0.5413 0
-0.9843 0.1559 0.0826 0.984 0.156 0.083 0.0250 0.5413 0
-0.9478 0.3080 0.0826 0.948 0.308 0.083 0.0500 0.5413 0
-0.8880 0.4524 0.0826 0.888 0.452 0.083 0.0750 0.5413 0
-0.8063 0.5858 0.0826 0.806 0.586 0.083 0.1000 0.5413 0
-0.7047 0.7047 0.0826 0.705 0.705 0.083 0.1250 0.5413 0
-0.5858 0.8063 0.0826 0.586 0.806 0.083 0.1500 0.5413 0
-0.4524 0.8880 0.0826 0.452 0.888 0.083 0.1750 0.5413 0
-0.3080 0.9478 0.0826 0.308 0.948 0.083 0.2000 0.5413 0
-0.1559 0.9843 0.0826 0.156 0.984 0.083 0.2250 0.5413 0
-0.0000 0.9966 0.0826 0.000 0.997 0.083 0.2500 0.5413 0
--0.1559 0.9843 0.0826 -0.156 0.984 0.083 0.2750 0.5413 0
--0.3080 0.9478 0.0826 -0.308 0.948 0.083 0.3000 0.5413 0
--0.4524 0.8880 0.0826 -0.452 0.888 0.083 0.3250 0.5413 0
--0.5858 0.8063 0.0826 -0.586 0.806 0.083 0.3500 0.5413 0
--0.7047 0.7047 0.0826 -0.705 0.705 0.083 0.3750 0.5413 0
--0.8063 0.5858 0.0826 -0.806 0.586 0.083 0.4000 0.5413 0
--0.8880 0.4524 0.0826 -0.888 0.452 0.083 0.4250 0.5413 0
--0.9478 0.3080 0.0826 -0.948 0.308 0.083 0.4500 0.5413 0
--0.9843 0.1559 0.0826 -0.984 0.156 0.083 0.4750 0.5413 0
--0.9966 0.0000 0.0826 -0.997 0.000 0.083 0.5000 0.5413 0
--0.9843 -0.1559 0.0826 -0.984 -0.156 0.083 0.5250 0.5413 0
--0.9478 -0.3080 0.0826 -0.948 -0.308 0.083 0.5500 0.5413 0
--0.8880 -0.4524 0.0826 -0.888 -0.452 0.083 0.5750 0.5413 0
--0.8063 -0.5858 0.0826 -0.806 -0.586 0.083 0.6000 0.5413 0
--0.7047 -0.7047 0.0826 -0.705 -0.705 0.083 0.6250 0.5413 0
--0.5858 -0.8063 0.0826 -0.586 -0.806 0.083 0.6500 0.5413 0
--0.4524 -0.8880 0.0826 -0.452 -0.888 0.083 0.6750 0.5413 0
--0.3080 -0.9478 0.0826 -0.308 -0.948 0.083 0.7000 0.5413 0
--0.1559 -0.9843 0.0826 -0.156 -0.984 0.083 0.7250 0.5413 0
-0.0000 -0.9966 0.0826 0.000 -0.997 0.083 0.7500 0.5413 0
-0.1559 -0.9843 0.0826 0.156 -0.984 0.083 0.7750 0.5413 0
-0.3080 -0.9478 0.0826 0.308 -0.948 0.083 0.8000 0.5413 0
-0.4524 -0.8880 0.0826 0.452 -0.888 0.083 0.8250 0.5413 0
-0.5858 -0.8063 0.0826 0.586 -0.806 0.083 0.8500 0.5413 0
-0.7047 -0.7047 0.0826 0.705 -0.705 0.083 0.8750 0.5413 0
-0.8063 -0.5858 0.0826 0.806 -0.586 0.083 0.9000 0.5413 0
-0.8880 -0.4524 0.0826 0.888 -0.452 0.083 0.9250 0.5413 0
-0.9478 -0.3080 0.0826 0.948 -0.308 0.083 0.9500 0.5413 0
-0.9843 -0.1559 0.0826 0.984 -0.156 0.083 0.9750 0.5413 0
-0.9966 0.0000 0.0826 0.997 0.000 0.083 1.0000 0.5413 0
-
-0.9966 0.0000 -0.0826 0.997 0.000 -0.083 0.0000 0.4587 0
-0.9843 0.1559 -0.0826 0.984 0.156 -0.083 0.0250 0.4587 0
-0.9478 0.3080 -0.0826 0.948 0.308 -0.083 0.0500 0.4587 0
-0.8880 0.4524 -0.0826 0.888 0.452 -0.083 0.0750 0.4587 0
-0.8063 0.5858 -0.0826 0.806 0.586 -0.083 0.1000 0.4587 0
-0.7047 0.7047 -0.0826 0.705 0.705 -0.083 0.1250 0.4587 0
-0.5858 0.8063 -0.0826 0.586 0.806 -0.083 0.1500 0.4587 0
-0.4524 0.8880 -0.0826 0.452 0.888 -0.083 0.1750 0.4587 0
-0.3080 0.9478 -0.0826 0.308 0.948 -0.083 0.2000 0.4587 0
-0.1559 0.9843 -0.0826 0.156 0.984 -0.083 0.2250 0.4587 0
-0.0000 0.9966 -0.0826 0.000 0.997 -0.083 0.2500 0.4587 0
--0.1559 0.9843 -0.0826 -0.156 0.984 -0.083 0.2750 0.4587 0
--0.3080 0.9478 -0.0826 -0.308 0.948 -0.083 0.3000 0.4587 0
--0.4524 0.8880 -0.0826 -0.452 0.888 -0.083 0.3250 0.4587 0
--0.5858 0.8063 -0.0826 -0.586 0.806 -0.083 0.3500 0.4587 0
--0.7047 0.7047 -0.0826 -0.705 0.705 -0.083 0.3750 0.4587 0
--0.8063 0.5858 -0.0826 -0.806 0.586 -0.083 0.4000 0.4587 0
--0.8880 0.4524 -0.0826 -0.888 0.452 -0.083 0.4250 0.4587 0
--0.9478 0.3080 -0.0826 -0.948 0.308 -0.083 0.4500 0.4587 0
--0.9843 0.1559 -0.0826 -0.984 0.156 -0.083 0.4750 0.4587 0
--0.9966 0.0000 -0.0826 -0.997 0.000 -0.083 0.5000 0.4587 0
--0.9843 -0.1559 -0.0826 -0.984 -0.156 -0.083 0.5250 0.4587 0
--0.9478 -0.3080 -0.0826 -0.948 -0.308 -0.083 0.5500 0.4587 0
--0.8880 -0.4524 -0.0826 -0.888 -0.452 -0.083 0.5750 0.4587 0
--0.8063 -0.5858 -0.0826 -0.806 -0.586 -0.083 0.6000 0.4587 0
--0.7047 -0.7047 -0.0826 -0.705 -0.705 -0.083 0.6250 0.4587 0
--0.5858 -0.8063 -0.0826 -0.586 -0.806 -0.083 0.6500 0.4587 0
--0.4524 -0.8880 -0.0826 -0.452 -0.888 -0.083 0.6750 0.4587 0
--0.3080 -0.9478 -0.0826 -0.308 -0.948 -0.083 0.7000 0.4587 0
--0.1559 -0.9843 -0.0826 -0.156 -0.984 -0.083 0.7250 0.4587 0
-0.0000 -0.9966 -0.0826 0.000 -0.997 -0.083 0.7500 0.4587 0
-0.1559 -0.9843 -0.0826 0.156 -0.984 -0.083 0.7750 0.4587 0
-0.3080 -0.9478 -0.0826 0.308 -0.948 -0.083 0.8000 0.4587 0
-0.4524 -0.8880 -0.0826 0.452 -0.888 -0.083 0.8250 0.4587 0
-0.5858 -0.8063 -0.0826 0.586 -0.806 -0.083 0.8500 0.4587 0
-0.7047 -0.7047 -0.0826 0.705 -0.705 -0.083 0.8750 0.4587 0
-0.8063 -0.5858 -0.0826 0.806 -0.586 -0.083 0.9000 0.4587 0
-0.8880 -0.4524 -0.0826 0.888 -0.452 -0.083 0.9250 0.4587 0
-0.9478 -0.3080 -0.0826 0.948 -0.308 -0.083 0.9500 0.4587 0
-0.9843 -0.1559 -0.0826 0.984 -0.156 -0.083 0.9750 0.4587 0
-0.9966 0.0000 -0.0826 0.997 0.000 -0.083 1.0000 0.4587 0
-
-0.9694 0.0000 -0.2455 0.969 0.000 -0.245 0.0000 0.3773 0
-0.9575 0.1516 -0.2455 0.957 0.152 -0.245 0.0250 0.3773 0
-0.9220 0.2996 -0.2455 0.922 0.300 -0.245 0.0500 0.3773 0
-0.8637 0.4401 -0.2455 0.864 0.440 -0.245 0.0750 0.3773 0
-0.7843 0.5698 -0.2455 0.784 0.570 -0.245 0.1000 0.3773 0
-0.6855 0.6855 -0.2455 0.685 0.685 -0.245 0.1250 0.3773 0
-0.5698 0.7843 -0.2455 0.570 0.784 -0.245 0.1500 0.3773 0
-0.4401 0.8637 -0.2455 0.440 0.864 -0.245 0.1750 0.3773 0
-0.2996 0.9220 -0.2455 0.300 0.922 -0.245 0.2000 0.3773 0
-0.1516 0.9575 -0.2455 0.152 0.957 -0.245 0.2250 0.3773 0
-0.0000 0.9694 -0.2455 0.000 0.969 -0.245 0.2500 0.3773 0
--0.1516 0.9575 -0.2455 -0.152 0.957 -0.245 0.2750 0.3773 0
--0.2996 0.9220 -0.2455 -0.300 0.922 -0.245 0.3000 0.3773 0
--0.4401 0.8637 -0.2455 -0.440 0.864 -0.245 0.3250 0.3773 0
--0.5698 0.7843 -0.2455 -0.570 0.784 -0.245 0.3500 0.3773 0
--0.6855 0.6855 -0.2455 -0.685 0.685 -0.245 0.3750 0.3773 0
--0.7843 0.5698 -0.2455 -0.784 0.570 -0.245 0.4000 0.3773 0
--0.8637 0.4401 -0.2455 -0.864 0.440 -0.245 0.4250 0.3773 0
--0.9220 0.2996 -0.2455 -0.922 0.300 -0.245 0.4500 0.3773 0
--0.9575 0.1516 -0.2455 -0.957 0.152 -0.245 0.4750 0.3773 0
--0.9694 0.0000 -0.2455 -0.969 0.000 -0.245 0.5000 0.3773 0
--0.9575 -0.1516 -0.2455 -0.957 -0.152 -0.245 0.5250 0.3773 0
--0.9220 -0.2996 -0.2455 -0.922 -0.300 -0.245 0.5500 0.3773 0
--0.8637 -0.4401 -0.2455 -0.864 -0.440 -0.245 0.5750 0.3773 0
--0.7843 -0.5698 -0.2455 -0.784 -0.570 -0.245 0.6000 0.3773 0
--0.6855 -0.6855 -0.2455 -0.685 -0.685 -0.245 0.6250 0.3773 0
--0.5698 -0.7843 -0.2455 -0.570 -0.784 -0.245 0.6500 0.3773 0
--0.4401 -0.8637 -0.2455 -0.440 -0.864 -0.245 0.6750 0.3773 0
--0.2996 -0.9220 -0.2455 -0.300 -0.922 -0.245 0.7000 0.3773 0
--0.1516 -0.9575 -0.2455 -0.152 -0.957 -0.245 0.7250 0.3773 0
-0.0000 -0.9694 -0.2455 0.000 -0.969 -0.245 0.7500 0.3773 0
-0.1516 -0.9575 -0.2455 0.152 -0.957 -0.245 0.7750 0.3773 0
-0.2996 -0.9220 -0.2455 0.300 -0.922 -0.245 0.8000 0.3773 0
-0.4401 -0.8637 -0.2455 0.440 -0.864 -0.245 0.8250 0.3773 0
-0.5698 -0.7843 -0.2455 0.570 -0.784 -0.245 0.8500 0.3773 0
-0.6855 -0.6855 -0.2455 0.685 -0.685 -0.245 0.8750 0.3773 0
-0.7843 -0.5698 -0.2455 0.784 -0.570 -0.245 0.9000 0.3773 0
-0.8637 -0.4401 -0.2455 0.864 -0.440 -0.245 0.9250 0.3773 0
-0.9220 -0.2996 -0.2455 0.922 -0.300 -0.245 0.9500 0.3773 0
-0.9575 -0.1516 -0.2455 0.957 -0.152 -0.245 0.9750 0.3773 0
-0.9694 0.0000 -0.2455 0.969 0.000 -0.245 1.0000 0.3773 0
-
-0.9158 0.0000 -0.4017 0.916 0.000 -0.402 0.0000 0.2992 0
-0.9045 0.1433 -0.4017 0.904 0.143 -0.402 0.0250 0.2992 0
-0.8710 0.2830 -0.4017 0.871 0.283 -0.402 0.0500 0.2992 0
-0.8160 0.4158 -0.4017 0.816 0.416 -0.402 0.0750 0.2992 0
-0.7409 0.5383 -0.4017 0.741 0.538 -0.402 0.1000 0.2992 0
-0.6475 0.6475 -0.4017 0.648 0.648 -0.402 0.1250 0.2992 0
-0.5383 0.7409 -0.4017 0.538 0.741 -0.402 0.1500 0.2992 0
-0.4158 0.8160 -0.4017 0.416 0.816 -0.402 0.1750 0.2992 0
-0.2830 0.8710 -0.4017 0.283 0.871 -0.402 0.2000 0.2992 0
-0.1433 0.9045 -0.4017 0.143 0.904 -0.402 0.2250 0.2992 0
-0.0000 0.9158 -0.4017 0.000 0.916 -0.402 0.2500 0.2992 0
--0.1433 0.9045 -0.4017 -0.143 0.904 -0.402 0.2750 0.2992 0
--0.2830 0.8710 -0.4017 -0.283 0.871 -0.402 0.3000 0.2992 0
--0.4158 0.8160 -0.4017 -0.416 0.816 -0.402 0.3250 0.2992 0
--0.5383 0.7409 -0.4017 -0.538 0.741 -0.402 0.3500 0.2992 0
--0.6475 0.6475 -0.4017 -0.648 0.648 -0.402 0.3750 0.2992 0
--0.7409 0.5383 -0.4017 -0.741 0.538 -0.402 0.4000 0.2992 0
--0.8160 0.4158 -0.4017 -0.816 0.416 -0.402 0.4250 0.2992 0
--0.8710 0.2830 -0.4017 -0.871 0.283 -0.402 0.4500 0.2992 0
--0.9045 0.1433 -0.4017 -0.904 0.143 -0.402 0.4750 0.2992 0
--0.9158 0.0000 -0.4017 -0.916 0.000 -0.402 0.5000 0.2992 0
--0.9045 -0.1433 -0.4017 -0.904 -0.143 -0.402 0.5250 0.2992 0
--0.8710 -0.2830 -0.4017 -0.871 -0.283 -0.402 0.5500 0.2992 0
--0.8160 -0.4158 -0.4017 -0.816 -0.416 -0.402 0.5750 0.2992 0
--0.7409 -0.5383 -0.4017 -0.741 -0.538 -0.402 0.6000 0.2992 0
--0.6475 -0.6475 -0.4017 -0.648 -0.648 -0.402 0.6250 0.2992 0
--0.5383 -0.7409 -0.4017 -0.538 -0.741 -0.402 0.6500 0.2992 0
--0.4158 -0.8160 -0.4017 -0.416 -0.816 -0.402 0.6750 0.2992 0
--0.2830 -0.8710 -0.4017 -0.283 -0.871 -0.402 0.7000 0.2992 0
--0.1433 -0.9045 -0.4017 -0.143 -0.904 -0.402 0.7250 0.2992 0
-0.0000 -0.9158 -0.4017 0.000 -0.916 -0.402 0.7500 0.2992 0
-0.1433 -0.9045 -0.4017 0.143 -0.904 -0.402 0.7750 0.2992 0
-0.2830 -0.8710 -0.4017 0.283 -0.871 -0.402 0.8000 0.2992 0
-0.4158 -0.8160 -0.4017 0.416 -0.816 -0.402 0.8250 0.2992 0
-0.5383 -0.7409 -0.4017 0.538 -0.741 -0.402 0.8500 0.2992 0
-0.6475 -0.6475 -0.4017 0.648 -0.648 -0.402 0.8750 0.2992 0
-0.7409 -0.5383 -0.4017 0.741 -0.538 -0.402 0.9000 0.2992 0
-0.8160 -0.4158 -0.4017 0.816 -0.416 -0.402 0.9250 0.2992 0
-0.8710 -0.2830 -0.4017 0.871 -0.283 -0.402 0.9500 0.2992 0
-0.9045 -0.1433 -0.4017 0.904 -0.143 -0.402 0.9750 0.2992 0
-0.9158 0.0000 -0.4017 0.916 0.000 -0.402 1.0000 0.2992 0
-
-0.8372 0.0000 -0.5469 0.837 0.000 -0.547 0.0000 0.2265 0
-0.8269 0.1310 -0.5469 0.827 0.131 -0.547 0.0250 0.2265 0
-0.7962 0.2587 -0.5469 0.796 0.259 -0.547 0.0500 0.2265 0
-0.7459 0.3801 -0.5469 0.746 0.380 -0.547 0.0750 0.2265 0
-0.6773 0.4921 -0.5469 0.677 0.492 -0.547 0.1000 0.2265 0
-0.5920 0.5920 -0.5469 0.592 0.592 -0.547 0.1250 0.2265 0
-0.4921 0.6773 -0.5469 0.492 0.677 -0.547 0.1500 0.2265 0
-0.3801 0.7459 -0.5469 0.380 0.746 -0.547 0.1750 0.2265 0
-0.2587 0.7962 -0.5469 0.259 0.796 -0.547 0.2000 0.2265 0
-0.1310 0.8269 -0.5469 0.131 0.827 -0.547 0.2250 0.2265 0
-0.0000 0.8372 -0.5469 0.000 0.837 -0.547 0.2500 0.2265 0
--0.1310 0.8269 -0.5469 -0.131 0.827 -0.547 0.2750 0.2265 0
--0.2587 0.7962 -0.5469 -0.259 0.796 -0.547 0.3000 0.2265 0
--0.3801 0.7459 -0.5469 -0.380 0.746 -0.547 0.3250 0.2265 0
--0.4921 0.6773 -0.5469 -0.492 0.677 -0.547 0.3500 0.2265 0
--0.5920 0.5920 -0.5469 -0.592 0.592 -0.547 0.3750 0.2265 0
--0.6773 0.4921 -0.5469 -0.677 0.492 -0.547 0.4000 0.2265 0
--0.7459 0.3801 -0.5469 -0.746 0.380 -0.547 0.4250 0.2265 0
--0.7962 0.2587 -0.5469 -0.796 0.259 -0.547 0.4500 0.2265 0
--0.8269 0.1310 -0.5469 -0.827 0.131 -0.547 0.4750 0.2265 0
--0.8372 0.0000 -0.5469 -0.837 0.000 -0.547 0.5000 0.2265 0
--0.8269 -0.1310 -0.5469 -0.827 -0.131 -0.547 0.5250 0.2265 0
--0.7962 -0.2587 -0.5469 -0.796 -0.259 -0.547 0.5500 0.2265 0
--0.7459 -0.3801 -0.5469 -0.746 -0.380 -0.547 0.5750 0.2265 0
--0.6773 -0.4921 -0.5469 -0.677 -0.492 -0.547 0.6000 0.2265 0
--0.5920 -0.5920 -0.5469 -0.592 -0.592 -0.547 0.6250 0.2265 0
--0.4921 -0.6773 -0.5469 -0.492 -0.677 -0.547 0.6500 0.2265 0
--0.3801 -0.7459 -0.5469 -0.380 -0.746 -0.547 0.6750 0.2265 0
--0.2587 -0.7962 -0.5469 -0.259 -0.796 -0.547 0.7000 0.2265 0
--0.1310 -0.8269 -0.5469 -0.131 -0.827 -0.547 0.7250 0.2265 0
-0.0000 -0.8372 -0.5469 0.000 -0.837 -0.547 0.7500 0.2265 0
-0.1310 -0.8269 -0.5469 0.131 -0.827 -0.547 0.7750 0.2265 0
-0.2587 -0.7962 -0.5469 0.259 -0.796 -0.547 0.8000 0.2265 0
-0.3801 -0.7459 -0.5469 0.380 -0.746 -0.547 0.8250 0.2265 0
-0.4921 -0.6773 -0.5469 0.492 -0.677 -0.547 0.8500 0.2265 0
-0.5920 -0.5920 -0.5469 0.592 -0.592 -0.547 0.8750 0.2265 0
-0.6773 -0.4921 -0.5469 0.677 -0.492 -0.547 0.9000 0.2265 0
-0.7459 -0.3801 -0.5469 0.746 -0.380 -0.547 0.9250 0.2265 0
-0.7962 -0.2587 -0.5469 0.796 -0.259 -0.547 0.9500 0.2265 0
-0.8269 -0.1310 -0.5469 0.827 -0.131 -0.547 0.9750 0.2265 0
-0.8372 0.0000 -0.5469 0.837 0.000 -0.547 1.0000 0.2265 0
-
-0.7357 0.0000 -0.6773 0.736 0.000 -0.677 0.0000 0.1614 0
-0.7267 0.1151 -0.6773 0.727 0.115 -0.677 0.0250 0.1614 0
-0.6997 0.2274 -0.6773 0.700 0.227 -0.677 0.0500 0.1614 0
-0.6555 0.3340 -0.6773 0.656 0.334 -0.677 0.0750 0.1614 0
-0.5952 0.4324 -0.6773 0.595 0.432 -0.677 0.1000 0.1614 0
-0.5202 0.5202 -0.6773 0.520 0.520 -0.677 0.1250 0.1614 0
-0.4324 0.5952 -0.6773 0.432 0.595 -0.677 0.1500 0.1614 0
-0.3340 0.6555 -0.6773 0.334 0.656 -0.677 0.1750 0.1614 0
-0.2274 0.6997 -0.6773 0.227 0.700 -0.677 0.2000 0.1614 0
-0.1151 0.7267 -0.6773 0.115 0.727 -0.677 0.2250 0.1614 0
-0.0000 0.7357 -0.6773 0.000 0.736 -0.677 0.2500 0.1614 0
--0.1151 0.7267 -0.6773 -0.115 0.727 -0.677 0.2750 0.1614 0
--0.2274 0.6997 -0.6773 -0.227 0.700 -0.677 0.3000 0.1614 0
--0.3340 0.6555 -0.6773 -0.334 0.656 -0.677 0.3250 0.1614 0
--0.4324 0.5952 -0.6773 -0.432 0.595 -0.677 0.3500 0.1614 0
--0.5202 0.5202 -0.6773 -0.520 0.520 -0.677 0.3750 0.1614 0
--0.5952 0.4324 -0.6773 -0.595 0.432 -0.677 0.4000 0.1614 0
--0.6555 0.3340 -0.6773 -0.656 0.334 -0.677 0.4250 0.1614 0
--0.6997 0.2274 -0.6773 -0.700 0.227 -0.677 0.4500 0.1614 0
--0.7267 0.1151 -0.6773 -0.727 0.115 -0.677 0.4750 0.1614 0
--0.7357 0.0000 -0.6773 -0.736 0.000 -0.677 0.5000 0.1614 0
--0.7267 -0.1151 -0.6773 -0.727 -0.115 -0.677 0.5250 0.1614 0
--0.6997 -0.2274 -0.6773 -0.700 -0.227 -0.677 0.5500 0.1614 0
--0.6555 -0.3340 -0.6773 -0.656 -0.334 -0.677 0.5750 0.1614 0
--0.5952 -0.4324 -0.6773 -0.595 -0.432 -0.677 0.6000 0.1614 0
--0.5202 -0.5202 -0.6773 -0.520 -0.520 -0.677 0.6250 0.1614 0
--0.4324 -0.5952 -0.6773 -0.432 -0.595 -0.677 0.6500 0.1614 0
--0.3340 -0.6555 -0.6773 -0.334 -0.656 -0.677 0.6750 0.1614 0
--0.2274 -0.6997 -0.6773 -0.227 -0.700 -0.677 0.7000 0.1614 0
--0.1151 -0.7267 -0.6773 -0.115 -0.727 -0.677 0.7250 0.1614 0
-0.0000 -0.7357 -0.6773 0.000 -0.736 -0.677 0.7500 0.1614 0
-0.1151 -0.7267 -0.6773 0.115 -0.727 -0.677 0.7750 0.1614 0
-0.2274 -0.6997 -0.6773 0.227 -0.700 -0.677 0.8000 0.1614 0
-0.3340 -0.6555 -0.6773 0.334 -0.656 -0.677 0.8250 0.1614 0
-0.4324 -0.5952 -0.6773 0.432 -0.595 -0.677 0.8500 0.1614 0
-0.5202 -0.5202 -0.6773 0.520 -0.520 -0.677 0.8750 0.1614 0
-0.5952 -0.4324 -0.6773 0.595 -0.432 -0.677 0.9000 0.1614 0
-0.6555 -0.3340 -0.6773 0.656 -0.334 -0.677 0.9250 0.1614 0
-0.6997 -0.2274 -0.6773 0.700 -0.227 -0.677 0.9500 0.1614 0
-0.7267 -0.1151 -0.6773 0.727 -0.115 -0.677 0.9750 0.1614 0
-0.7357 0.0000 -0.6773 0.736 0.000 -0.677 1.0000 0.1614 0
-
-0.6142 0.0000 -0.7891 0.614 0.000 -0.789 0.0000 0.1054 0
-0.6067 0.0961 -0.7891 0.607 0.096 -0.789 0.0250 0.1054 0
-0.5842 0.1898 -0.7891 0.584 0.190 -0.789 0.0500 0.1054 0
-0.5473 0.2788 -0.7891 0.547 0.279 -0.789 0.0750 0.1054 0
-0.4969 0.3610 -0.7891 0.497 0.361 -0.789 0.1000 0.1054 0
-0.4343 0.4343 -0.7891 0.434 0.434 -0.789 0.1250 0.1054 0
-0.3610 0.4969 -0.7891 0.361 0.497 -0.789 0.1500 0.1054 0
-0.2788 0.5473 -0.7891 0.279 0.547 -0.789 0.1750 0.1054 0
-0.1898 0.5842 -0.7891 0.190 0.584 -0.789 0.2000 0.1054 0
-0.0961 0.6067 -0.7891 0.096 0.607 -0.789 0.2250 0.1054 0
-0.0000 0.6142 -0.7891 0.000 0.614 -0.789 0.2500 0.1054 0
--0.0961 0.6067 -0.7891 -0.096 0.607 -0.789 0.2750 0.1054 0
--0.1898 0.5842 -0.7891 -0.190 0.584 -0.789 0.3000 0.1054 0
--0.2788 0.5473 -0.7891 -0.279 0.547 -0.789 0.3250 0.1054 0
--0.3610 0.4969 -0.7891 -0.361 0.497 -0.789 0.3500 0.1054 0
--0.4343 0.4343 -0.7891 -0.434 0.434 -0.789 0.3750 0.1054 0
--0.4969 0.3610 -0.7891 -0.497 0.361 -0.789 0.4000 0.1054 0
--0.5473 0.2788 -0.7891 -0.547 0.279 -0.789 0.4250 0.1054 0
--0.5842 0.1898 -0.7891 -0.584 0.190 -0.789 0.4500 0.1054 0
--0.6067 0.0961 -0.7891 -0.607 0.096 -0.789 0.4750 0.1054 0
--0.6142 0.0000 -0.7891 -0.614 0.000 -0.789 0.5000 0.1054 0
--0.6067 -0.0961 -0.7891 -0.607 -0.096 -0.789 0.5250 0.1054 0
--0.5842 -0.1898 -0.7891 -0.584 -0.190 -0.789 0.5500 0.1054 0
--0.5473 -0.2788 -0.7891 -0.547 -0.279 -0.789 0.5750 0.1054 0
--0.4969 -0.3610 -0.7891 -0.497 -0.361 -0.789 0.6000 0.1054 0
--0.4343 -0.4343 -0.7891 -0.434 -0.434 -0.789 0.6250 0.1054 0
--0.3610 -0.4969 -0.7891 -0.361 -0.497 -0.789 0.6500 0.1054 0
--0.2788 -0.5473 -0.7891 -0.279 -0.547 -0.789 0.6750 0.1054 0
--0.1898 -0.5842 -0.7891 -0.190 -0.584 -0.789 0.7000 0.1054 0
--0.0961 -0.6067 -0.7891 -0.096 -0.607 -0.789 0.7250 0.1054 0
-0.0000 -0.6142 -0.7891 0.000 -0.614 -0.789 0.7500 0.1054 0
-0.0961 -0.6067 -0.7891 0.096 -0.607 -0.789 0.7750 0.1054 0
-0.1898 -0.5842 -0.7891 0.190 -0.584 -0.789 0.8000 0.1054 0
-0.2788 -0.5473 -0.7891 0.279 -0.547 -0.789 0.8250 0.1054 0
-0.3610 -0.4969 -0.7891 0.361 -0.497 -0.789 0.8500 0.1054 0
-0.4343 -0.4343 -0.7891 0.434 -0.434 -0.789 0.8750 0.1054 0
-0.4969 -0.3610 -0.7891 0.497 -0.361 -0.789 0.9000 0.1054 0
-0.5473 -0.2788 -0.7891 0.547 -0.279 -0.789 0.9250 0.1054 0
-0.5842 -0.1898 -0.7891 0.584 -0.190 -0.789 0.9500 0.1054 0
-0.6067 -0.0961 -0.7891 0.607 -0.096 -0.789 0.9750 0.1054 0
-0.6142 0.0000 -0.7891 0.614 0.000 -0.789 1.0000 0.1054 0
-
-0.4759 0.0000 -0.8795 0.476 0.000 -0.879 0.0000 0.0603 0
-0.4701 0.0745 -0.8795 0.470 0.074 -0.879 0.0250 0.0603 0
-0.4527 0.1471 -0.8795 0.453 0.147 -0.879 0.0500 0.0603 0
-0.4241 0.2161 -0.8795 0.424 0.216 -0.879 0.0750 0.0603 0
-0.3850 0.2798 -0.8795 0.385 0.280 -0.879 0.1000 0.0603 0
-0.3365 0.3365 -0.8795 0.337 0.337 -0.879 0.1250 0.0603 0
-0.2798 0.3850 -0.8795 0.280 0.385 -0.879 0.1500 0.0603 0
-0.2161 0.4241 -0.8795 0.216 0.424 -0.879 0.1750 0.0603 0
-0.1471 0.4527 -0.8795 0.147 0.453 -0.879 0.2000 0.0603 0
-0.0745 0.4701 -0.8795 0.074 0.470 -0.879 0.2250 0.0603 0
-0.0000 0.4759 -0.8795 0.000 0.476 -0.879 0.2500 0.0603 0
--0.0745 0.4701 -0.8795 -0.074 0.470 -0.879 0.2750 0.0603 0
--0.1471 0.4527 -0.8795 -0.147 0.453 -0.879 0.3000 0.0603 0
--0.2161 0.4241 -0.8795 -0.216 0.424 -0.879 0.3250 0.0603 0
--0.2798 0.3850 -0.8795 -0.280 0.385 -0.879 0.3500 0.0603 0
--0.3365 0.3365 -0.8795 -0.337 0.337 -0.879 0.3750 0.0603 0
--0.3850 0.2798 -0.8795 -0.385 0.280 -0.879 0.4000 0.0603 0
--0.4241 0.2161 -0.8795 -0.424 0.216 -0.879 0.4250 0.0603 0
--0.4527 0.1471 -0.8795 -0.453 0.147 -0.879 0.4500 0.0603 0
--0.4701 0.0745 -0.8795 -0.470 0.074 -0.879 0.4750 0.0603 0
--0.4759 0.0000 -0.8795 -0.476 0.000 -0.879 0.5000 0.0603 0
--0.4701 -0.0745 -0.8795 -0.470 -0.074 -0.879 0.5250 0.0603 0
--0.4527 -0.1471 -0.8795 -0.453 -0.147 -0.879 0.5500 0.0603 0
--0.4241 -0.2161 -0.8795 -0.424 -0.216 -0.879 0.5750 0.0603 0
--0.3850 -0.2798 -0.8795 -0.385 -0.280 -0.879 0.6000 0.0603 0
--0.3365 -0.3365 -0.8795 -0.337 -0.337 -0.879 0.6250 0.0603 0
--0.2798 -0.3850 -0.8795 -0.280 -0.385 -0.879 0.6500 0.0603 0
--0.2161 -0.4241 -0.8795 -0.216 -0.424 -0.879 0.6750 0.0603 0
--0.1471 -0.4527 -0.8795 -0.147 -0.453 -0.879 0.7000 0.0603 0
--0.0745 -0.4701 -0.8795 -0.074 -0.470 -0.879 0.7250 0.0603 0
-0.0000 -0.4759 -0.8795 0.000 -0.476 -0.879 0.7500 0.0603 0
-0.0745 -0.4701 -0.8795 0.074 -0.470 -0.879 0.7750 0.0603 0
-0.1471 -0.4527 -0.8795 0.147 -0.453 -0.879 0.8000 0.0603 0
-0.2161 -0.4241 -0.8795 0.216 -0.424 -0.879 0.8250 0.0603 0
-0.2798 -0.3850 -0.8795 0.280 -0.385 -0.879 0.8500 0.0603 0
-0.3365 -0.3365 -0.8795 0.337 -0.337 -0.879 0.8750 0.0603 0
-0.3850 -0.2798 -0.8795 0.385 -0.280 -0.879 0.9000 0.0603 0
-0.4241 -0.2161 -0.8795 0.424 -0.216 -0.879 0.9250 0.0603 0
-0.4527 -0.1471 -0.8795 0.453 -0.147 -0.879 0.9500 0.0603 0
-0.4701 -0.0745 -0.8795 0.470 -0.074 -0.879 0.9750 0.0603 0
-0.4759 0.0000 -0.8795 0.476 0.000 -0.879 1.0000 0.0603 0
-
-0.3247 0.0000 -0.9458 0.325 0.000 -0.946 0.0000 0.0271 0
-0.3207 0.0508 -0.9458 0.321 0.051 -0.946 0.0250 0.0271 0
-0.3088 0.1003 -0.9458 0.309 0.100 -0.946 0.0500 0.0271 0
-0.2893 0.1474 -0.9458 0.289 0.147 -0.946 0.0750 0.0271 0
-0.2627 0.1909 -0.9458 0.263 0.191 -0.946 0.1000 0.0271 0
-0.2296 0.2296 -0.9458 0.230 0.230 -0.946 0.1250 0.0271 0
-0.1909 0.2627 -0.9458 0.191 0.263 -0.946 0.1500 0.0271 0
-0.1474 0.2893 -0.9458 0.147 0.289 -0.946 0.1750 0.0271 0
-0.1003 0.3088 -0.9458 0.100 0.309 -0.946 0.2000 0.0271 0
-0.0508 0.3207 -0.9458 0.051 0.321 -0.946 0.2250 0.0271 0
-0.0000 0.3247 -0.9458 0.000 0.325 -0.946 0.2500 0.0271 0
--0.0508 0.3207 -0.9458 -0.051 0.321 -0.946 0.2750 0.0271 0
--0.1003 0.3088 -0.9458 -0.100 0.309 -0.946 0.3000 0.0271 0
--0.1474 0.2893 -0.9458 -0.147 0.289 -0.946 0.3250 0.0271 0
--0.1909 0.2627 -0.9458 -0.191 0.263 -0.946 0.3500 0.0271 0
--0.2296 0.2296 -0.9458 -0.230 0.230 -0.946 0.3750 0.0271 0
--0.2627 0.1909 -0.9458 -0.263 0.191 -0.946 0.4000 0.0271 0
--0.2893 0.1474 -0.9458 -0.289 0.147 -0.946 0.4250 0.0271 0
--0.3088 0.1003 -0.9458 -0.309 0.100 -0.946 0.4500 0.0271 0
--0.3207 0.0508 -0.9458 -0.321 0.051 -0.946 0.4750 0.0271 0
--0.3247 0.0000 -0.9458 -0.325 0.000 -0.946 0.5000 0.0271 0
--0.3207 -0.0508 -0.9458 -0.321 -0.051 -0.946 0.5250 0.0271 0
--0.3088 -0.1003 -0.9458 -0.309 -0.100 -0.946 0.5500 0.0271 0
--0.2893 -0.1474 -0.9458 -0.289 -0.147 -0.946 0.5750 0.0271 0
--0.2627 -0.1909 -0.9458 -0.263 -0.191 -0.946 0.6000 0.0271 0
--0.2296 -0.2296 -0.9458 -0.230 -0.230 -0.946 0.6250 0.0271 0
--0.1909 -0.2627 -0.9458 -0.191 -0.263 -0.946 0.6500 0.0271 0
--0.1474 -0.2893 -0.9458 -0.147 -0.289 -0.946 0.6750 0.0271 0
--0.1003 -0.3088 -0.9458 -0.100 -0.309 -0.946 0.7000 0.0271 0
--0.0508 -0.3207 -0.9458 -0.051 -0.321 -0.946 0.7250 0.0271 0
-0.0000 -0.3247 -0.9458 0.000 -0.325 -0.946 0.7500 0.0271 0
-0.0508 -0.3207 -0.9458 0.051 -0.321 -0.946 0.7750 0.0271 0
-0.1003 -0.3088 -0.9458 0.100 -0.309 -0.946 0.8000 0.0271 0
-0.1474 -0.2893 -0.9458 0.147 -0.289 -0.946 0.8250 0.0271 0
-0.1909 -0.2627 -0.9458 0.191 -0.263 -0.946 0.8500 0.0271 0
-0.2296 -0.2296 -0.9458 0.230 -0.230 -0.946 0.8750 0.0271 0
-0.2627 -0.1909 -0.9458 0.263 -0.191 -0.946 0.9000 0.0271 0
-0.2893 -0.1474 -0.9458 0.289 -0.147 -0.946 0.9250 0.0271 0
-0.3088 -0.1003 -0.9458 0.309 -0.100 -0.946 0.9500 0.0271 0
-0.3207 -0.0508 -0.9458 0.321 -0.051 -0.946 0.9750 0.0271 0
-0.3247 0.0000 -0.9458 0.325 0.000 -0.946 1.0000 0.0271 0
-
-0.1646 0.0000 -0.9864 0.165 0.000 -0.986 0.0000 0.0068 0
-0.1626 0.0257 -0.9864 0.163 0.026 -0.986 0.0250 0.0068 0
-0.1565 0.0509 -0.9864 0.157 0.051 -0.986 0.0500 0.0068 0
-0.1467 0.0747 -0.9864 0.147 0.075 -0.986 0.0750 0.0068 0
-0.1332 0.0967 -0.9864 0.133 0.097 -0.986 0.1000 0.0068 0
-0.1164 0.1164 -0.9864 0.116 0.116 -0.986 0.1250 0.0068 0
-0.0967 0.1332 -0.9864 0.097 0.133 -0.986 0.1500 0.0068 0
-0.0747 0.1467 -0.9864 0.075 0.147 -0.986 0.1750 0.0068 0
-0.0509 0.1565 -0.9864 0.051 0.157 -0.986 0.2000 0.0068 0
-0.0257 0.1626 -0.9864 0.026 0.163 -0.986 0.2250 0.0068 0
-0.0000 0.1646 -0.9864 0.000 0.165 -0.986 0.2500 0.0068 0
--0.0257 0.1626 -0.9864 -0.026 0.163 -0.986 0.2750 0.0068 0
--0.0509 0.1565 -0.9864 -0.051 0.157 -0.986 0.3000 0.0068 0
--0.0747 0.1467 -0.9864 -0.075 0.147 -0.986 0.3250 0.0068 0
--0.0967 0.1332 -0.9864 -0.097 0.133 -0.986 0.3500 0.0068 0
--0.1164 0.1164 -0.9864 -0.116 0.116 -0.986 0.3750 0.0068 0
--0.1332 0.0967 -0.9864 -0.133 0.097 -0.986 0.4000 0.0068 0
--0.1467 0.0747 -0.9864 -0.147 0.075 -0.986 0.4250 0.0068 0
--0.1565 0.0509 -0.9864 -0.157 0.051 -0.986 0.4500 0.0068 0
--0.1626 0.0257 -0.9864 -0.163 0.026 -0.986 0.4750 0.0068 0
--0.1646 0.0000 -0.9864 -0.165 0.000 -0.986 0.5000 0.0068 0
--0.1626 -0.0257 -0.9864 -0.163 -0.026 -0.986 0.5250 0.0068 0
--0.1565 -0.0509 -0.9864 -0.157 -0.051 -0.986 0.5500 0.0068 0
--0.1467 -0.0747 -0.9864 -0.147 -0.075 -0.986 0.5750 0.0068 0
--0.1332 -0.0967 -0.9864 -0.133 -0.097 -0.986 0.6000 0.0068 0
--0.1164 -0.1164 -0.9864 -0.116 -0.116 -0.986 0.6250 0.0068 0
--0.0967 -0.1332 -0.9864 -0.097 -0.133 -0.986 0.6500 0.0068 0
--0.0747 -0.1467 -0.9864 -0.075 -0.147 -0.986 0.6750 0.0068 0
--0.0509 -0.1565 -0.9864 -0.051 -0.157 -0.986 0.7000 0.0068 0
--0.0257 -0.1626 -0.9864 -0.026 -0.163 -0.986 0.7250 0.0068 0
-0.0000 -0.1646 -0.9864 0.000 -0.165 -0.986 0.7500 0.0068 0
-0.0257 -0.1626 -0.9864 0.026 -0.163 -0.986 0.7750 0.0068 0
-0.0509 -0.1565 -0.9864 0.051 -0.157 -0.986 0.8000 0.0068 0
-0.0747 -0.1467 -0.9864 0.075 -0.147 -0.986 0.8250 0.0068 0
-0.0967 -0.1332 -0.9864 0.097 -0.133 -0.986 0.8500 0.0068 0
-0.1164 -0.1164 -0.9864 0.116 -0.116 -0.986 0.8750 0.0068 0
-0.1332 -0.0967 -0.9864 0.133 -0.097 -0.986 0.9000 0.0068 0
-0.1467 -0.0747 -0.9864 0.147 -0.075 -0.986 0.9250 0.0068 0
-0.1565 -0.0509 -0.9864 0.157 -0.051 -0.986 0.9500 0.0068 0
-0.1626 -0.0257 -0.9864 0.163 -0.026 -0.986 0.9750 0.0068 0
-0.1646 0.0000 -0.9864 0.165 0.000 -0.986 1.0000 0.0068 0
-
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.0000 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.0250 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.0500 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.0750 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.1000 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.1250 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.1500 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.1750 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.2000 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.2250 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.2500 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.2750 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.3000 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.3250 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.3500 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.3750 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.4000 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.4250 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.4500 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.4750 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.5000 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.5250 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.5500 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.5750 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.6000 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.6250 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.6500 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.6750 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.7000 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.7250 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.7500 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.7750 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.8000 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.8250 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.8500 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.8750 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.9000 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.9250 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.9500 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 0.9750 0.0000 0
-0.0000 0.0000 -1.0000 0.000 0.000 -1.000 1.0000 0.0000 0
diff --git a/savi b/savi
index 6fd55c2..d758482 100755
--- a/savi
+++ b/savi
@@ -20,13 +20,14 @@
#
# Script that is always used to launch the binary SaVi executable
#
-# $Id: savi,v 1.76 2016/01/24 19:24:39 lloydwood Exp $
+# $Id: savi,v 1.81 2016/09/03 02:54:44 lloydwood Exp $
#
-# If SAVI environment variable is not defined
-# then set it to be the path of this file
+# If SAVI environment variable indicating directory is undefined
+# then set it to be the path of this file. Make this the directory.
#
: ${SAVI:=`dirname "$0"`}
+SAVI=$(cd "${SAVI}" && pwd)
#
# If this script is moved from the SaVi installation tree and run
@@ -72,11 +73,23 @@ if [ ! -d "$TK_LIBRARY" ]; then
TCL_LIBRARY=/usr/local/lib/tcl8.6
TK_LIBRARY=/usr/local/lib/tk8.6
- if [ ! -d "$TK_LIBRARY" ]; then
+ if [ ! -d "$TK_LIBRARY" ]; then
+ # SGI IRIX Nekoware
+ TCL_LIBRARY=/usr/nekoware/lib
+ TK_LIBRARY=/usr/nekoware/lib
+ fi
+
+ if [ ! -d "$TK_LIBRARY" ]; then
# Mandriva One 2010
TCL_LIBRARY=/usr/include
TK_LIBRARY=/usr/include
fi
+
+ if [ ! -d "$TK_LIBRARY" ]; then
+ # reasonable default
+ TCL_LIBRARY=/usr/lib
+ TK_LIBRARY=/usr/lib
+ fi
fi
@@ -167,7 +180,7 @@ fi
#
# Sanity check $SAVI location
#
-if [ ! -f "$SAVI/savi" ]; then
+if [ ! -f "${SAVI}/savi" ]; then
echo "SaVi: a copy of this script is not at $SAVI/savi. Is \$SAVI set correctly?" >&2
fi
@@ -274,11 +287,6 @@ if [ ! -f ${SAVIBIN} ]; then
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.
@@ -305,4 +313,4 @@ else
echo "(setenv SAVI \"$SAVI\")"
fi
-exec "$OLDCWD/${SAVIBIN}" $* ${params}
+exec "${SAVIBIN}" $* ${params}
diff --git a/src/Makefile b/src/Makefile
index cdf4ab2..bb5b79d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,6 @@
#
# Makefile for SaVi - src directory. Run top-level Makefile instead.
#
-# $Id: Makefile,v 1.45 2012/02/19 20:03:18 lloydwood Exp $
# Used for the version string. Can be overriden per-platform.
LINEEND = \\
@@ -31,7 +30,7 @@ include Makefile_defs_$(ARCH)
LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm
- DEBUGFLAGS = -Wall -Wextra -Wconversion -pedantic -ansi
+# DEBUGFLAGS = -Wall -Wextra -Wconversion -pedantic -ansi
# These do not find anything to warn about:
# DEBUGFLAGS = -Wshadow -Wpointer-arith -Wcast-qual \
diff --git a/src/Makefile_defs_irix b/src/Makefile_defs_irix
index 58be3d7..c43b538 100644
--- a/src/Makefile_defs_irix
+++ b/src/Makefile_defs_irix
@@ -1,11 +1,14 @@
#
# Makefile_defs_irix
#
-# Definitions which worked for SGI Irix systems at The Geometry Center.
+# Definitions which work for SGI Irix systems.
+#
+# Supported by Nekochan:
+# http://forums.nekochan.net/viewtopic.php?t=16730306
#
# Always run make ARCH=platform from the top-level savi directory.
#
-# $Id: Makefile_defs_irix,v 1.3 2007/12/18 18:22:05 lloydwood Exp $
+# $Id: Makefile_defs_irix,v 1.4 2016/02/09 01:37:21 lloydwood Exp $
########################################################
@@ -25,9 +28,6 @@ MACH = irix
########################################################
CC = gcc
-# override line terminator for version.c creation
-LINEEND =
-
########################################################
# #
# set TCL_INCLUDES so that the compiler can #
@@ -37,7 +37,7 @@ LINEEND =
# it is not necessary to set this #
# #
########################################################
-TCL_INCLUDES = -I/usr/local/include
+TCL_INCLUDES = -I/usr/nekoware/include
########################################################
# #
@@ -45,7 +45,7 @@ TCL_INCLUDES = -I/usr/local/include
# libtcl.a and libtk.a #
# #
########################################################
-TCL_LIBS = -L/usr/local/lib/irix -ltk -ltcl
+TCL_LIBS = -L/usr/nekoware/lib -ltk8.4 -ltcl8.4
########################################################
# #
diff --git a/src/Makefile_defs_linux b/src/Makefile_defs_linux
index 7c652d2..f5b7da3 100644
--- a/src/Makefile_defs_linux
+++ b/src/Makefile_defs_linux
@@ -10,7 +10,7 @@
# Always run make ARCH=platform from the top-level savi directory.
#
-# $Id: Makefile_defs_linux,v 1.12 2015/01/11 01:55:59 lloydwood Exp $
+# $Id: Makefile_defs_linux,v 1.13 2016/03/02 01:14:18 lloydwood Exp $
########################################################
@@ -51,8 +51,6 @@ TCL_INCLUDES = -I/usr/include/tcl -I/usr/include/tk
# libtcl.a and libtk.a. Alter to suit - see above. #
# #
########################################################
-# Debian requires a dot here: -ltcl8.4 -ltk8.4
-# as does Red Hat Enterprise.
TCL_LIBS = -ltcl -ltk
diff --git a/src/coverage_vis.c b/src/coverage_vis.c
index f6dc00d..a3d5a99 100644
--- a/src/coverage_vis.c
+++ b/src/coverage_vis.c
@@ -22,7 +22,7 @@
*
* Coverage visualization routines.
*
- * $Id: coverage_vis.c,v 1.134 2016/01/09 04:21:17 lloydwood Exp $
+ * $Id: coverage_vis.c,v 1.136 2016/03/16 01:26:48 lloydwood Exp $
*/
#include <math.h>
@@ -599,6 +599,11 @@ int
coverage_dynamic_initialised(void)
{
+ if (!geomview_stream_textures) {
+ error("Geomview does not support streaming images.");
+ return(FALSE);
+ }
+
if (!dynamic_errors_reported) {
#ifndef NO_ZLIB
/* We can support compressed images. User may have set
@@ -619,11 +624,7 @@ coverage_dynamic_initialised(void)
dynamic_errors_reported = TRUE;
}
- if (geomview_stream_textures) {
- return(TRUE);
- }
-
- return;
+ return(TRUE);
}
void
diff --git a/src/fisheye.c b/src/fisheye.c
index 6cde4e4..bd3c90a 100644
--- a/src/fisheye.c
+++ b/src/fisheye.c
@@ -20,7 +20,7 @@
*
* fisheye.c
*
- * $Id: fisheye.c,v 1.60 2016/01/09 04:21:17 lloydwood Exp $
+ * $Id: fisheye.c,v 1.61 2016/08/29 11:20:46 lloydwood Exp $
*/
#include <math.h>
@@ -138,7 +138,7 @@ fisheye_on_cmd(int argc, char *argv[])
char *
fisheye_off_cmd(int argc, char *argv[])
{
- int old_flag = fisheye_flag;
+ unsigned int old_flag = fisheye_flag;
fisheye_flag = FALSE;
@@ -150,7 +150,7 @@ fisheye_off_cmd(int argc, char *argv[])
char *
fisheye_labels_on_cmd(int argc, char *argv[])
{
- int old_flag = fisheye_labels_flag;
+ unsigned int old_flag = fisheye_labels_flag;
fisheye_labels_flag = TRUE;
@@ -162,7 +162,7 @@ fisheye_labels_on_cmd(int argc, char *argv[])
char *
fisheye_labels_off_cmd(int argc, char *argv[])
{
- int old_flag = fisheye_labels_flag;
+ unsigned int old_flag = fisheye_labels_flag;
fisheye_labels_flag = FALSE;
@@ -174,7 +174,7 @@ fisheye_labels_off_cmd(int argc, char *argv[])
char *
fisheye_reverse_view_on_cmd(int argc, char *argv[])
{
- int old_flag = fisheye_reverse_view_flag;
+ unsigned int old_flag = fisheye_reverse_view_flag;
fisheye_reverse_view_flag = TRUE;
@@ -187,7 +187,7 @@ fisheye_reverse_view_on_cmd(int argc, char *argv[])
char *
fisheye_reverse_view_off_cmd(int argc, char *argv[])
{
- int old_flag = fisheye_reverse_view_flag;
+ unsigned int old_flag = fisheye_reverse_view_flag;
fisheye_reverse_view_flag = FALSE;
@@ -218,7 +218,7 @@ fisheye_print_inview_off_cmd(int argc, char *argv[])
char *
fisheye_names_on_cmd(int argc, char *argv[])
{
- int old_flag = fisheye_names_flag;
+ unsigned int old_flag = fisheye_names_flag;
fisheye_names_flag = TRUE;
@@ -230,7 +230,7 @@ fisheye_names_on_cmd(int argc, char *argv[])
char *
fisheye_names_off_cmd(int argc, char *argv[])
{
- int old_flag = fisheye_names_flag;
+ unsigned int old_flag = fisheye_names_flag;
fisheye_names_flag = FALSE;
@@ -242,7 +242,7 @@ fisheye_names_off_cmd(int argc, char *argv[])
char *
fisheye_numbers_on_cmd(int argc, char *argv[])
{
- int old_flag = fisheye_numbers_flag;
+ unsigned int old_flag = fisheye_numbers_flag;
fisheye_numbers_flag = TRUE;
@@ -254,7 +254,7 @@ fisheye_numbers_on_cmd(int argc, char *argv[])
char *
fisheye_numbers_off_cmd(int argc, char *argv[])
{
- int old_flag = fisheye_numbers_flag;
+ unsigned int old_flag = fisheye_numbers_flag;
fisheye_numbers_flag = FALSE;
@@ -266,7 +266,7 @@ fisheye_numbers_off_cmd(int argc, char *argv[])
char *
fisheye_times_on_cmd(int argc, char *argv[])
{
- int old_flag = fisheye_times_flag;
+ unsigned int old_flag = fisheye_times_flag;
fisheye_times_flag = TRUE;
@@ -278,7 +278,7 @@ fisheye_times_on_cmd(int argc, char *argv[])
char *
fisheye_times_off_cmd(int argc, char *argv[])
{
- int old_flag = fisheye_times_flag;
+ unsigned int old_flag = fisheye_times_flag;
fisheye_times_flag = FALSE;
@@ -290,7 +290,6 @@ fisheye_times_off_cmd(int argc, char *argv[])
char *
fisheye_viewpoint_on_cmd(int argc, char *argv[])
{
-
fisheye_viewpoint_flag = TRUE;
update_coverage_display();
@@ -301,7 +300,6 @@ fisheye_viewpoint_on_cmd(int argc, char *argv[])
char *
fisheye_viewpoint_off_cmd(int argc, char *argv[])
{
-
fisheye_viewpoint_flag = FALSE;
/* can't seem to remove cross - update_ and redraw_coverage_display() don't work. */
diff --git a/src/gv_utils.c b/src/gv_utils.c
index 85b9053..e1e67f2 100644
--- a/src/gv_utils.c
+++ b/src/gv_utils.c
@@ -20,7 +20,7 @@
*
* gv_utils.c
*
- * $Id: gv_utils.c,v 1.33 2016/01/09 04:21:17 lloydwood Exp $
+ * $Id: gv_utils.c,v 1.35 2016/08/29 11:31:30 lloydwood Exp $
*/
#include <stdio.h>
#include <math.h>
@@ -32,7 +32,7 @@
#include <netinet/in.h>
-/* #include <sys/select.h> *//* WARNING - not strictly correct !!! */
+#include <sys/select.h>
/* extern int select(int, int *, int *, int *, struct timeval *); */
#include "int_types.h"
@@ -452,7 +452,7 @@ gv_ready()
gv_set_ready();
if (select(fileno(gv_in) + 1, &fds, NULL, NULL, &poll) > 0) {
- c = fgetc(gv_in);
+ c = (char)fgetc(gv_in);
if (c != '\n')
fprintf(stderr, "gv_ready: error, got char: %c (%d)\n", c, c);
gv_ack = FALSE;
diff --git a/src/main.c b/src/main.c
index 6e8b74a..96fd0a9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,7 @@
*
* main.c
*
- * $Id: main.c,v 1.89 2016/01/09 04:21:17 lloydwood Exp $
+ * $Id: main.c,v 1.90 2016/09/01 05:46:59 lloydwood Exp $
*/
#include <stdio.h>
@@ -354,6 +354,10 @@ decode_cmd_line(int argc, char *argv[])
}
}
+ if (!can_use_zlib) {
+ error("compiled without zlib compression.");
+ }
+
if (levels_error) {
error("Only 1 to 19 levels of color shading are supported.");
}
@@ -480,10 +484,6 @@ decode_cmd_line(int argc, char *argv[])
switches += strlen(temp_buffer);
}
}
-
- if (!can_use_zlib) {
- error("compiled without zlib compression.");
- }
length_savi_name = strlen(argv[0]);
length_switches = switches - temp_switches;
diff --git a/src/satCmd.c b/src/satCmd.c
index c87cae9..c94a53e 100644
--- a/src/satCmd.c
+++ b/src/satCmd.c
@@ -22,11 +22,12 @@
*
* procedure to implement tcl command "satellites"
*
- * $Id: satCmd.c,v 1.33 2016/01/09 04:21:17 lloydwood Exp $
+ * $Id: satCmd.c,v 1.37 2016/03/02 02:10:20 lloydwood Exp $
*/
#include <string.h>
#include <stdio.h>
+#include <tcl.h>
#include "fisheye.h"
#include "globals.h"
@@ -215,15 +216,11 @@ satCmd(ClientData clientData, Tcl_Interp * interpreter, int argc, char *argv[])
} else {
cmd_fn = keyword_to_fn(argv[1]);
if (cmd_fn) {
- interpreter->result = cmd_fn(argc, argv);
+ Tcl_SetResult(interpreter, cmd_fn(argc, argv), TCL_STATIC);
} else {
error_format("satCmd %s unrecognized", argv[1]);
}
}
- if (debug && interpreter->result) {
- fprintf(stderr, "\t%s\n", interpreter->result);
- }
-
return TCL_OK;
}
diff --git a/src/tcl_utils.c b/src/tcl_utils.c
index 7c93746..f01ccb7 100644
--- a/src/tcl_utils.c
+++ b/src/tcl_utils.c
@@ -20,7 +20,7 @@
*
* tcl_utils.c
*
- * $Id: tcl_utils.c,v 1.40 2016/01/09 04:21:17 lloydwood Exp $
+ * $Id: tcl_utils.c,v 1.43 2016/02/09 05:11:49 lloydwood Exp $
*/
#include "constants.h"
@@ -46,7 +46,11 @@ unsigned int
tcl_init(Tcl_Interp * interpreter)
{
if (Tcl_Init(interpreter) == TCL_ERROR) {
+#if (TK_MAJOR_VERSION >= 8)
+ error_format("tcl_init: Error in Tcl_Init: %s", Tcl_GetStringResult(interpreter));
+#else
error_format("tcl_init: Error in Tcl_Init: %s", interpreter->result);
+#endif
return FALSE;
}
return TRUE;
@@ -65,11 +69,19 @@ tk_init(Tcl_Interp * interpreter)
static char className[] = "";
if (Tk_Init(interpreter) == TCL_ERROR) {
+#if (TK_MAJOR_VERSION >= 8)
+ error_format("tk_init: Error in Tk_Init: %s", Tcl_GetStringResult(interpreter));
+#else
error_format("tk_init: Error in Tk_Init: %s", interpreter->result);
+#endif
return FALSE;
}
if (!tcl_app_init()) {
- error_format("tk_init: Error in app_init: %s", interpreter->result);
+#if (TK_MAJOR_VERSION >= 8)
+ error_format("tk_init: Error in tcl_app_init: %s", Tcl_GetStringResult(interpreter));
+#else
+ error_format("tk_init: Error in tcl_app_init: %s", interpreter->result);
+#endif
return FALSE;
}
@@ -302,7 +314,7 @@ unsigned int
tk_update()
{
static char update[] = "update";
- char *argv[1];
+ const char *argv[1];
int argc = 1;
argv[0] = update;
diff --git a/tcl/Makefile b/tcl/Makefile
index d7f7950..121ea41 100644
--- a/tcl/Makefile
+++ b/tcl/Makefile
@@ -1,16 +1,17 @@
#
# Makefile - SaVi tcl directory. Run top-level Makefile instead.
#
-# $Id: Makefile,v 1.19 2014/11/25 10:09:40 lloydwood Exp $
+# $Id: Makefile,v 1.21 2016/03/28 04:24:44 lloydwood Exp $
SHELL = /bin/sh
RM = /bin/rm -f
- TCL_SRCS = init.tcl main.tcl utils.tcl load.tcl save.tcl \
+ TCL_SRCS = init.tcl main.tcl utils.tcl load.tcl save.tcl coverage_frames.tcl \
coverage.tcl coverage_size.tcl edit.tcl fisheye.tcl params.tcl \
geomview.tcl random.tcl about.tcl oe.tcl constellations.tcl \
no_frames.tcl snapshot.tcl rosette.tcl star.tcl empty.tcl \
- sunlight.tcl equator.tcl details.tcl helpfile.tcl
+ sunlight.tcl equator.tcl details.tcl helpfile.tcl \
+ load_url_tle.tcl
TCLSH = tclsh
diff --git a/tcl/about.tcl b/tcl/about.tcl
index a46be80..436f190 100644
--- a/tcl/about.tcl
+++ b/tcl/about.tcl
@@ -19,13 +19,20 @@
######################################################
#
# about.tcl
-# $Id: about.tcl,v 1.33 2016/01/09 04:21:17 lloydwood Exp $
+# $Id: about.tcl,v 1.34 2016/03/09 06:26:03 lloydwood Exp $
proc about(build) {} {
+ global debug
+
if {[eval window(raise) about]} return
set name [build_Toplevel about]
+ set package_names ""
+ if {$debug > 0} {
+ set package_names [eval package names]
+ }
+
wm protocol $name WM_DELETE_WINDOW about(dismiss)
build_Title $name "about SaVi - satellite constellation visualization"
@@ -68,6 +75,7 @@ http://www.geom.uiuc.edu/~worfolk/SaVi/
SaVi is using Tcl/Tk [info patchlevel] and obeyed the launch command:
[satellites COMMAND_LINE]
+$package_names
"
pack $cmd.l2 -anchor n -ipadx 15m -ipady 2m
diff --git a/tcl/coverage.tcl b/tcl/coverage.tcl
index 87ab7dc..971268f 100644
--- a/tcl/coverage.tcl
+++ b/tcl/coverage.tcl
@@ -20,7 +20,7 @@
#
# coverage.tcl
#
-# $Id: coverage.tcl,v 1.166 2016/01/09 04:21:17 lloydwood Exp $
+# $Id: coverage.tcl,v 1.174 2016/03/29 01:53:57 lloydwood Exp $
# Note: IM_W and IM_H are linked to C variables for the image size
@@ -64,12 +64,14 @@ proc coverage(init) {} {
set coverage_projection $Projection(unprojected)
set last_coverage_projection $coverage_projection
+
+ coverage(init_coldiv_coldec)
}
proc coverage(build) {} {
global FONT COLOR COLDIV COLDEC coverage_flag no_access_flag tracks_flag \
coverage_proj_flag coverage_angle_flag project_tracks_flag map_flag \
- coverage_projection coverage_angle IM_W IM_H im_x_offset im_y_offset \
+ coverage_projection coverage_angle im IM_W IM_H im_x_offset im_y_offset \
coverage_flag_dismissed tracks_flag_dismissed no_access_flag_dismissed \
coverage_display_center_longitude coverage_name \
sun_flag Fisheye NUM_COLORS NUM_COLORS_PREV
@@ -100,8 +102,11 @@ proc coverage(build) {} {
{"File" \
{"Load satellites..." "load(build)"} \
{"Save satellites as Tcl script..." "save(build)" "S"} \
+ {} \
+ {"Load new constellation TLEs from web..." "load_url_tle(build)"} \
{} \
{"Save map..." "coverage(save_map)" "M"} \
+ {"Save animation..." "coverage_frames(build)"} \
{} \
{"Load color shades..." "coverage(load_colors)"} \
{"Save color shades..." "coverage(save_colors)"} \
@@ -926,10 +931,38 @@ proc coverage(decaycolor) {n} {
coverage(update_decay)
}
+proc coverage(save_map_handler) {filename} {
+ global im IM_H IM_W
+
+ # supported in Tcl 8.5 and 8.6
+ if {[string_ends "$filename" ".gif"] } {
+ set ext gif
+ }
+
+ # not supported in Tcl 8.5. Uncertain 8.6 support.
+ if {[string_ends "$filename" ".png"] } {
+ set ext png
+ }
+
+ if {[string_ends "$filename" ".ppm"] } {
+ set ext ppm
+ }
+
+ $im write "$filename" -format $ext -from 0 0 $IM_W $IM_H
+ puts stderr "\nSaVi: saved map as $ext to $filename"
+}
+
proc coverage(save_map) {} {
+ # {"SaVi coverage map (png)" {.png} }
+ # gives two-color images in 8.6 only, doesn't work in 8.5,
+ # and produces larger filesizes than gif.
+
+ # {"SaVi coverage map (ppm)" {.ppm} }
+ # works consistently, but is uncompressed.
set types {
- {"SaVi coverage map (gzipped)" {.ppm.gz} }
+ {"SaVi coverage map (gif)" {.gif} } \
+ {"SaVi coverage map (gzipped)" {.ppm.gz} } \
}
set filename [tk_getSaveFile -filetypes $types \
@@ -939,6 +972,11 @@ proc coverage(save_map) {} {
set length [string length "$filename"]
+ if {[string_ends "$filename" ".png"] || [string_ends "$filename" ".gif"]} {
+ coverage(save_map_handler) $filename
+ return
+ }
+
if {[string_ends "$filename" ".gz"]} {
set filename [string range "$filename" 0 [expr $length - 4]]
}
@@ -949,9 +987,14 @@ proc coverage(save_map) {} {
satellites COVERAGE_SAVE_MAP "$filename"
- puts stderr "\nSaVi: saved map as raw ppm to $filename"
- exec gzip -9 "$filename"
- puts stderr "\nSaVi: gzip-compressed map to $filename.gz"
+ set gzip gzip
+
+ if {[catch {eval exec $gzip -9 "$filename"}]} {
+ puts stderr "\nSaVi: saved map as raw ppm to $filename"
+ puts stderr " failed to compress map with $gzip."
+ return
+ }
+ puts stderr "\nSaVi: saved $gzip-compressed map to $filename.gz"
}
proc coverage(dismiss) {} {
diff --git a/tcl/coverage_frames.tcl b/tcl/coverage_frames.tcl
new file mode 100644
index 0000000..82569e6
--- /dev/null
+++ b/tcl/coverage_frames.tcl
@@ -0,0 +1,95 @@
+#
+######################################################
+#
+# SaVi by Lloyd Wood (lloydwood at users.sourceforge.net),
+# Patrick Worfolk (worfolk at alum.mit.edu) and
+# Robert Thurman.
+#
+# Copyright (c) 1997 by The Geometry Center.
+# Also Copyright (c) 2016 by Lloyd Wood.
+#
+# This file is part of SaVi. SaVi is free software;
+# you can redistribute it and/or modify it only under
+# the terms given in the file COPYRIGHT which you should
+# have received along with this file. SaVi may be
+# obtained from:
+# http://savi.sourceforge.net/
+# http://www.geom.uiuc.edu/locate/SaVi
+#
+######################################################
+#
+# coverage_frames.tcl
+#
+# $Id: coverage_frames.tcl,v 1.7 2016/05/05 08:14:50 lloydwood Exp $
+
+proc coverage_frames(build) {} {
+ global total_frames
+
+ if {[eval window(raise) coverage_frames]} return
+
+ set name [build_Toplevel coverage_frames]
+
+ wm protocol $name WM_DELETE_WINDOW coverage_frames(dismiss)
+
+ build_Title $name "Choose no. of frames to save..."
+
+ build_LabelEntryColumns $name total_frames \
+ {ientry "" {total_frames} } \
+ {text "" {frames} }
+
+ bind $name.total_frames.c0.0 <Return> {coverage_frames(save) $total_frames}
+
+ build_Buttonbar $name dbbar \
+ {"10" "coverage_frames(save) 10"} \
+ {"50" "coverage_frames(save) 50"} \
+ {"100" "coverage_frames(save) 100"} \
+ {"500" "coverage_frames(save) 500"} \
+ {"Cancel" "coverage_frames(dismiss)"} \
+ {"Save" "coverage_frames(save) $total_frames"}
+
+ update
+}
+
+proc coverage_frames(save) v {
+ global im IM_H IM_W
+
+ if {$v < 0} return
+
+ coverage_frames(dismiss)
+
+ set types {
+ {"SaVi coverage animation" {.gif} }
+ }
+
+ set filename [tk_getSaveFile -filetypes $types \
+ -title "SaVi: save frames to folder" ]
+
+ if {"$filename" == ""} return
+
+ if {$v == 1} {
+ # write a single image.
+ $im write "$filename" -format gif -from 0 0 $IM_W $IM_H
+ } else {
+ set gifsicle gifsicle
+ set files "exec $gifsicle -O3"
+ set rmfiles "exec rm"
+ for {set j 0} {$j < $v} {incr j} {
+ set n [format "%07d" $j]
+ set files "$files $filename-$n"
+ set rmfiles "$rmfiles $filename-$n"
+ $im write "$filename-$n" -format gif -from 0 0 $IM_W $IM_H
+ main(forw_step)
+ }
+ if {[catch {eval $files > $filename}]} {
+ puts stderr "\nSaVi: could not run $gifsicle successfully. Is $gifsicle installed?"
+ } else {
+ puts stderr "\nSaVi: told $gifsicle to save animation of $v frames in $filename"
+ }
+ eval $rmfiles
+ }
+}
+
+proc coverage_frames(dismiss) {} {
+
+ destroy .coverage_frames
+}
diff --git a/tcl/fisheye.tcl b/tcl/fisheye.tcl
index 06c2129..15c5238 100644
--- a/tcl/fisheye.tcl
+++ b/tcl/fisheye.tcl
@@ -20,7 +20,7 @@
#
# fisheye.tcl
#
-# $Id: fisheye.tcl,v 1.65 2016/01/09 04:21:17 lloydwood Exp $
+# $Id: fisheye.tcl,v 1.69 2016/05/30 11:22:25 lloydwood Exp $
proc fisheye(init) {} {
global fisheye_flag fisheye_reverse_view_flag fisheye_names_flag fisheye_numbers_flag \
@@ -81,6 +81,8 @@ proc fisheye(build) {} {
{"Load satellites..." "load(build)"} \
{"Save satellites as Tcl script..." "save(build)" "S"} \
{} \
+ {"Load new constellation TLEs from web..." "load_url_tle(build)"} \
+ {} \
{"Save fisheye as postscript..." fisheye(save)} \
{} \
{"Close window" "fisheye(dismiss)" "W"} \
@@ -154,12 +156,13 @@ proc fisheye(build) {} {
main(rendering_menu) $fisheye_name.mbar.b4
build_options_menu $fisheye_name.mbar.b5 \
+ {"Plot location on map" fisheye_viewpoint_flag } \
+ {} \
{"Show numbers" fisheye_numbers_flag} \
{"Show names" fisheye_names_flag} \
{"Show time in view" fisheye_times_flag} \
- {"Plot location on map" fisheye_viewpoint_flag} \
{} \
- {"Show equator" plane_flag} \
+ {"Show stationary arc" plane_flag} \
{} \
{"Reverse fisheye view" fisheye_reverse_view_flag}
@@ -184,11 +187,11 @@ proc fisheye(build) {} {
pack $cmdr
build_Optionslist $cmd olist \
- {"Show numbers" fisheye_numbers_flag} \
- {"Show names" fisheye_names_flag} \
- {"Show time in view" fisheye_times_flag} \
{"Plot location on map" fisheye_viewpoint_flag} \
- {"Show equator" plane_flag}
+ {"Numbers" fisheye_numbers_flag} \
+ {"Names" fisheye_names_flag} \
+ {"Time in view" fisheye_times_flag} \
+ {"Stationary arc" plane_flag}
set cmdb [build_StdFrame $cmd b]
diff --git a/tcl/init.tcl b/tcl/init.tcl
index b9fa682..8a61eb0 100644
--- a/tcl/init.tcl
+++ b/tcl/init.tcl
@@ -20,7 +20,7 @@
#
# init.tcl
#
-# $Id: init.tcl,v 1.91 2016/01/09 04:21:17 lloydwood Exp $
+# $Id: init.tcl,v 1.93 2016/02/12 06:38:31 lloydwood Exp $
proc geomview_init {} {
global satellites_flag box_sat_flag planes_sat_flag fancy_sat_flag \
@@ -113,13 +113,21 @@ proc app_init {} {
set modifier_indicator "Command"
set PLATFORM 1
} elseif {[string equal [tk windowingsystem] win32]||[file exists /cygdrive]} {
- # Tcl on Windows - grey
+ # Tcl on Windows - grey to match XP. Vary to suit interface.
set COLOR(bg) #d4d0c8
set COLOR(abg) #bbb
set COLOR(sbg) #aaa
set modifier "Control"
set modifier_indicator "Ctrl"
set PLATFORM 2
+ } elseif {[file exists /usr/bsd ]&&[file exists /usr/sbin ]} {
+ # Tcl on IRIX - different grey
+ set COLOR(bg) #c1c1c1
+ set COLOR(abg) #bbb
+ set COLOR(sbg) #aaa
+ set modifier "Control"
+ set modifier_indicator "Ctrl"
+ set PLATFORM 3
} else {
# Tcl on Unix - shades of blue
set COLOR(bg) #acf
@@ -139,8 +147,6 @@ proc app_init {} {
tk_setPalette background $COLOR(bg) \
activeBackground $COLOR(abg) selectBackground $COLOR(abg)
- coverage(init_coldiv_coldec)
-
# close the default toplevel window
wm withdraw .
@@ -183,6 +189,7 @@ proc app_init {} {
equator(init)
coverage(init)
fisheye(init)
+ load_url_tle(init)
# build top window
set last_filename ""
diff --git a/tcl/load_url_tle.tcl b/tcl/load_url_tle.tcl
new file mode 100644
index 0000000..8452c24
--- /dev/null
+++ b/tcl/load_url_tle.tcl
@@ -0,0 +1,165 @@
+#
+######################################################
+#
+# SaVi by Lloyd Wood (lloydwood at users.sourceforge.net),
+# Patrick Worfolk (worfolk at alum.mit.edu) and
+# Robert Thurman.
+#
+# Copyright (c) 1997 by The Geometry Center.
+# Also Copyright (c) 2016 by Lloyd Wood.
+#
+# This file is part of SaVi. SaVi is free software;
+# you can redistribute it and/or modify it only under
+# the terms given in the file COPYRIGHT which you should
+# have received along with this file. SaVi may be
+# obtained from:
+# http://savi.sourceforge.net/
+# http://www.geom.uiuc.edu/locate/SaVi
+#
+######################################################
+#
+# load_url_tle.tcl
+#
+# $Id: load_url_tle.tcl,v 1.14 2016/08/31 06:53:07 lloydwood Exp $
+
+proc load_url_tle(init) {} {
+ global url_choice load_url
+
+ set url_choice 0
+ set load_url "http://"
+}
+
+proc load_url_tle(build) {} {
+ global url_choice load_url
+
+ if {[eval window(raise) load_url_tle]} return
+
+ set name [build_Toplevel load_url_tle]
+
+ wm protocol $name WM_DELETE_WINDOW load_url_tle(dismiss)
+
+ build_Title $name "Load constellation TLE set from web URL..."
+
+ set cmd [build_CmdFrame $name cmd]
+
+ set cmda [build_StdFrame $name cmd]
+
+ build_IPopupMenu $cmda p0 "" \
+ url_choice load_url_tle(choice) { \
+ "Enter URL of TLE:" \
+ "Iridium (Celestrak)" \
+ "Globalstar (Celestrak)" \
+ "Orbcomm (Celestrak)" \
+ "GPS (Celestrak)" \
+ "Glonass (Celestrak)" \
+ "Galileo (Celestrak)" \
+ "Molniya (Celestrak) " \
+ "Cubesats (Celestrak)" \
+ "Planet Labs (Planet Labs)" \
+ }
+ pack $cmda.p0 -side left
+
+ build_LabelEntryColumns $cmda url_path \
+ {lentry "" {load_url} }
+
+ bind $cmda.url_path.c0.0 <Return> {load_url_tle(load) $load_url}
+
+ pack $cmda -expand 1 -fill x
+
+ build_Buttonbar $name dbbar \
+ {"Load elsets from web" {load_url_tle(load) $load_url} } \
+ {"Cancel" "load_url_tle(dismiss)"}
+
+ update
+}
+
+proc load_url_tle(choice) {} {
+ global url_choice load_url
+
+ # sources on web for TLEs:
+ # http://celestrak.com/NORAD/elements/
+ # http://www.idb.com.au/joomla/index.php
+
+ switch $url_choice {
+ 0 {
+ set load_url "http://"
+ }
+ 1 {
+ set load_url "http://www.celestrak.com/NORAD/elements/iridium.txt"
+ }
+ 2 {
+ set load_url "http://www.celestrak.com/NORAD/elements/globalstar.txt"
+ }
+ 3 {
+ set load_url "http://www.celestrak.com/NORAD/elements/orbcomm.txt"
+ }
+ 4 {
+ set load_url "http://www.celestrak.com/NORAD/elements/gps-ops.txt"
+ }
+ 5 {
+ set load_url "http://www.celestrak.com/NORAD/elements/glo-ops.txt"
+ }
+ 6 {
+ set load_url "http://www.celestrak.com/NORAD/elements/galileo.txt"
+ }
+ 7 {
+ set load_url "http://www.celestrak.com/NORAD/elements/molniya.txt"
+ }
+ 8 {
+ set load_url "http://www.celestrak.com/NORAD/elements/cubesat.txt"
+ }
+ 9 {
+ set load_url "http://ephemerides.planet-labs.com/planet_mc.tle"
+ }
+ }
+}
+
+proc load_url_tle(load) {url} {
+
+if {[catch {package require http}]} {
+ puts stderr "\nSaVi: Unable to download TLEs. Tcl http package not found."
+ return
+}
+
+# https support requires third-party tls package by Matt Newman
+# see http://wiki.tcl.tk/1475 and http://wiki.tcl.tk/2630
+
+ set filename [file tail $url]
+ if {{string first "http://" $url} < 0} {
+ puts stderr "\nSaVi: needs a valid http url"
+ }
+
+ set r [http::geturl $url -binary 1]
+
+ # we append .tle because SaVi insists that tle files end .tle
+ set localfile "/tmp/$filename.tle"
+ set n 1
+ while {[file exists $localfile]} {
+ set localfile "/tmp/$filename-$n.tle"
+ incr n
+ }
+ set fo [open $localfile w]
+ fconfigure $fo -translation binary
+ puts -nonewline $fo [http::data $r]
+ close $fo
+
+ ::http::cleanup $r
+ puts stderr "\nSaVi: downloaded \"$url\" to \"$localfile\""
+
+ puts stderr "\nSaVi: replacing any existing satellites so that time 0 is consistent."
+ main(delete_all)
+
+ main(load_file) $localfile
+
+ load_url_tle(dismiss)
+}
+
+proc load_url_tle(dismiss) {} {
+
+ destroy .load_url_tle
+}
+
+proc load_url_tle(cancel) {} {
+
+ load_url_tle(dismiss)
+}
diff --git a/tcl/main.tcl b/tcl/main.tcl
index b59b099..8509d1a 100644
--- a/tcl/main.tcl
+++ b/tcl/main.tcl
@@ -20,7 +20,7 @@
#
# main.tcl
#
-# $Id: main.tcl,v 1.158 2016/01/17 23:24:21 lloydwood Exp $
+# $Id: main.tcl,v 1.162 2016/09/03 06:49:39 lloydwood Exp $
proc main(build) {} {
global main_name COLOR FONT TITLE geomview_module last_filename PLATFORM
@@ -58,9 +58,11 @@ proc main(build) {} {
if {$geomview_module == 0} {
build_Menu $main_name.mbar.b0 \
- {"Load satellites..." "load(build)"} \
+ {"Load more satellites..." "load(build)"} \
{"Save satellites as Tcl script..." "save(build)" "S"} \
{} \
+ {"Load new constellation TLEs from web..." "load_url_tle(build)"} \
+ {} \
{"Quit" "main(exit)" "Q"}
build_Menu $main_name.mbar.b2 \
{"Global coverage..." "coverage(build)" "G"} \
@@ -77,6 +79,8 @@ proc main(build) {} {
build_Menu $main_name.mbar.b0 \
{"Load satellites..." "load(build)"} \
{"Save satellites as Tcl script..." "save(build)" "S"} \
+ {} \
+ {"Load new constellation TLEs from web..." "load_url_tle(build)"} \
{} \
{"Save Geomview camera screenshots..." "no_frames(build)"} \
{"Save Geomview print rendering..." "snapshot(build)"} \
@@ -267,7 +271,6 @@ proc main(rendering_menu) {submenu} {
{"Show central body" earth_flag} \
{"Use simple Earth map" simple_earth_flag} \
{"Use detailed Earth map" fancy_earth_flag} \
- {"Texture mapping" texture_flag} \
{} \
{"Animate in Geomview" geomview_flag}
} else {
@@ -730,6 +733,7 @@ proc main(load_file) {filename} {
if {[string_ends "$filename" ".tle"]} {
set last_filename "$filename"
# tle file
+ # if sunlight is on should really turn it off as misleading.
tle_file_input "$filename"
} elseif {[string_ends "$filename" ".tcl"]} {
set last_filename "$filename"
diff --git a/tcl/no_frames.tcl b/tcl/no_frames.tcl
index 5e2e8c6..328e53a 100644
--- a/tcl/no_frames.tcl
+++ b/tcl/no_frames.tcl
@@ -20,7 +20,7 @@
#
# no_frames.tcl
#
-# $Id: no_frames.tcl,v 1.21 2016/01/09 04:21:17 lloydwood Exp $
+# $Id: no_frames.tcl,v 1.22 2016/03/29 03:43:13 lloydwood Exp $
proc no_frames(build) {} {
if {[eval window(raise) no_frames]} return
@@ -45,6 +45,8 @@ proc no_frames(build) {} {
proc no_frames(save) v {
+ if {$v < 0} return
+
no_frames(dismiss)
set types {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/savi.git
More information about the Pkg-grass-devel
mailing list