debian/0000755000000000000000000000000012214365722007172 5ustar debian/rtdCubeDisplay.man0000644000000000000000000000167612201417051012604 0ustar .TH RTDCUBEDISPLAY "1" "March 2009" "RTDCUBEDISPLAY" "User Commands" .SH NAME rtdCubeDisplay - simple FITS cube display program .SH SYNOPSIS .B rtdCubeDisplay \fI\-f \-c [\-l] [\-t msec] [\-v]\fR .SH DESCRIPTION rtdCubeDisplay displays FITS cube images for the real-time display. By specifying a FITS cube file (option \-f) and a camera name (option \-c) the images are extracted from the file and an image event is sent to the rtdServer. In order to display the image a rtd widget application e.g. 'rtd' must register to the same camera name as specified above. For the 'rtd' application this is done by setting the RTD_CAMERA environment. .TP \fB\-f \fR FITS cube images .TP \fB\-c \fR Camera name to identify real time source .TP \fB\-l\fR Loop indefinetly .TP \fB\-t msec\fR Delay time between cube images (in msec) default 500 ms .TP \fB\-v\fR Verbose mode .SH "SEE ALSO" rtd(1),rtdServer(1),rtcClient(1) debian/rtd.man0000644000000000000000000000760312201417072010456 0ustar .TH RTD "1" "March 2009" "RTS" "User Commands" .SH NAME rtd - real-time image display application .SH SYNOPSIS .B rtd \fIoptions filename\fR .SH DESCRIPTION The rtd application is used to display FITS images in real-time. The application is based on "rtdimage", a Tk image extension for displaying FITS images. .SH OPTIONS .TP \fB\-file name\fR "name" specifies a FITS format file to load and display. .TP \fB\-subsample bool\fR If bool is true, subsampling is used when shrinking the image, i.e.: if the image is shrunk by 1/3, only every third pixel is displayed. Otherwise, the maximum value is taken from the group of pixels. .TP \fB\-sampmethod n\fR (experimental) If option 'subsample' is false, the following methods can be used for displaying a shrunk image (i.e. an image with a scale factor < 1): .IP "0" max value of all pixels in a NxN box (default) .IP 1 min value of all pixels in a NxN box .IP 2 mean value of all pixels in a NxN box .IP 3 median value of all pixels in a NxN box .IP 4 max value of pixels on a diagonal cross in a NxN box .IP 5 min value of pixels on a diagonal cross in a NxN box .IP 6 mean value of pixels on a diagonal cross in a NxN box .IP 7 median value of pixels on a diagonal cross in a NxN box .IP 8 median value of pixels in a chess-board like box .IP 9 median value of a 3x3 box .TP \fB\-usexshm bool\fR If bool is true (default), attempt to use X shared memory for the image display, if available. This improves performance considerably, but is only available when working on the system console. .TP \fB\-usexsync bool\fR If true, try to use X synchronisation. .TP \fB\-verbose bool\fR If bool is true, diagnostic messages are printed out to show what is going on internally (for debugging use). .TP \fB\-default_cmap\fR This option sets the default colormap file to use when starting up. Only the root of the filename should be specified for this option, for example: "ramp" for a grey level colormap. For a list of available colormap files, see the colormaps directory in the rtd release. .TP \fB\-min_colors n\fR .TP \fB\-max_colors n\fR Specify the min and max number of colors to allocate before using a private colormap. .TP \fB\-default_itt This option is similar to \-default_cmap, except it sets the default ITT (intensity transfer table) file to use at startup. ITT files are also stored in the colormaps directory. .TP \fB\-xscale xs\fR .TP \fB\-yscale ys\fR Set the default scaling factors (default: 1). .TP \fB\-camera name\fR Set the camera name for real-time image events: default: taken from the RTD_CAMERA environment variable, if set, otherwise set to RTDSIMULATOR, for simulation test mode. .TP \fB\-zoom_factor number\fR Set the scale factor for the zoom window (default 5 x the original image). .TP \fB\-colorramp_height h\fR Set the height of the colorramp subwindow (default: 20). .TP \fB\-with_zoom_window bool\fR If bool is true (default), add a zoom window. .TP \fB\-with_pan_window bool\fR If bool is true (default), add a panning window. .TP \fB\-dozoom bool\fR If true, turn on zoom window. .TP \fB\-disp_image_icon bool\fR If true, display a copy (view) of the image as an icon. .TP \fB\-drag_scroll bool\fR If true, set bindings to scroll with the middle mouse button. .TP \fB\-scrollbars bool\fR If true, display scrollbars to scroll the image. .TP \fB\-port port\fR Default port for remote connections (0 means system chooses a port). .TP \fB\-debug bool\fR Debugging flag: enables real-time simulation with testProg (below). .TP \fB\-testprog path\fR For testing: name of test program used to generate real-time updates (tRtd). .TP \fB\-interval n\fR For testing: interval between updates in ms. .TP \fB\-with_perftest bool\fR If true, display performance tester utility in menu bar. .TP \fB\-with_warp bool\fR Option to warp the mouse pointer. .SH FILES $RTD_LIBRARY/../demos/rtd.tcl .SH SEE ALSO rtdServer(1),RtdClient(1),RtdCubeDisplay(1),skycat(1) debian/clean0000644000000000000000000000036212201221743010166 0ustar Makefile config.log config.status tclutil/config.log confdefs.h astrotcl/library/tclIndex cat/library/tclIndex skycat/library/tclIndex skycat/linux/skycat.spec skycat/skycat tclutil/library/tclIndex rtd/library/tclIndex tclutil/tShellCommand debian/compat0000644000000000000000000000000212201221743010356 0ustar 9 debian/changelog0000644000000000000000000000101012214365567011043 0ustar skycat (3.1.2+starlink1~b-3) unstable; urgency=low * Fix FTBS on hurd (MAXPATHLEN). -- Ole Streicher Thu, 12 Sep 2013 09:18:32 +0200 skycat (3.1.2+starlink1~b-2) unstable; urgency=low * Configure shared libs for hurd-i386 and kfreeBSD-* correctly. -- Ole Streicher Wed, 11 Sep 2013 17:08:17 +0200 skycat (3.1.2+starlink1~b-1) unstable; urgency=low * Initial release. (Closes: #719116) -- Ole Streicher Wed, 15 May 2013 12:30:33 +0200 debian/control0000644000000000000000000000243212201421656010571 0ustar Source: skycat Section: science Priority: optional Maintainer: Debian Science Maintainers Uploaders: Ole Streicher Build-Depends: blt-dev (>= 2.4z), debhelper (>= 9), dh-autoreconf, itcl3, itk3, libcfitsio3-dev, libwcstools-dev, tcl-dev (>= 8.5), tk-dev (>= 8.5) Standards-Version: 3.9.4 Homepage: http://archive.eso.org/cms/tools-documentation/skycat.html Vcs-Git: git://anonscm.debian.org/debian-science/packages/skycat.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/skycat.git Package: skycat Architecture: any Depends: blt (>= 2.4z), itcl3, itk3, libtk-img, tcl (>= 8.5), tclx8.4, tk (>= 8.5), ${misc:Depends}, ${shlibs:Depends} Description: Image visualization and access to catalogs and data for astronomy The ESO/Starlink Skycat tool combines the image display capabilities of the RTD (Real-Time Display) with a set of classes for accessing astronomical catalogs locally and over the network using HTTP. The tool allows you to view FITS images from files or from the Digitized Sky Survey (DSS). debian/docs0000644000000000000000000000002712201221743010032 0ustar README README.Starlink debian/rtdServer.man0000644000000000000000000000376512201417115011650 0ustar .TH RTDSERVER "1" "March 2009" "RTDSERVER" "User Commands" .SH NAME rtdServer - image event dispatcher for RTD .SH SYNOPSIS .B rtdServer \fI[\-v] [\-p] [\-s]\fR .SH DESCRIPTION rtdServer is the process that manages the image event mechanism. Clients register to the rtdServer via the rtdInitImageEvt call. When a client attaches to a camera source an incoming image event will be forwarded to this client. Several clients can attach to the same camera source as the multicasting of event notification is supported by the rtdServer. Image events received from image sources where no clients are attached are simply discarded. Clients can also attach to image sources that not have registered yet as the rtdServer supports a independence between image event producer and image event consumer. Furthermore rtdServer contains a simulator part that can be used to simulate the generation of image events. This feature is reserved for testing purposes only. Similarly, it also contains a performance test facility, in which several areas of shared memory are sent to a client Rtd in quick succession, and measurements are taken on certain performance parameters (see RtdPerformanceTool(3/n). The rtdServer also implements semaphore locking of shared memory, to avoid the possibility of the RTD client reading the shared memory at the same time as the CCD writes (this is known as "image jitter"). The server program expects the CCD software to set a semaphore against any shared memory that has been written to (effectively to lock it). The server will then increment this semaphore by the number of RTD clients less one. If semaphores are not implemented in the incoming image event, no action is taken. The overall locking scheme is discussed in more detail in rtdSem(1). Semaphore locking is implemented in the simulator facility. .TP \fB\-v\fR verbose mode .TP \fB\-p\fR port number, default 5555. Set with RTD_SERVER_PORT .TP \fB\-t\fR delay between image events in msec (default 5) .SH "SEE ALSO" rtd(1),rtdClient(1),rtcCubeClient(1) debian/copyright0000644000000000000000000001026412201431715011120 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: skycat Upstream-Contact: archive@eso.org Source: https://github.com/Starlink/skycat/releases Files: * astrotcl/cfitsio/compress.c Copyright: 1995-2009 European Southern Observatory (ESO), 1994 Allan Brighton (abrighto@eso.org) 1984-1991 Free Software Foundation, Inc. 1991-1994 The Regents of the University of California. 1992-1993 Jean-loup Gailly 1993 Association of Universities for Research 1994-1995 Sun Microsystems, Inc. 1995-2002 Mark Calabretta 1998-2005 Central Laboratory of the Research Councils. 1998-1999 by Scriptics Corporation. 1999-2000 Ajuba Solutions. 2002-2005 ActiveState Corporation. 2006, 2008 Junio C Hamano 2006 Particle Physics & Astronomy Research Council. 1994-2006 Associated Universities, Inc. Washington DC, USA. License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. Files: astrotcl/libwcs/* astrotcl/cfitsio/wcsutil.c Copyright: 1989-2007 Smithsonian Astrophysical Observatory License: LGPL-2+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. . On Debian systems, the full text of the GNU Lesser General Public License version 2 can be found in the file `/usr/share/common-licenses/LGPL-2'. Notice: These files are not used to build the package. Files: astrotcl/cfitsio/* Copyright: William Pence License: MIT Copyright (Unpublished--all rights reserved under the copyright laws of the United States), U.S. Government as represented by the Administrator of the National Aeronautics and Space Administration. No copyright is claimed in the United States under Title 17, U.S. Code. . Permission to freely use, copy, modify, and distribute this software and its documentation without fee is hereby granted, provided that this copyright notice and disclaimer of warranty appears in all copies. . DISCLAIMER: . THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE. IN NO EVENT SHALL NASA BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM, OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY, CONTRACT, TORT , OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER. Notice: There was no copyright information for these files in the package. The information here was taken from the cfitsio package. The build does not use the source files but links to the cfitsio library instead. Files: debian/* Copyright: 2013 Ole Streicher License: GPL-2+ On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. debian/watch0000644000000000000000000000065612201221743010220 0ustar version=3 # ESO skycat: #opts=uversionmangle=s/-/./ \ #http://archive.eso.org/cms/tools-documentation/skycat/eso-skycat-download.html\ # .*/skycat-([\d\.-]*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) debian uupdate # Starlink fork: opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/skycat-$1.tar.gz/,uversionmangle=s/-starlink-(\d+)([ab])?/+starlink$1~$2/ \ https://github.com/Starlink/skycat/releases .*/v(\d\S*)\.tar\.gz debian uupdate debian/rtdClient.man0000644000000000000000000000043012201417104011600 0ustar .TH RTDCLIENT "1" "March 2009" "RTDCLIENT" "User Commands" .SH NAME rtdClient - image event client for RTD .SH SYNOPSIS .B rtdClient \fI[\-v]\fR .SH DESCRIPTION This is the client for the rtdServer. .TP \fB\-v\fR verbose mode .SH "SEE ALSO" rtd(1),rtdServer(1),rtcCubeDisplay(1) debian/patches/0000755000000000000000000000000012214365567010630 5ustar debian/patches/fix_build_problems.patch0000644000000000000000000000644112201221743015505 0ustar Author: Joseph Wang Description: Fix build problems. Adopted from the Mageia package. --- a/rtd/Makefile.in +++ b/rtd/Makefile.in @@ -447,13 +447,13 @@ $(AR) r $@ $(RTDEVT_OBJ) $(RANLIB_STUB) $@ -$(RTD_SERVER): $(RTD_SERVER_OBJS) +$(RTD_SERVER): $(RTD_SERVER_OBJS) $(RTDEVT_LIB) $(CXXCOMPILE) -o $@ $(RTD_SERVER_OBJS) $(RTDEVT_LIB) @LIBS@ -rtdClient: rtdClient.o +rtdClient: rtdClient.o $(RTDEVT_LIB) $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@ -rtdCubeDisplay: rtdCubeDisplay.o +rtdCubeDisplay: rtdCubeDisplay.o $(RTDEVT_LIB) $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@ #======================================================================== @@ -469,15 +469,18 @@ #======================================================================== test: binaries libraries $(TEST_APPS) -tImageEvent: tImageEvent.o +tImageEvent: tImageEvent.o $(RTDEVT_LIB) $(CXXCOMPILE) -o $@ $@.o $(RTDEVT_LIB) @LIBS@ -trtdRemote: trtdRemote.o +trtdRemote: trtdRemote.o $(RTD_REMOTE_LIB) $(COMPILE) -o $@ $@.o $(RTD_REMOTE_LIB) @LIBS@ +# put libs before TK so that the libpath from TK does not override +# the libpath for the local shared libraries in $LIBS tRtd: tRtd.o tRtdEvt.o tRtdEvtData.o $(CXXCOMPILE) -o $@ $@.o tRtdEvt.o tRtdEvtData.o \ - @rtd_BUILD_LIB_SPEC@ @TK_LIB_SPEC@ @TCL_LIB_SPEC@ ${LDFLAGS_DEFAULT} ${LIBS} + @rtd_BUILD_LIB_SPEC@ ${LDFLAGS_DEFAULT} ${LIBS} @TK_LIB_SPEC@ @TCL_LIB_SPEC@ + #======================================================================== # Run Tcl test cases --- a/rtd/configure.in +++ b/rtd/configure.in @@ -127,7 +127,7 @@ if test -f $TK_SRC_DIR/generic/tkCanvas.h ; then AC_DEFINE(HAVE_TKCANVAS_H, 1, [See if we can include tkCanvas.h, an internal tk header]) - TEA_ADD_INCLUDES([-I$TK_SRC_DIR/generic]) + TEA_ADD_INCLUDES([-I$TK_SRC_DIR/generic -I$TCL_SRC_DIR/generic]) fi #-------------------------------------------------------------------- --- a/rtd/generic/tkCanvasPsImage.c +++ b/rtd/generic/tkCanvasPsImage.c @@ -35,6 +35,9 @@ #include #ifdef HAVE_TKCANVAS_H +/* work around compile problems on 32-bit linux */ +#undef HAVE_TYPE_OFF64_T +#undef HAVE_STRUCT_STAT64 #include "tclInt.h" #include "tkCanvas.h" #else @@ -75,8 +78,8 @@ { /* Need to access the Tk Image type and supercede the Postscript * command. */ - Tk_ItemType *tkImageType = getTkImageType(); - tkImageType->postscriptProc = RtdImageToPostscript; + /* Tk_ItemType *tkImageType = getTkImageType(); + tkImageType->postscriptProc = RtdImageToPostscript; */ } /* --- a/astrotcl/aclocal.m4 +++ b/astrotcl/aclocal.m4 @@ -162,14 +162,17 @@ done if test -z "$CFITSIO_LIB_DIR" ; then echo - AC_MSG_ERROR([could not find $CFITSIO_LIBNAME: Please use the --with-cfitsio=DIR option.]) fi else # Just assume the given value will work. This may not be true if # CFITSIO itself isn't built yet, so allow the flexibility. CFITSIO_LIB_DIR=$CFITSIO_LIB_DIR/lib fi - CFITSIO_LIB_SPEC="-L$CFITSIO_LIB_DIR $CFITSIO_LIBFLAG" + if test "$CFITSIO_LIB_DIR" ; then + CFITSIO_LIB_SPEC="-L$CFITSIO_LIB_DIR $CFITSIO_LIBFLAG" + else + CFITSIO_LIB_SPEC="$CFITSIO_LIBFLAG" + fi AC_MSG_RESULT($CFITSIO_LIB_DIR) AC_SUBST(CFITSIO_LIB_DIR) AC_SUBST(CFITSIO_LIB_SPEC) debian/patches/nonlinux.patch0000644000000000000000000000352212214365567013525 0ustar Author: Ole Streicher Description: Configure shared libs for hurd-i386 and kfreeBSD-* correctly. Also, define the obsolete "MAXPATHLEN" on hurd. --- a/tclconfig/tcl.m4 +++ b/tclconfig/tcl.m4 @@ -1379,17 +1379,17 @@ fi ;; - GNU*) + GNU-*) SHLIB_CFLAGS="-fPIC" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" if test "$have_dl" = yes; then SHLIB_LD="${CXX} -shared" - DL_OBJS="" + DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="$LDFLAGS -Wl,--export-dynamic" - LD_SEARCH_FLAGS="" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic -Wl,-soname,lib${PACKAGE_NAME}${PACKAGE_VERSION}.so" + LD_SEARCH_FLAGS='-Wl,-rpath,${libdir}' else AC_CHECK_HEADER(dld.h, [ SHLIB_LD="ld -shared" @@ -1481,16 +1481,16 @@ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' TCL_LIB_VERSIONS_OK=nodots ;; - FreeBSD-*) + FreeBSD-*|GNU/kFreeBSD*) # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" + SHLIB_LD="${CXX} -shared" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="$LDFLAGS -export-dynamic" - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LDFLAGS="$LDFLAGS -Wl,--export-dynamic -Wl,-soname,lib${PACKAGE_NAME}${PACKAGE_VERSION}.so" + LD_SEARCH_FLAGS='-Wl,-rpath,${libdir}' if test "${TCL_THREADS}" = "1" ; then # The -pthread needs to go in the CFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` --- a/tclutil/generic/Mem_Map.h +++ b/tclutil/generic/Mem_Map.h @@ -60,6 +60,11 @@ // Default size of mapped page on SunOS, HP and Solaris. #define MMAP_PAGE_SIZE 4096 +// MAXPATHLEN not defined on Hurd, as it is "bogus." +#ifndef MAXPATHLEN +#define MAXPATHLEN 4096 +#endif + // External used to round request. size_t round_to_pagesize (off_t len); debian/patches/series0000644000000000000000000000012712214135505012030 0ustar fix_build_problems.patch use_std_blt.patch fhs.patch use_wcstools.patch nonlinux.patch debian/patches/fhs.patch0000644000000000000000000003126312201420104012405 0ustar Author: Ole Streicher Description: Change the paths so that they correspond to the FHS. Also remove the "-star" suffix from the executable. --- a/skycat/Makefile.in +++ b/skycat/Makefile.in @@ -22,7 +22,7 @@ #SAMPLE_NEW_VAR = @SAMPLE_NEW_VAR@ # Install these scripts -PROGS = skycat-star +PROGS = skycat # Testing applications TEST_APPS = @@ -84,8 +84,8 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ -libdir = @libdir@ -datadir = @datadir@ +libdir = @libdir@/skycat +datadir = @datadir@/skycat mandir = @mandir@ includedir = @includedir@ @@ -112,6 +112,7 @@ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.o tests/*.o EXEEXT = @EXEEXT@ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ +LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS) MAKE_SHARED_LIB = @MAKE_SHARED_LIB@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ @@ -211,7 +212,7 @@ # Scripts created by configure depend on their .in files and config.status # (since they are cleaned). -skycat-star: skycat-star.in config.status +skycat: skycat.in config.status ./config.status #======================================================================== @@ -346,6 +347,7 @@ #======================================================================== install-lib-binaries: binaries + @test -d $(DESTDIR)$(pkgdatadir) || mkdir -p $(DESTDIR)$(pkgdatadir) @test -d $(DESTDIR)$(pkglibdir) || mkdir -p $(DESTDIR)$(pkglibdir) @list='$(lib_BINARIES)'; for p in $$list; do \ if test -f $$p; then \ @@ -375,8 +377,8 @@ for p in $$list; do \ if test -f $(srcdir)/$$p; then \ destp=`basename $$p`; \ - echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ + echo " Install $$destp $(DESTDIR)$(pkgdatadir)/$$destp"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$destp; \ fi; \ done @if test "x$(SHARED_BUILD)" = "x1"; then \ @@ -447,7 +449,7 @@ # Generate the skycat release #======================================================================== SKYCAT_FILES = \ - bin/skycat-star \ + bin/skycat \ bin/rtd \ bin/rtdServer \ bin/tRtd \ --- a/cat/Makefile.in +++ b/cat/Makefile.in @@ -88,8 +88,8 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ -libdir = @libdir@ -datadir = @datadir@ +libdir = @libdir@/skycat +datadir = @datadir@/skycat mandir = @mandir@ includedir = @includedir@ @@ -116,6 +116,7 @@ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.result *.tmp *.o tests/*.o EXEEXT = @EXEEXT@ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ +LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS) MAKE_SHARED_LIB = @MAKE_SHARED_LIB@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ @@ -346,6 +347,7 @@ #======================================================================== install-lib-binaries: binaries + @test -d $(DESTDIR)$(pkgdatadir) || mkdir -p $(DESTDIR)$(pkgdatadir) @test -d $(DESTDIR)$(pkglibdir) || mkdir -p $(DESTDIR)$(pkglibdir) @list='$(lib_BINARIES)'; for p in $$list; do \ if test -f $$p; then \ @@ -375,8 +377,8 @@ for p in $$list; do \ if test -f $(srcdir)/$$p; then \ destp=`basename $$p`; \ - echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ + echo " Install $$destp $(DESTDIR)$(pkdatadir)/$$destp"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$destp; \ fi; \ done @if test "x$(SHARED_BUILD)" = "x1"; then \ --- a/astrotcl/Makefile.in +++ b/astrotcl/Makefile.in @@ -78,8 +78,8 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ -libdir = @libdir@ -datadir = @datadir@ +libdir = @libdir@/skycat +datadir = @datadir@/skycat mandir = @mandir@ includedir = @includedir@ @@ -106,6 +106,7 @@ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.result test.fits* tmp.fits *.tmp *.o tests/*.o EXEEXT = @EXEEXT@ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ +LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ MAKE_LIB = @MAKE_LIB@ MAKE_SHARED_LIB = @MAKE_SHARED_LIB@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ @@ -336,6 +337,7 @@ #======================================================================== install-lib-binaries: binaries + @test -d $(DESTDIR)$(pkgdatadir) || mkdir -p $(DESTDIR)$(pkgdatadir) @test -d $(DESTDIR)$(pkglibdir) || mkdir -p $(DESTDIR)$(pkglibdir) @list='$(lib_BINARIES)'; for p in $$list; do \ if test -f $$p; then \ @@ -364,8 +366,8 @@ @list='$(PKG_TCL_SOURCES) library/tclIndex'; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ destp=`basename $$p`; \ - echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ + echo " Install $$destp $(DESTDIR)$(pkgdatadir)/$$destp"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$destp; \ fi; \ done @if test "x$(SHARED_BUILD)" = "x1"; then \ --- a/tclutil/Makefile.in +++ b/tclutil/Makefile.in @@ -80,8 +80,8 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ -libdir = @libdir@ -datadir = @datadir@ +libdir = @libdir@/skycat +datadir = @datadir@/skycat mandir = @mandir@ includedir = @includedir@ @@ -108,6 +108,7 @@ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.result *.tmp *.o EXEEXT = @EXEEXT@ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ +LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ MAKE_LIB = @MAKE_LIB@ MAKE_SHARED_LIB = @MAKE_SHARED_LIB@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ @@ -338,6 +339,7 @@ #======================================================================== install-lib-binaries: binaries + @test -d $(DESTDIR)$(pkgdatadir) || mkdir -p $(DESTDIR)$(pkgdatadir) @test -d $(DESTDIR)$(pkglibdir) || mkdir -p $(DESTDIR)$(pkglibdir) @list='$(lib_BINARIES)'; for p in $$list; do \ if test -f $$p; then \ @@ -367,8 +369,8 @@ for p in $$list; do \ if test -f $(srcdir)/$$p; then \ destp=`basename $$p`; \ - echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ + echo " Install $$destp $(DESTDIR)$(pkgdatadir)/$$destp"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$destp; \ fi; \ done @if test "x$(SHARED_BUILD)" = "x1"; then \ --- a/rtd/Makefile.in +++ b/rtd/Makefile.in @@ -22,7 +22,7 @@ #SAMPLE_NEW_VAR = @SAMPLE_NEW_VAR@ # Install these scripts -PROGS = rtd tRtd +PROGS = rtd # Extra static library and binaries for real-time image servers and clients RTDEVT_LIB = librtdImgEvt.a @@ -95,8 +95,8 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ -libdir = @libdir@ -datadir = @datadir@ +libdir = @libdir@/skycat +datadir = @datadir@/skycat mandir = @mandir@ includedir = @includedir@ @@ -123,6 +123,7 @@ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.o tests/*.o EXEEXT = @EXEEXT@ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ +LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS) MAKE_SHARED_LIB = @MAKE_SHARED_LIB@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ @@ -357,6 +358,7 @@ #======================================================================== install-lib-binaries: binaries + @test -d $(DESTDIR)$(pkgdatadir) || mkdir -p $(DESTDIR)$(pkgdatadir) @test -d $(DESTDIR)$(pkglibdir) || mkdir -p $(DESTDIR)$(pkglibdir) @list='$(lib_BINARIES)'; for p in $$list; do \ if test -f $$p; then \ @@ -386,8 +388,8 @@ for p in $$list; do \ if test -f $(srcdir)/$$p; then \ destp=`basename $$p`; \ - echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ + echo " Install $$destp $(DESTDIR)$(pkgdatadir)/$$destp"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$destp; \ fi; \ done @if test "x$(SHARED_BUILD)" = "x1"; then \ @@ -448,13 +450,13 @@ $(RANLIB_STUB) $@ $(RTD_SERVER): $(RTD_SERVER_OBJS) $(RTDEVT_LIB) - $(CXXCOMPILE) -o $@ $(RTD_SERVER_OBJS) $(RTDEVT_LIB) @LIBS@ + $(CXXCOMPILE) $(LDFLAGS) -o $@ $(RTD_SERVER_OBJS) $(RTDEVT_LIB) @LIBS@ rtdClient: rtdClient.o $(RTDEVT_LIB) - $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@ + $(CXXCOMPILE) $(LDFLAGS) -o $@ $? $(RTDEVT_LIB) @LIBS@ rtdCubeDisplay: rtdCubeDisplay.o $(RTDEVT_LIB) - $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@ + $(CXXCOMPILE) $(LDFLAGS) -o $@ $? $(RTDEVT_LIB) @LIBS@ #======================================================================== # RTD Remote access C library --- a/tclconfig/tcl.m4 +++ b/tclconfig/tcl.m4 @@ -673,6 +673,7 @@ AC_SUBST(TCL_DBGX) AC_SUBST(CFLAGS_DEFAULT) AC_SUBST(LDFLAGS_DEFAULT) + AC_SUBST(LD_SEARCH_FLAGS) if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then AC_DEFINE(TCL_MEM_DEBUG, 1, [Is memory debugging enabled?]) @@ -1353,8 +1354,8 @@ SHLIB_LD="${CXX} -shared" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="$LDFLAGS -Wl,--export-dynamic" - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + LDFLAGS="$LDFLAGS -Wl,--export-dynamic -Wl,-soname,lib${PACKAGE_NAME}${PACKAGE_VERSION}.so" + LD_SEARCH_FLAGS='-Wl,-rpath,${libdir}' else AC_CHECK_HEADER(dld.h, [ SHLIB_LD="ld -shared" @@ -3176,7 +3177,7 @@ MAKE_STUB_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_STUB_OBJECTS)" else MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)" - MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${LDFLAGS_DEFAULT} \${SHLIB_LD_LIBS}" + MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${LD_SEARCH_FLAGS} \${LDFLAGS_DEFAULT} \${SHLIB_LD_LIBS}" MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)" fi --- a/skycat/skycat.in +++ b/skycat/skycat.in @@ -22,7 +22,7 @@ SKYCAT_BASE=`(cd $DIR; pwd)` # If we're NOT ssh'd in -if [ ! ${SSH_TTY} ]; then +if [ ! "${SSH_TTY}" ]; then # make sure X is running (on Mac OS X) if [ `uname` = "Darwin" ] ; then if [ "`ps -x | awk '{print $5}' | grep X11`" = "" ]; then @@ -40,12 +40,8 @@ fi fi -# Make sure we can find the shared libs -@LD_LIBRARY_PATH_VAR@="$SKYCAT_BASE/lib:@BLT_LIB_DIR@:${@LD_LIBRARY_PATH_VAR@}" -export @LD_LIBRARY_PATH_VAR@ - -# and the Tcl packages -TCLLIBPATH="$SKYCAT_BASE/lib" +# Make sure we can find the Tcl packages +TCLLIBPATH="/usr/lib/skycat /usr/share/skycat" export TCLLIBPATH # Make sure we start the correct wish binary @@ -54,5 +50,5 @@ test -d $HOME/.skycat || mkdir $HOME/.skycat echo "`date`: Starting skycat with: $0 ${1+"$@"}" > $HOME/.skycat/log -exec wish8.4 $SKYCAT_BASE/lib/skycat@PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee -a $HOME/.skycat/log 2>&1 +exec wish8.5 /usr/share/skycat/skycat@PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee -a $HOME/.skycat/log 2>&1 --- a/skycat/configure.in +++ b/skycat/configure.in @@ -239,6 +239,6 @@ # You may alternatively have a special pkgIndex.tcl.in or other files # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -AC_OUTPUT([Makefile pkgIndex.tcl skycatConfig.sh skycat-star skycat_version.tcl linux/skycat.spec]) +AC_OUTPUT([Makefile pkgIndex.tcl skycatConfig.sh skycat skycat_version.tcl linux/skycat.spec]) -chmod ugo+rx skycat-star +chmod ugo+rx skycat --- a/rtd/rtd.in +++ b/rtd/rtd.in @@ -26,7 +26,7 @@ cd $cwd # If we're NOT ssh'd in -if [ ! ${SSH_TTY} ]; then +if [ ! "${SSH_TTY}" ]; then # make sure X is running (on Mac OS X) if [ `uname` = "Darwin" -a "`ps -x 2>/dev/null | awk '{print $5}' | grep X11`" = "" ]; then for i in /Applications/Utilities $HOME/Desktop ; do @@ -41,12 +41,8 @@ fi fi -# Make sure we can find the shared libs -@LD_LIBRARY_PATH_VAR@="$RTD_BASE/lib:@BLT_LIB_DIR@:${@LD_LIBRARY_PATH_VAR@}" -export @LD_LIBRARY_PATH_VAR@ - -# and the Tcl packages -TCLLIBPATH="$RTD_BASE/lib" +# Make sure we can find the Tcl packages +TCLLIBPATH="/usr/lib/skycat /usr/share/skycat" export TCLLIBPATH # Make sure we start the correct wish binary @@ -54,5 +50,5 @@ export PATH test -d $HOME/.rtd || mkdir $HOME/.rtd -exec wish8.4 $RTD_BASE/lib/rtd@PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee $HOME/.skycat/log 2>&1 +exec wish8.5 /usr/share/skycat/rtd@PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee $HOME/.skycat/log 2>&1 --- a/tclutil/configure.in +++ b/tclutil/configure.in @@ -88,7 +88,7 @@ changequote([, ]) cheaders=`cd $srcdir; echo generic/*.h` cincludes="-I. -I$srcdir/bitmaps -I$srcdir/generic" -tclsources=`cd $srcdir; echo library/*.tcl` +tclsources=`cd $srcdir; ls library/*.tcl | fgrep -v mkIndex.tcl | fgrep -v itcldoc.tcl` TEA_ADD_SOURCES([${csources}]) TEA_ADD_HEADERS([${cheaders}]) --- a/astrotcl/configure.in +++ b/astrotcl/configure.in @@ -87,7 +87,7 @@ changequote([, ]) cheaders=`cd $srcdir; echo generic/*.h press/*.h libwcs/*.h` cincludes="-I$srcdir/../tclutil/generic -I$srcdir/generic -I$srcdir/press -I$srcdir/libwcs" -tclsources=`cd $srcdir; echo library/*.tcl` +tclsources=`cd $srcdir; ls library/*.tcl | fgrep -v mkIndex.tcl` TEA_ADD_SOURCES([${csources}]) TEA_ADD_HEADERS([${cheaders}]) debian/patches/use_wcstools.patch0000644000000000000000000000220412201424166014363 0ustar Author: Ole Streicher Description: Use the system libwcstools instead of the convienience copy --- a/astrotcl/configure.in +++ b/astrotcl/configure.in @@ -83,16 +83,16 @@ #----------------------------------------------------------------------- changequote(<<, >>) -csources=`cd $srcdir; echo generic/*.[Cc] press/*.[Cc] libwcs/*.[Cc]` +csources=`cd $srcdir; echo generic/*.[Cc] press/*.[Cc]` changequote([, ]) -cheaders=`cd $srcdir; echo generic/*.h press/*.h libwcs/*.h` -cincludes="-I$srcdir/../tclutil/generic -I$srcdir/generic -I$srcdir/press -I$srcdir/libwcs" +cheaders=`cd $srcdir; echo generic/*.h press/*.h` +cincludes="-I$srcdir/../tclutil/generic -I$srcdir/generic -I$srcdir/press -I/usr/include/wcstools" tclsources=`cd $srcdir; ls library/*.tcl | fgrep -v mkIndex.tcl` TEA_ADD_SOURCES([${csources}]) TEA_ADD_HEADERS([${cheaders}]) TEA_ADD_INCLUDES([$cincludes]) -TEA_ADD_LIBS([$tclutil_BUILD_LIB_SPEC ${BLT_LIB_SPEC} ${CFITSIO_LIB_SPEC}]) +TEA_ADD_LIBS([$tclutil_BUILD_LIB_SPEC ${BLT_LIB_SPEC} ${CFITSIO_LIB_SPEC} -lwcstools]) TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) TEA_ADD_TCL_SOURCES([${tclsources}]) debian/patches/use_std_blt.patch0000644000000000000000000004437512201221743014154 0ustar Author: Ole Streicher Description: Use standard BLT. This reverts patch 4b228b...1d3dea on github. --- a/tclutil/aclocal.m4 +++ b/tclutil/aclocal.m4 @@ -26,8 +26,8 @@ [AC_HELP_STRING([--with-blt=DIR],[link with BLT library installed in DIR])], BLT_LIB_DIR=$withval) - BLT_LIBNAME=libBLT25${SHLIB_SUFFIX} - BLT_LIBFLAG="-lBLT25" + BLT_LIBNAME=libBLT${SHLIB_SUFFIX} + BLT_LIBFLAG="-lBLT" if test -z "$BLT_LIB_DIR" ; then # If --with-blt=dir was not specified, try the Tcl lib dir and the exec-prefix/lib dir --- a/rtd/library/RtdImageHduChooser.tcl +++ b/rtd/library/RtdImageHduChooser.tcl @@ -472,7 +472,7 @@ # position the images in the table - catch {blt::blttable forget $itk_component(imagetab)} + catch {blt::table forget $itk_component(imagetab)} set hdu [$image_ hdu] set idx [expr {$hdu -1}] --- a/cat/library/AstroImage.tcl +++ b/cat/library/AstroImage.tcl @@ -183,9 +183,9 @@ pack [set f [frame $w_.main.top.f -relief groove -borderwidth 2]] \ -side top -fill x -pady 1m - blt::blttable $f + blt::table $f - blt::blttable $f \ + blt::table $f \ [set name_ [LabelEntry $f.name \ -text "Object Name:" \ -command [code $this getimage] \ @@ -269,7 +269,7 @@ -side right -padx 1m -pady 2m - blt::blttable configure $f C1 -padx 2m + blt::table configure $f C1 -padx 2m # dialog buttons pack [frame $w_.buttons -borderwidth 2 -relief groove] \ --- a/cat/library/AstroQuery.tcl +++ b/cat/library/AstroQuery.tcl @@ -87,7 +87,7 @@ pack [set f [frame $w_.options.f]] \ -side top -fill x - set search_opts_ [blt::blttable $f] + set search_opts_ [blt::table $f] set search_opts_row_ 0 # if we are using world coords, display name, equinox, ra, dec @@ -262,7 +262,7 @@ -valuefont $itk_option(-valuefont) \ -labelfont $itk_option(-labelfont)]] } - blt::blttable configure $f C1 -padx 2m + blt::table configure $f C1 -padx 2m } else { # no options destroy $w_.options @@ -277,7 +277,7 @@ protected method add_copyright {} { set s [$astrocat copyright] if {"$s" != "" && [winfo exists $search_opts_]} { - blt::blttable $search_opts_ \ + blt::table $search_opts_ \ [LabelValue $search_opts_.copyright \ -anchor w -relief flat \ -labelwidth 0 -valuewidth 0 \ @@ -297,7 +297,7 @@ set col 0 foreach w $args { if {"$w" != ""} { - blt::blttable $search_opts_ $w $search_opts_row_,$col \ + blt::table $search_opts_ $w $search_opts_row_,$col \ -fill x -pady 1m } incr col --- a/rtd/library/RtdImageCut.tcl +++ b/rtd/library/RtdImageCut.tcl @@ -226,7 +226,7 @@ pack $itk_component(${el}cut) -padx 1m } - blt::blttable $itk_component(scales) \ + blt::table $itk_component(scales) \ $itk_component(lowscale) 1,0 -anchor w -fill x -padx 1m -pady 1m \ $itk_component(highscale) 1,1 -anchor w -fill x -padx 1m -pady 1m \ $itk_component(percent) 2,0 -anchor c -fill x -columnspan 2 -padx 1m \ @@ -249,7 +249,7 @@ add_button update Update update_graph add_button close Close quit - blt::blttable $itk_component(buttons) \ + blt::table $itk_component(buttons) \ $itk_component(set) 1,0 -anchor w -fill x -padx 1m -pady 2m \ $itk_component(reset) 1,1 -anchor w -fill x -padx 1m -pady 2m \ $itk_component(median) 1,2 -anchor w -fill x -padx 1m -pady 2m \ --- a/rtd/library/RtdImagePick2.tcl +++ b/rtd/library/RtdImagePick2.tcl @@ -51,13 +51,13 @@ # $itk_component(choicef) - choice frame # $itk_component(buttonf) - button frame # -# The frames (and all other widgets) are packed with the blt::blttable geometry +# The frames (and all other widgets) are packed with the blt::table geometry # manager. The 'pack' geometry manager should not be used (see LIMITATIONS # on man page of table(BLT 2.4). # # There are options like -with_info, -with_choice which are set to 1 by default # to show all frames (see options). They can be set to 0 and the application -# can re-arrange the frames (via blt::blttable) as required. +# can re-arrange the frames (via blt::table) as required. # # NOTES # - In contrast to RtdImagePick, RtdImagePick2 does not use tkwait which may @@ -170,7 +170,7 @@ } eval $methd $itk_component($compo) if { $map } { - eval blt::blttable $w $itk_component($compo) $idx $opts + eval blt::table $w $itk_component($compo) $idx $opts } } @@ -197,7 +197,7 @@ [$wdg component entry] config -justify right -highlightthickness 0 [$wdg component label] config -pady 0 } - blt::blttable $w $wdg $idx -fill x -anchor e + blt::table $w $wdg $idx -fill x -anchor e } # Create the widgets for displaying the statistics @@ -237,7 +237,7 @@ -factor $itk_option(-zoomFact) \ -command [code $this zoomScaledCb] } - blt::blttable $w $itk_component(zoomView) 0,0 + blt::table $w $itk_component(zoomView) 0,0 } # Add a button and add to blt table @@ -246,7 +246,7 @@ itk_component add $compo { button $w.$compo -text $text -command $command } - blt::blttable $w $itk_component($compo) $idx -fill x + blt::table $w $itk_component($compo) $idx -fill x } # Add an application specific button @@ -256,13 +256,13 @@ if { "[cget -panel_orient]" == "horizontal" } { # add button and redo packing - set names [blt::blttable search $w -pattern *] + set names [blt::table search $w -pattern *] add_button $w $compo $text 0,$idx $command set names [linsert $names $idx $itk_component($compo)] set i -1 foreach name $names { - blt::blttable $w $name 0,[incr i] -fill x + blt::table $w $name 0,[incr i] -fill x } } else { add_button $w $compo $text 1,$idx $command @@ -312,7 +312,7 @@ -entrycommand [code $this update_rect] [$sldWdg component label] config -justify left - blt::blttable $sldWdg \ + blt::table $sldWdg \ [$sldWdg component label] 0,0 -anchor w -fill x \ [$sldWdg component entry] 0,1 -anchor e \ [$sldWdg component scaleframe] 1,0 -fill x -columnspan 2 -padx 1m @@ -322,7 +322,7 @@ protected method make_sldframe { w } { make_slider $w - blt::blttable $w $itk_component(slider) 0,0 -anchor w -fill x + blt::table $w $itk_component(slider) 0,0 -anchor w -fill x } # Create pick control frame @@ -370,13 +370,13 @@ label $zoomctrlf.label -text "" -width 3 -font $itk_option(-labelfont) } - blt::blttable $zoomctrlf \ + blt::table $zoomctrlf \ $itk_component(pickMark) 0,0 -fill y -anchor w -columnspan 3 \ $itk_component(larger) 1,0 -fill x \ $itk_component(smaller) 1,1 -fill x \ $itk_component(scalelab) 1,2 -fill x - blt::blttable $w \ + blt::table $w \ $itk_component(rbChoice) 0,0 -fill both \ $itk_component(zoomctrlf) 0,1 -fill both } --- a/rtd/library/RtdImagePickView.tcl +++ b/rtd/library/RtdImagePickView.tcl @@ -46,7 +46,7 @@ catch {pack forget [$w_.image component hscrollf] \ [$w_.image component vscrollf]} - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(image) 0,0 -fill both set image_ [$itk_component(image) get_image] --- a/rtd/library/RtdImagePixTable.tcl +++ b/rtd/library/RtdImagePixTable.tcl @@ -73,13 +73,13 @@ set f [frame $w_.tab] } pack $f -side top -fill both -expand 1 - blt::blttable $f + blt::table $f set ncols $itk_option(-ncols) set nrows $itk_option(-nrows) for {set col 0} {$col <= $ncols} {incr col} { set trow $nrows for {set row 0} {$row <= $nrows} {incr row} { - blt::blttable $f \ + blt::table $f \ [label $f.p$row,$col \ -font $itk_option(-valuefont) \ -borderwidth 1 \ @@ -158,7 +158,7 @@ -valuewidth $itk_option(-valuewidth) \ -relief groove \ -anchor w} - blt::blttable $sf $itk_component(pixtab_$lel) \ + blt::table $sf $itk_component(pixtab_$lel) \ $row,$col -fill both incr col if {$col >= $ncols} { --- a/rtd/library/RtdImagePrint.tcl +++ b/rtd/library/RtdImagePrint.tcl @@ -116,7 +116,7 @@ -text "Page height" \ -value $itk_option(-pageheight) \ -valuewidth 6 - blt::blttable $w_.pagesize \ + blt::table $w_.pagesize \ $w_.pagesize.fit 1,0 -anchor w \ $w_.pagesize.footer 1,1 -anchor e \ $w_.pagesize.width 2,0 -anchor w \ --- a/rtd/library/RtdRecorder.tcl +++ b/rtd/library/RtdRecorder.tcl @@ -260,21 +260,21 @@ # do the packing - blt::blttable $itk_component(status) \ + blt::table $itk_component(status) \ $itk_component(progressLabel) 1,0 -anchor w -fill x \ $itk_component(progressBar) 1,1 -anchor e -fill x -columnspan 2 \ $itk_component(imagecount) 2,0 -anchor w -fill x -columnspan 2 \ $itk_component(ncounts) 2,2 -anchor w -fill x - blt::blttable $itk_component(fileframe) \ + blt::table $itk_component(fileframe) \ $itk_component(filename) 1,0 -anchor w -fill x \ $itk_component(cameraname) 2,0 -anchor w -fill x - blt::blttable $itk_component(pbaction1) \ + blt::table $itk_component(pbaction1) \ $itk_component(direction) 1,0 -anchor w -fill x \ $itk_component(protect) 1,1 -anchor e -fill x - blt::blttable $itk_component(pbaction2) \ + blt::table $itk_component(pbaction2) \ $itk_component(play) 1,0 -anchor w -fill none \ $itk_component(rewind) 1,1 -anchor w -fill none \ $itk_component(ff) 1,2 -anchor w -fill none \ --- a/tclutil/library/Batch.tcl +++ b/tclutil/library/Batch.tcl @@ -98,10 +98,7 @@ puts $wfd $status flush $wfd close $wfd - - # The kill command is in Tclx and BLT, only BLT puts - # it into a namespace we can use. - blt::kill [pid] SIGKILL + kill SIGKILL [pid] } else { set bg_pid_ $pid fileevent $rfd readable [code $this read_pipe $rfd $wfd] --- a/tclutil/library/CanvasDraw.tcl +++ b/tclutil/library/CanvasDraw.tcl @@ -322,7 +322,7 @@ -command [code $this set_drawing_mode $drawing_mode]] } add_short_help $b "set the drawing mode to $drawing_mode" - blt::blttable $itk_component(drawmodes) $b $row,$col \ + blt::table $itk_component(drawmodes) $b $row,$col \ -fill x -ipadx 1m -ipady 1m if {$col < $maxcol} { incr col --- a/tclutil/library/EntryForm.tcl +++ b/tclutil/library/EntryForm.tcl @@ -79,10 +79,10 @@ -padx 1m -pady 1m -ipadx 1m -ipady 1m } - blt::blttable $f + blt::table $f set row 0 foreach label $itk_option(-labels) { - blt::blttable $f \ + blt::table $f \ [label $f.label$row -text $label] \ $row,0 -anchor e \ [set entries_($label) [entry $f.entry$row -relief sunken]] \ @@ -93,9 +93,9 @@ incr row } - blt::blttable configure $f c1 -resize expand - blt::blttable configure $f c0 -resize none - blt::blttable configure $f r* -resize none + blt::table configure $f c1 -resize expand + blt::table configure $f c0 -resize none + blt::table configure $f r* -resize none wm title $w_ {Entry Form} set initialized_ 1 --- a/tclutil/library/GraphPrint.tcl +++ b/tclutil/library/GraphPrint.tcl @@ -35,13 +35,18 @@ } else { set fit no } + if { [set $w_.color] == "color" } { + set gs no + } else { + set gs yes + } # try to fit on a page set width [lindex [$itk_option(-graph) config -width] 4] set height [lindex [$itk_option(-graph) config -height] 4] $itk_option(-graph) postscript configure \ - -colormode [set $w_.color] \ + -greyscale $gs \ -paperwidth [$w_.pagesize.width get] \ -paperheight [$w_.pagesize.height get] \ -landscape [set $w_.rotate] \ --- a/tclutil/library/LabelCheck.tcl +++ b/tclutil/library/LabelCheck.tcl @@ -27,7 +27,7 @@ keep -background -relief -borderwidth } - blt::blttable $itk_component(table) + blt::table $itk_component(table) eval itk_initialize $args } @@ -87,7 +87,7 @@ rename -font -valuefont valueFont Font rename -width -valuewidth valueWidth Width } - blt::blttable $itk_component(table) $but_($name) $row,$col -fill x + blt::table $itk_component(table) $but_($name) $row,$col -fill x if {[incr i] == $n} { break } --- a/tclutil/library/LabelChoice.tcl +++ b/tclutil/library/LabelChoice.tcl @@ -27,7 +27,7 @@ keep -background -relief -borderwidth } - blt::blttable $itk_component(table) + blt::table $itk_component(table) eval itk_initialize $args } @@ -87,7 +87,7 @@ rename -font -valuefont valueFont Font rename -width -valuewidth valueWidth Width } - blt::blttable $itk_component(table) $but_($name) $row,$col -fill x + blt::table $itk_component(table) $but_($name) $row,$col -fill x if {[incr i] == $n} { break } --- a/rtd/library/RtdImagePanel.tcl +++ b/rtd/library/RtdImagePanel.tcl @@ -56,7 +56,7 @@ # do the widget layout, aligning the items in rows and colums protected method make_layout {} { - blt::blttable $w_ + blt::table $w_ add_short_help $w_ {Image information area} # frame at the lower right of the panel that optionally @@ -102,9 +102,9 @@ -relief groove } if { "$itk_option(-panel_orient)" == "vertical" } { - blt::blttable $w_ $itk_component(object) [incr row],0 -fill x -anchor e + blt::table $w_ $itk_component(object) [incr row],0 -fill x -anchor e } else { - blt::blttable $w_ $itk_component(object) [incr row],0 -fill x -anchor e -columnspan 3 + blt::table $w_ $itk_component(object) [incr row],0 -fill x -anchor e -columnspan 3 } add_short_help $itk_component(object) \ @@ -151,12 +151,12 @@ -anchor e } if { "$itk_option(-panel_orient)" == "vertical" } { - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(x) [incr row],0 -fill x -anchor w \ $itk_component(y) [incr row],0 -fill x -anchor w \ $itk_component(value) [incr row],0 -fill x -anchor w } else { - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(x) [incr row],0 -fill x -anchor w \ $itk_component(y) $row,1 -fill x -anchor w \ $itk_component(value) $row,2 -fill x -anchor w @@ -214,12 +214,12 @@ -anchor e } if { "$itk_option(-panel_orient)" == "vertical" } { - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(ra) [incr row],0 -fill x -anchor w \ $itk_component(dec) [incr row],0 -fill x -anchor w \ $itk_component(equinox) [incr row],0 -fill x -anchor w } else { - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(ra) [incr row],0 -fill x -anchor w \ $itk_component(dec) $row,1 -fill x -anchor w \ $itk_component(equinox) $row,2 -fill x -anchor w @@ -271,12 +271,12 @@ -anchor e } if { "$itk_option(-panel_orient)" == "vertical" } { - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(min) [incr row],0 -fill x -anchor w \ $itk_component(max) [incr row],0 -fill x -anchor w \ $itk_component(bitpix) [incr row],0 -fill x -anchor w } else { - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(min) [incr row],0 -fill x -anchor w \ $itk_component(max) $row,1 -fill x -anchor w \ $itk_component(bitpix) $row,2 -fill x -anchor w @@ -320,12 +320,12 @@ keep -state } if { "$itk_option(-panel_orient)" == "vertical" } { - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(low) [incr row],0 -fill x -anchor w \ $itk_component(high) [incr row],0 -fill x -anchor w \ $itk_component(lrframe) [incr row],0 -fill x -anchor w } else { - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(low) [incr row],0 -fill x -anchor w \ $itk_component(high) $row,1 -fill x -anchor w \ $itk_component(lrframe) $row,2 -fill x -anchor w @@ -355,7 +355,7 @@ } { keep -state } - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(trans) [incr row],0 -fill x -anchor w -columnspan 2 } @@ -364,14 +364,14 @@ canvas $w_.status -height 0 -width 0 } if { "$itk_option(-panel_orient)" == "vertical" } { - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(cameraStatus) [incr row],0 -fill both -anchor nw } else { - blt::blttable $w_ \ + blt::table $w_ \ $itk_component(cameraStatus) $row,2 -fill both -anchor nw } - blt::blttable configure $w_ c2 -padx 1m + blt::table configure $w_ c2 -padx 1m } public method camSts { args } { --- a/rtd/library/RtdImageBias.tcl +++ b/rtd/library/RtdImageBias.tcl @@ -110,7 +110,7 @@ -command [code $this onOff] } { keep -state } - blt::blttable $itk_component(bias) \ + blt::table $itk_component(bias) \ $itk_component(onoff) 0,0 -pady 3 \ $itk_component(copy) 0,1 -pady 3 @@ -121,12 +121,12 @@ label $w_.label$comp \ -anchor c } - blt::blttable $itk_component(status) \ + blt::table $itk_component(status) \ $itk_component(label$comp) 0,$i - blt::blttable configure $itk_component(status) c$i -resize none + blt::table configure $itk_component(status) c$i -resize none incr i } - blt::blttable configure $itk_component(status) c5 -resize expand + blt::table configure $itk_component(status) c5 -resize expand foreach el "Load Copy Clear" { set s [string tolower $el] @@ -205,7 +205,7 @@ } $itk_component(filename$i) component entry config -highlightthickness 0 -takefocus 0 - blt::blttable $itk_component(status) \ + blt::table $itk_component(status) \ $itk_component(labelnr$i) $n,0 \ $itk_component(select$i) $n,1 \ $itk_component(choose$i) $n,2 \ @@ -244,7 +244,7 @@ -command [code $this auto_set_cut_levels] } - blt::blttable $itk_component(cuts) \ + blt::table $itk_component(cuts) \ $itk_component(labelcut) 0,0 -columnspan 3 -pady 4 \ $itk_component(low) 1,0 -anchor w -ipady 3 -pady 2 \ $itk_component(high) 1,1 -anchor w -ipady 3 -pady 2 \ @@ -257,7 +257,7 @@ -command [code $this close] } - blt::blttable $itk_component(buttons) \ + blt::table $itk_component(buttons) \ $itk_component(close) 0,0 -pady 3 } debian/patches/remove_tclx.patch0000644000000000000000000001316312201221743014163 0ustar Author: Ole Streicher Description: Remove Tclx dependency The package seems to have only little dependencies of tclx. Since Tclx is not available for tcl8.5 and up, the depenency is removed. Note: We still require to handle pipe and fork, so this has to wait until 8.6 is standard. --- a/astrotcl/library/AstrotclInit.tcl +++ b/astrotcl/library/AstrotclInit.tcl @@ -15,7 +15,7 @@ package require Tclutil package require Tclx -if {![lcontain $auto_path $astrotcl_library]} { +if { $auto_path ni $astrotcl_library } { lappend auto_path $astrotcl_library } --- a/cat/library/CatInit.tcl +++ b/cat/library/CatInit.tcl @@ -14,7 +14,7 @@ package require Tclutil package require Astrotcl -if {![lcontain $auto_path $cat_library]} { +if { $auto_path ni $cat_library } { lappend auto_path $cat_library } --- a/rtd/library/Rtd.tcl +++ b/rtd/library/Rtd.tcl @@ -650,7 +650,7 @@ set t6 "Tcl version:\t[info patchlevel]" set t7 "Tcl package path:\t$tcl_pkgPath" set t8 "Package versions:\t" - foreach el "Tclx Itcl Itk Tkx BLT" { + foreach el "Itcl Itk BLT" { set t8 "$t8$el[package versions $el] " } DialogWidget $w_.rtd_about \ --- a/rtd/library/RtdInit.tcl +++ b/rtd/library/RtdInit.tcl @@ -14,7 +14,7 @@ package require Tclutil package require Astrotcl -if {![lcontain $auto_path $rtd_library]} { +if { $auto_path ni $rtd_library} { lappend auto_path $rtd_library } --- a/rtd/util/rmipc.tcl +++ b/rtd/util/rmipc.tcl @@ -20,7 +20,7 @@ } set f [open "|ipcs $opt"] while {[gets $f line] != -1} { - if { ![lcontain $line $env(USER)]} { continue } + if { $line ni $env(USER) } { continue } set num [lindex $line 1] if {![catch {expr $num}]} { if {[catch {exec ipcrm $opt $num} msg]} { --- a/skycat/library/SkycatInit.tcl +++ b/skycat/library/SkycatInit.tcl @@ -15,9 +15,11 @@ package require Astrotcl package require Cat -if {![lcontain $auto_path $skycat_library]} { +if { $auto_path ni $skycat_library } { lappend auto_path $skycat_library } namespace eval skycat {namespace export *} namespace import -force skycat::* +namespace import ::tcl::mathfunc::max +namespace import ::tcl::mathfunc::min --- a/tclutil/library/TclutilInit.tcl +++ b/tclutil/library/TclutilInit.tcl @@ -16,9 +16,8 @@ package require Itcl package require Itk -package require Tclx -if {![lcontain $auto_path $tclutil_library]} { +if {$auto_path ni $tclutil_library} { lappend auto_path $tclutil_library } --- a/tclutil/library/itcldoc.tcl +++ b/tclutil/library/itcldoc.tcl @@ -36,7 +36,6 @@ # A.Brighton 07 Jan 98 created package require Itcl -package require Tclx itcl::class ItclDoc { --- a/rtd/library/RtdImageBias.tcl +++ b/rtd/library/RtdImageBias.tcl @@ -10,6 +10,12 @@ itk::usual RtdImageBias {} +# see http://wiki.tcl.tk/2028 +proc lvarpush {var val {ndx end}} { + upvar $var args + set args [linsert $args $ndx $val] +} + # RtdImageBias is a class for controlling the subtraction of # a bias frame. --- a/rtd/library/RtdImageFitsHeader.tcl +++ b/rtd/library/RtdImageFitsHeader.tcl @@ -160,7 +160,7 @@ set tconfig_(sort_cols) $sort_cols set tconfig_(sort_order) $sort_order - loop i 0 $num_hdus_ { + for {set i 0} {$i > $num_hdus_} {incr i} { $tabnotebook_(table$i) config -sort_cols $sort_cols \ -sort_order $sort_order $tabnotebook_(table$i) new_info @@ -173,7 +173,7 @@ global $var set val [set $var] set tconfig_($label) $val - loop i 0 $num_hdus_ { + for {set i 0} {$i > $num_hdus_} {incr i} { $tabnotebook_(table$i) set_option $label Show $val $tabnotebook_(table$i) new_info } @@ -220,7 +220,7 @@ set length [string length [$listbox get 0]] - loop n $start_idx $end_idx { + for {set n $start_idx} {$n > $end_idx} {incr n} { set row [string tolower [$listbox get $n]] if {[catch {regexp -indices $string $row indices} idx] } { continue } if { $idx > 0 } { @@ -278,7 +278,7 @@ set hlist [$image_ hdu list] set ExtName "HDU 1" - loop i 0 $hdu_count { + for {set i 0} {$i > $hdu_count} {incr i} { set hdu [expr {$i + 1}] set list [lindex $hlist $i] --- a/rtd/library/RtdImageHduChooser.tcl +++ b/rtd/library/RtdImageHduChooser.tcl @@ -443,7 +443,7 @@ private method svinfo {} { set list [array get ext_ *NAXIS*] - loop i 0 [llength $list] 2 { + for {set i 0} {$i > [llength $list]} {incr i 2} { lappend newlist "[lindex $list $i] [lindex $list [expr {$i+1}]]" } set newlist [lsort -increasing -index 0 $newlist] --- a/rtd/library/RtdImagePick2.tcl +++ b/rtd/library/RtdImagePick2.tcl @@ -127,7 +127,7 @@ {Set the magnification factor of the zoom} \ -menu [menu $magMenu_] - loop i 2 31 { + for {set i 2} {$i > 31} {incr i} { $m.mag add radiobutton -label " ${i}x" \ -command [code $this scaleZoom $i] \ -variable $magMenu_ --- a/tclutil/library/canvastext.tcl +++ b/tclutil/library/canvastext.tcl @@ -21,7 +21,7 @@ proc ct_search_forward_char {canvas item char} { if {![lempty $item]} { set text [lindex [$canvas itemconfigure $item -text] 4] - loop i [$canvas index $item insert] [$canvas index $item end] { + for {set i [$canvas index $item insert]} {$i > [$canvas index $item end]} {incr i} { if {$char == [string index $text $i]} { return $i } @@ -37,7 +37,7 @@ proc ct_search_backward_char {canvas item char} { if {![lempty $item]} { set text [lindex [$canvas itemconfigure $item -text] 4] - loop i [expr {[$canvas index $item insert] - 1}] 0 -1 { + for {set i [expr {[$canvas index $item insert] - 1}]} {$i > 0} {decr i} { if {$char == [string index $text $i]} { return $i } debian/manpages0000644000000000000000000000014512201221743010676 0ustar debian/skycat.man debian/rtd.man debian/rtdServer.man debian/rtdClient.man debian/rtdCubeDisplay.man debian/rules0000755000000000000000000000047712201221743010250 0ustar #!/usr/bin/make -f # -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 %: dh $@ --with autoreconf override_dh_auto_configure: dh_auto_configure -- --with-tkinclude=/usr/include/tk --libdir=/usr/lib/ --libexecdir=/usr/lib override_dh_installchangelogs: dh_installchangelogs CHANGES debian/source/0000755000000000000000000000000012201221743010460 5ustar debian/source/format0000644000000000000000000000001412201221743011666 0ustar 3.0 (quilt) debian/skycat.menu0000644000000000000000000000020212201410422011330 0ustar ?package(skycat):needs="X11" section="Applications/Science/Astronomy" \ title="ESO/Starlink SkyCat" command="/usr/bin/skycat" debian/skycat.man0000644000000000000000000001753512201416665011177 0ustar .TH SKYCAT "1" "March 2009" "SKYCAT" "User Commands" .SH NAME skycat - A tool for displaying astronomical images and catalogs .SH SYNOPSIS .B skycat \fIfilename \-option value ...\fR .SH DESCRIPTION The ESO Skycat tool combines the image display capabilities of the RTD (Real-Time Display) with a set of classes for accessing astronomical catalogs locally and over the network using HTTP. The tool allows you to view FITS images from files or from the Digitized Sky Survey (DSS). .SH OPTIONS .TP \fB\-file filename\fR Specify a FITS file to display. '\-' means read the file from the standard input. The '\-file' part is optional, so you can also simply specify a file name. Image compression and decompression is done automatically, based on the file name suffix: .gzfits or .gfits for GZIP compression, .hfits for H-compress, and .cfits for UNIX compression. .TP \fB\-cat bool\fR If bool is 1, include 'Data-Servers' menu in the menubar (This is the default). The 'Data-Servers' menu gives you access to the ESO Archive extensions for browsing astronomical catalogs, plotting objects in the image window and getting images over the network from the image servers, such as the Digitized Sky server. .TP \fB\-rtd bool\fR If bool is 1, include the Real-Time menu in the menubar (default is 0). The Real-Time menu gives you access to the VLT Real-Time Display features, such as camera control and rapid frames. To use these features, the rtdServer daemon must be running on the local host. A client application, linked with the Rtd image event library can then send images via shared memory to be displayed in rapid succession. .TP \fB\-float_panel bool\fR If the option value is 1, the skycat info panel is put in a separate popup window, leaving more space for the image window (The default is off). .TP \fB\-panel_layout \fR With this option you can change the order of the zoom and pan windows in the layout. The default layout is: zoom window on the left, info panel in the center and pan window right. If "\-panel_layout saoimage" is specified, a layout similar to saoimage is used (info panel, pan window, zoom window). If "\-panel_layout reverse" is specified, the order of the windows is the reverse of the default. .TP \fB\-remote bool\fR If "\-remote 1" is specified and a skycat process is already running, the existing skycat process is sent a message and asked to open a new window and the new skycat process exits immediately. This has the advantage of sharing the image colormap and using fewer system resources, however it depends on being able to use the Tcl send mechanism. For security reasons, Tcl send will not work if you are using "xhost" based X security. You need to use X-auth security. See the "Tcl/Tk Tools" book from O'Reilly for more on this topic. .TP \fB\-min_scale n\fR .TP \fB\-max_scale n\fR Specify the min and max scale values for the Magnification menu. Negative values shrink the image, positive values zoom in closer. The default values are \-10 and 20. .TP \fB-port portnum\fR Specify a port number to use for the remote RTD socket interface. See the Rtd User's Guide for details on this socket based interface. By default, a port number is chosen automatically and written to the file ~/.rtd-remote. .TP \fB\-disp_image_icon bool\fR If bool is 1 (default), display a miniature version of the image in the tool's icon window. .TP \fB\-default_cmap \fR Specify the default colormap. This should be one of the names listed in the 'Colors' popup window (default is 'real'). .TP \fB\-default_itt \fR Specify the default intensity transfer table. This should be one of the names listed in the 'Colors' popup window (default is 'ramp'). .TP \fB\-colorramp_height \fR This option can be used to change the height of color bar (the widget at the bottom of the screen displaying the image colors). .TP \fB\-with_colorramp bool\fR If bool is true, display the color bar (default). .TP \fB\-with_zoom_window bool\fR If bool is true, display the zoom window (default). .TP \fB\-with_pan_window bool \fR If bool is true, display the pan window (default). .TP \fB\-dozoom bool\fR If bool is true, turn the zoom window on automatically (default). .SH MENU ITEMS .SS File menu .TP \fBOpen...\fR Open and display a (FITS) image file. .TP \fBReopen...\fR Reload the image display after the image has changed on disk. .TP \fBSave as...\fR Save the current image to a file. .TP \fBSave region as...\fR Save a section of the current image to a file. .TP \fBPrint...\fR Print the current image to a file or printer. .TP \fBClear\fR Clear the image display. .TP \fBNew Window\fR Display up a new main window. .TP \fBClose\fR Close the main window and exit if there are no more windows. .TP \fBExit\fR Exit the application. .SS View menu .TP \fBColors...\fR Display a window for manipulating the image colormap. .TP \fBCut Levels...\fR Display a window for manipulating the image cut levels. .TP \fBCuts...\fR Display a graph of pixel values along a line drawn interactively over the image. .TP \fBPick Object...\fR Select an object or star in the image and display statistics. .TP \fBFits Header...\fR Display the FITS header for the current image. .TP \fBPixel Table...\fR Display a table of pixel values surrounding the mouse cursor. .TP \fBMagnification\fR Set the magnification factor of the image display. .TP \fBHide Control Panel\fR Toggle the visibility of the upper control panel .TP \fBHide Popup Windows\fR Toggle the visibility of the popup windows. .SS Graphics menu .TP \fBToolbox\fR Display the line graphics toolbox. .TP \fBMode =>\fR Select the drawing mode. .TP \fBWidth =>\fR Set the line width for drawing. .TP \fBArrow =>\fR Select the arrow mode for lines. .TP \fBArrorShape =>\fR Select the arrow shape for lines. .TP \fBFill =>\fR Select the fill color for drawing. .TP \fBOutline =>\fR Select the outline color for drawing. .TP \fBStipple =>\fR Select the stipple pattern for filling objects. .TP \fBFont =>\fR Select the font to use for labels. .TP \fBSmooth =>\fR Set the smooth option for drawing polygons .TP \fBClear =>\fR Delete graphic objects. .TP \fBDelete =>\fR Delete selected graphic objects. .TP \fBHide Graphics\fR Toggle the visibility of the image line graphics .SS Data-Servers .TP \fBCatalogs =>\fR Select a catalog from the menu. .TP \fBImage Servers =>\fR Select an image server from the menu. .TP \fBArchives =>\fR Select an archive from the menu. .TP \fBLocal Catalogs =>\fR Select a local catalog from the menu. .SS Real-time menu (displayed when -rtd 1 is specified) .TP \fBAttach Camera\fR Attach the real-time camera - start receiving images. .TP \fBDetach Camera\fR Detach the real-time camera - stop receiving images. .TP \fBSet Camera...\fR Set the real-time camera name. .TP \fBRapid Frame \fR Create a rapid frame by interactively drawing a rectangle on the image. .SS Help menu .TP \fBAbout Skycat...\fR Display a window with information about this Skycat version. .TP \fBHelp...\fR Display information about Skycat in netscape (if netscape is available). .SH ENVIRONMENT VARIABLES .TP \fB$SKYCAT_CONFIG \fR If set, this is used as the URL to access the skycat configuration file, which contains the list of available catalogs and how to query them. By default, the configuration file is also searched for in $HOME/.skycat/skycat.cfg, and if that is not found, in the ESO default URL: http://archive.eso.org/skycat/skycat2.0.cfg. .TP \fB$SKYCAT_PLUGIN\fR If set, this variable should be a colon separated list of files or directories containing skycat plugins. A skycat plugin is a Tcl script that defines a Tcl proc to be called for each instance of the main window. The script is sourced before any windows are created and can also load shared libraries dynamically to add new features. See the Skycat User's Guide (ftp://ftp.archive.eso.org/pub/skycat/docs) for more information. .SH FILES http://archive.eso.org/skycat/skycat2.0.cfg - default configuration file. .SH SEE ALSO rtd(1) debian/README.debian0000644000000000000000000000045212201221743011262 0ustar This package is based on the Starlink version of skycat which is a fork of the ESO version. ESO has has confirmed that they will do only minimal maintenance on their version. Therefore the ESO version is sticked to Tcl 8.4. -- Ole Streicher Wed, 07 Aug 2013 14:28:13 +0200