debian/0000755000000000000000000000000012225453322007166 5ustar debian/ftools-fv.install0000644000000000000000000000027712037753122012505 0ustar debian/fv.desktop usr/share/applications debian/fv.xpm usr/share/pixmaps ftools/guis/fv/class/ usr/share/ftools/fv/ ftools/guis/fv/fv usr/bin/ ftools/guis/fv/fvInit.tcl usr/share/ftools/fv/ debian/watch0000644000000000000000000000033312037753122010220 0ustar # watch control file for uscan version=3 opts=uversionmangle=s/(.)/.$1/g;s/^\.//,dversionmangle=s/\+dfsg// \ http://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/fv/fv(.+)_src\.tar\.gz \ debian \ debian/repack-dfsg.sh debian/dfsg.remove0000644000000000000000000000132712037753122011335 0ustar # The following files are removed from the original tarball # to make the copyright files simpler and the source package smaller: # # We don't need the whole tcl/tk universe in the source file tcltk/tcl tcltk/tk tcltk/tix tcltk/itcl tcltk/itk tcltk/iwidgets # # xpa, cfitsio, readline, wcslib are in Debian as well tcltk/xpa heacore # # fitsTcl will be distributed separately # ftools/guis/fitsTcl # # We dont use the original build system # BUILD_DIR ftools/BUILD_DIR tcltk/BUILD_DIR # # This has an unclear license and is not needed anyway ftools/guis/fv/mac/tkMacAppInit.c # # This is not needed and is GPL licensed. To easy the copyright file # and make the distribution less restrictive, remove it. ftools/guis/fv/unix debian/patches/0000755000000000000000000000000012225452234010616 5ustar debian/patches/fv_fix_initial_menubar.patch0000644000000000000000000000306312037753122016345 0ustar Author: Ole Streicher Description: Fix tk 8.5 crash with "-type tearoff". It needs to be fixed in tk. However, here this gives the opportunity to correct the setting for the (invisible) main window. Also, the main window font is reset to non-bold. Bug: http://sourceforge.net/tracker/?func=detail&aid=3561016&group_id=12997&atid=112997 --- a/ftools/guis/fv/class/fvWinKeeper.tcl +++ b/ftools/guis/fv/class/fvWinKeeper.tcl @@ -34,12 +34,17 @@ global g_titleFont global xpaFlag - wm withdraw $itk_interior + wm geometry $itk_interior 1x1+0+0 + wm overrideredirect $itk_interior 1 + wm transient $itk_interior + tkwait visibility $itk_interior if { ! $isMac } { itk_component add mainMenu { menu $itk_interior.menu -tearoff false -type tearoff -bd 0 } + wm attributes $itk_interior.menu -type normal + wm resizable $itk_interior.menu 0 0 wm title $itk_interior.menu "fv" wm geometry $itk_interior.menu +0+0 --- a/ftools/guis/fv/class/fvApp.tcl +++ b/ftools/guis/fv/class/fvApp.tcl @@ -412,8 +412,8 @@ font create g_titleFont -family system -size -12 font create g_notebookTitleFont -family system -size -14 } else { - font create g_titleFont -family Helvetica -size -12 -weight bold - font create g_notebookTitleFont -family Helvetica -size -14 -weight bold + font create g_titleFont -family Helvetica -size -12 + font create g_notebookTitleFont -family Helvetica -size -14 } font create g_entryFont -family Courier -size -12 debian/patches/pow_update_photo.patch0000644000000000000000000000517312037753122015226 0ustar Author: Ole Streicher Description: Insert "Tcl_Interp *interp" as first argument to Tk_PhotoXXX() which is required by current versions of Tcl. --- a/tcltk/pow/PowColormap.c +++ b/tcltk/pow/PowColormap.c @@ -829,7 +829,7 @@ photo_block.offset[2] = 2; - Tk_PhotoPutBlock(photo_handle,&photo_block,0,0,image_instance->width,image_instance->height, TK_PHOTO_COMPOSITE_SET); + Tk_PhotoPutBlock(interp, photo_handle,&photo_block,0,0,image_instance->width,image_instance->height, TK_PHOTO_COMPOSITE_SET); ckfree(photo_block.pixelPtr); return TCL_OK; --- a/tcltk/pow/PowCommands.c +++ b/tcltk/pow/PowCommands.c @@ -3037,11 +3037,11 @@ || (x < 0) || (y < 0) ) return; if( (zoomX == 1.0) && (zoomY == 1.0) ) { - Tk_PhotoPutBlock(handle, blockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET); + Tk_PhotoPutBlock(interp,handle, blockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET); return; } - Tk_PhotoExpand(handle, x+width, y+height); + Tk_PhotoExpand(interp,handle, x+width, y+height); Tk_PhotoGetImage(handle, &destBlockPtr); /* @@ -3110,5 +3110,5 @@ } } - Tk_PhotoPutBlock(handle, &destBlockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET); + Tk_PhotoPutBlock(interp,handle, &destBlockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET); } --- a/tcltk/pow/PowCreateImage.c +++ b/tcltk/pow/PowCreateImage.c @@ -209,10 +209,10 @@ photo_block.offset[1] = 1; photo_block.offset[2] = 2; - Tk_PhotoExpand(photo_image_handle, + Tk_PhotoExpand(interp,photo_image_handle, image_instance->width, image_instance->height); - Tk_PhotoPutBlock(photo_image_handle, &photo_block, 0, 0, + Tk_PhotoPutBlock(interp,photo_image_handle, &photo_block, 0, 0, image_instance->width, image_instance->height, TK_PHOTO_COMPOSITE_SET); ckfree(photo_block.pixelPtr); --- a/tcltk/pow/Visu_tkImgPict.c +++ b/tcltk/pow/Visu_tkImgPict.c @@ -2489,7 +2489,7 @@ } /* set size */ - Tk_PhotoExpand(destHandle,masterPtr->width,masterPtr->height); + Tk_PhotoExpand(interp,destHandle,masterPtr->width,masterPtr->height); /* copy data from pict image to photo image. If no instance exists, no colors have been allocated, so we copy the @@ -2572,7 +2572,7 @@ } /* put block in photo image */ - Tk_PhotoPutBlock(destHandle,&photoblock,0,0,masterPtr->width,masterPtr->height, TK_PHOTO_COMPOSITE_SET); + Tk_PhotoPutBlock(interp,destHandle,&photoblock,0,0,masterPtr->width,masterPtr->height, TK_PHOTO_COMPOSITE_SET); /* free photo block */ ckfree((void*)photoblock.pixelPtr); debian/patches/series0000644000000000000000000000034512037753122012036 0ustar pow_update_photo.patch pow_fix_makefile.patch pow_create_package.patch pow_fix_startup.patch pow_fix_compilerwarnings.patch pow_nolinux.patch fv_require.patch fv_fix_initial_menubar.patch fv_fix_startup.patch fv_fix_sample.patch debian/patches/fv_require.patch0000644000000000000000000000131312037753122014005 0ustar Author: Ole Streicher Description: Instead of hardcoding the shared library names, "require" them as packages. --- a/ftools/guis/fv/class/fvApp.tcl +++ b/ftools/guis/fv/class/fvApp.tcl @@ -199,10 +199,8 @@ } } else { if ![ info exist env(FV_ISEXEC) ] { - set env(POW_LIBRARY) "$FITSVIEWER_LIBRARY/../pow" - set env(POW_HELPDIR) $env(POW_LIBRARY) - load [glob $FITSVIEWER_LIBRARY/../libfitstcl.{s\[ol\]*,dylib}] - load [glob $FITSVIEWER_LIBRARY/../libpow.{s\[ol\]*,dylib}] + package require fitsTcl + package require POW } else { if ![info exist env(FV_HELPDIR)] { set fullname [info nameofexecutable] debian/patches/pow_fix_startup.patch0000644000000000000000000000502212225210701015062 0ustar Author: Ole Streicher Description: Replace the startup script by something simpler, and set the necessary environment. Also, remove the "fv" dependencies for the standalone POWplot. --- a/tcltk/pow/POWplot +++ b/tcltk/pow/POWplot @@ -1,19 +1,5 @@ #!/bin/sh -# -# -(if [ "x$POW" = x ] ; then \ - POW=$FTOOLS; \ - export POW; -fi; \ -POW_LIBRARY=$POW/lib/pow ;\ -export POW_LIBRARY ;\ -unset TCL_LIBRARY; unset TK_LIBRARY; unset TCLLIBPATH ;\ -unset ITCL_LIBRARY; unset ITK_LIBRARY; \ -LD_LIBRARY_PATH=$POW/lib:$LD_LIBRARY_PATH ;\ -export LD_LIBRARY_PATH ;\ -if [ "$POW_DISPLAY" != "" ] ; then \ -$POW/bin/tclsh $POW_LIBRARY/POWplotClient.tcl -- $1 $2 $3 $4 $5 $6 $7 $8 $9; -else -$POW/bin/wish $POW_LIBRARY/POWplot.tcl -- $1 $2 $3 $4 $5 $6 $7 $8 $9; -fi; \ -exit) +export XLIB_SKIP_ARGB_VISUALS=1 +export POW_LIBRARY=/usr/share/ftools/POW +export POW_HELPDIR=/usr/share/doc/ftools-pow/ +exec wish8.5 $POW_LIBRARY/POWplot.tcl -- $* --- a/tcltk/pow/pow.tcl +++ b/tcltk/pow/pow.tcl @@ -5347,7 +5347,7 @@ global showlinks powScopeHeight powScopeWidth powMinHeight powMinWidth global powPlotParam powShowScope powGUIposition global powLutButton powROIButton - global POWRC currgn fvPrefObj + global POWRC currgn event delete <> event delete <> @@ -5401,7 +5401,6 @@ if [info exists powPlotParam(xdimdisp,$currgn)] { set powPlotParam(xdimdisp,powDef) $powPlotParam(xdimdisp,$currgn) set powPlotParam(ydimdisp,powDef) $powPlotParam(ydimdisp,$currgn) - set result [$fvPrefObj setNewGraphSize [list $powPlotParam(xdimdisp,$currgn) $powPlotParam(ydimdisp,$currgn)]] } puts $RCFILE "\n# Default Graph Parameters:" foreach opt $powPlotParam(allOpts,powDef) { @@ -9238,8 +9237,6 @@ set powWCSName(${cntr}scope) $powWCSName($gn) powCreateContour $cntr $img $list $res set powContourParam(list) $list - set useWCSInfo($cntr) $fvPref::ifWCSInfo - set useWCSInfo(${cntr}scope) $fvPref::ifWCSInfo set powWCSLabel(xlabel,$cntr,DEFAULT) $powWCSLabel(xlabel,$gn,DEFAULT) set powWCSLabel(ylabel,$cntr,DEFAULT) $powWCSLabel(ylabel,$gn,DEFAULT) set powWCSLabel(xunit,$cntr,DEFAULT) $powWCSLabel(xunit,$gn,DEFAULT) --- a/tcltk/pow/POWplot.tcl +++ b/tcltk/pow/POWplot.tcl @@ -415,7 +415,6 @@ # set POWLIB "$env(POW_LIBRARY)/.." -set env(POW_HELPDIR) $env(POW_LIBRARY) package require Itcl package require Itk debian/patches/pow_fix_makefile.patch0000644000000000000000000000641612225452234015156 0ustar Author: Ole Streicher Description: Set variables in Makefile.in to get pow compiled (Q&D patch) --- a/tcltk/pow/Makefile.in +++ b/tcltk/pow/Makefile.in @@ -31,40 +31,38 @@ Probe.html Profile.html ROI.html Regions.html Ruler.html \ Scripting.html Tools.html XRange.html -OBJECTS = ${CFILES:.c=.o} ${WCSLIB_DIR}/*.o +OBJECTS = ${CFILES:.c=.o} SHARED_OBJ = ${OBJECTS} STATIC_LIB = lib${LIBRARY}.a SHARED_LIB = lib${LIBRARY}${SHLIB_SUFFIX} -IFLAGS = -I${CFITSIO_DIR} -I${WCSLIB_DIR} \ - -I${TCL_INC_PATH} -I${TK_INC_PATH} ${XINC} +IFLAGS = -I${TCL_INC_PATH} -I${TK_INC_PATH} -I${TK_INC_PATH}/../unix ${XINC} #---------------------------------------------------------------------------- # Configurable macros: #---------------------------------------------------------------------------- -INSTALLDIR = @prefix@ +INSTALLDIR = $(DESTDIR)@prefix@ CC = @CC@ RANLIB = @RANLIB@ +CPPFLAGS = @CPPFLAGS@ CFLAGS = @CFLAGS@ #CFLAGS = -g -DTCL_MEM_DEBUG DEFS = @DEFS@ -DVISU_LIBRARY=\"${INSTALLDIR}/lib/pow\" -C_LIB_OPTION = @C_LIB_OPTION@ +C_LIB_OPTION = shared SHLIB_SUFFIX = @SHLIB_SUFFIX@ SHLIB_LD = @SHLIB_LD@ -LD_FLAGS = @LD_FLAGS@ +LD_FLAGS = @LD_FLAGS@ @LDFLAGS@ -TCL_INC_PATH = @TCL_INC_PATH@ +TCL_INC_PATH = /usr/include/tcl8.5 TCL_LIB_PATH = @TCL_PATH@ TCL_LIB = @TCL_LIB@ -TK_INC_PATH = @TK_INC_PATH@ +TK_INC_PATH = /usr/include/tcl8.5/tk-private/generic/ TK_LIB_PATH = @TK_PATH@ TK_LIB = @TK_LIB@ XINC = @XINCLUDES@ XLIBS = @XLIBS@ -CFITSIO_DIR = @CFITSIODIR@ -WCSLIB_DIR = @WCSLIB_DIR@ -SHLIB_LD_LIBS = @LIBS@ @SHLIB_LD_LIBS@ -L${TCL_LIB_PATH} -l${TCL_LIB} -L${TK_LIB_PATH} -l${TK_LIB} ${XLIBS} +SHLIB_LD_LIBS = @LIBS@ @SHLIB_LD_LIBS@ -ltcl8.5 -ltk8.5 -lwcs -lcfitsio ${XLIBS} #---------------------------------------------------------------------------- # Targets: @@ -84,28 +82,31 @@ ${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} -o ${SHARED_LIB} install: - @if [ ! -d ${INSTALLDIR}/lib/pow ]; then \ - echo "mkdir ${INSTALLDIR}/lib/pow"; \ - mkdir ${INSTALLDIR}/lib/pow; \ + @if [ ! -d ${INSTALLDIR}/lib/tcltk/POW ]; then \ + echo "mkdir ${INSTALLDIR}/lib/tcltk/POW"; \ + mkdir -p ${INSTALLDIR}/lib/tcltk/POW; \ fi @if [ "x${C_LIB_OPTION}" = xstatic ]; then \ echo "cp ${STATIC_LIB} ${INSTALLDIR}/lib/"; \ cp ${STATIC_LIB} ${INSTALLDIR}/lib/; \ else \ - echo "cp ${SHARED_LIB} ${INSTALLDIR}/lib/"; \ - cp ${SHARED_LIB} ${INSTALLDIR}/lib/; \ + echo "cp ${SHARED_LIB} ${INSTALLDIR}/lib/tcltk/POW/"; \ + cp ${SHARED_LIB} ${INSTALLDIR}/lib/tcltk/POW/; \ fi + mkdir -p ${INSTALLDIR}/bin @for file in ${SCRIPTS}; do \ echo "cp $$file ${INSTALLDIR}/bin/"; \ cp $$file ${INSTALLDIR}/bin/; \ done + mkdir -p ${INSTALLDIR}/include @for file in ${HEADERS}; do \ echo "cp $$file ${INSTALLDIR}/include/"; \ cp $$file ${INSTALLDIR}/include/; \ done - @for file in ${TCLFILES} ${EXTRAS}; do \ - echo "cp $$file ${INSTALLDIR}/lib/pow/"; \ - cp $$file ${INSTALLDIR}/lib/pow/; \ + mkdir -p ${INSTALLDIR}/share/ftools/POW + @for file in ${TCLFILES}; do \ + echo "cp $$file ${INSTALLDIR}/share/ftools/POW/"; \ + cp $$file ${INSTALLDIR}/share/ftools/POW/; \ done clean: @@ -134,4 +135,4 @@ .c.o: - ${CC} -c ${CFLAGS} ${DEFS} ${IFLAGS} $< + ${CC} -c ${CPPFLAGS} ${CFLAGS} ${DEFS} ${IFLAGS} $< debian/patches/pow_fix_compilerwarnings.patch0000644000000000000000000005005112037753122016757 0ustar Author. Ole Streicher Description: Fix many compiler warnings. Most of them are because of missing "const" specifiers. . The package compiles fine without this patch, so it may be dropped if it does not apply cleanly. --- a/tcltk/pow/PowCanvCurve.c +++ b/tcltk/pow/PowCanvCurve.c @@ -283,7 +283,7 @@ PowCurveItem *powCurvePtr = (PowCurveItem *) itemPtr; double *pCoordPtr, *lCoordPtr; /*From the old PowProcessCurve command */ - char **bboxptr; + const char **bboxptr; double x0 , x1, y0, y1; double rx0_curr, ry0_curr, rx1_curr, ry1_curr; double rx0 , rx1, ry0, ry1, ry, rx; @@ -298,7 +298,7 @@ int len; char *idxStr; - char *graphType; + const char *graphType; int zoomed; int xCount, yCount; int coordSel; @@ -397,7 +397,7 @@ tagstring = Tk_CanvasTagsPrintProc((ClientData) NULL, Tk_CanvasTkwin(canvas), (char *)itemPtr, - (int) NULL, + 0, &freeProcPtr); @@ -1198,7 +1198,7 @@ XColor *color; tkwin = Tk_CanvasTkwin(canvas); - if (Tk_ConfigureWidget(interp, tkwin, configSpecs, objc, (char**)objv, + if (Tk_ConfigureWidget(interp, tkwin, configSpecs, objc, (const char**)objv, (char *) powCurvePtr, flags|TK_CONFIG_OBJS) != TCL_OK) { return TCL_ERROR; } @@ -1752,7 +1752,7 @@ { PowCurveItem *powCurvePtr = (PowCurveItem *) itemPtr; int length, argc, i; - char **argv = (char **) NULL; + const char **argv = (const char **) NULL; double *new, *coordPtr; Tk_State state = itemPtr->state; --- a/tcltk/pow/PowCommands.c +++ b/tcltk/pow/PowCommands.c @@ -180,8 +180,8 @@ int PowProcessCurve(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]) { /* calculate the list of points for powPlotCurve */ - char **bboxptr; - char **rbboxptr; + const char **bboxptr; + const char **rbboxptr; double x0 , x1, y0, y1; double rx0 , rx1, ry0, ry1, ry, rx; double t_rx0 , t_rx1, t_ry0, t_ry1; /* to avoid point lossage due to roundoff @@ -327,9 +327,9 @@ q1 = (int)(y + 3); q2 = (int)(y - 3); q3 = (int)(y); - sprintf(PlotCommand," %ld %ld %ld %ld ",p2,q3,p1,q3); + sprintf(PlotCommand," %d %d %d %d ",p2,q3,p1,q3); Tcl_VarEval(interp,argv[9]," create line ",PlotCommand,"-tags {",argv[7],"} ", (char *) NULL); - sprintf(PlotCommand," %ld %ld %ld %ld ",p3,q2,p3,q1); + sprintf(PlotCommand," %d %d %d %d ",p3,q2,p3,q1); Tcl_VarEval(interp,argv[9]," create line ",PlotCommand,"-tags {",argv[7],"} ", (char *) NULL); } if (dflag && lflag) { @@ -384,9 +384,9 @@ q1 = (int)(y + ye); q2 = (int)(y - ye); q3 = (int)(y); - sprintf(PlotCommand," %ld %ld %ld %ld ",p2,q3,p1,q3); + sprintf(PlotCommand," %d %d %d %d ",p2,q3,p1,q3); Tcl_VarEval(interp,argv[9]," create line ",PlotCommand,"-tags {",argv[7],"} ", (char *) NULL); - sprintf(PlotCommand," %ld %ld %ld %ld ",p3,q2,p3,q1); + sprintf(PlotCommand," %d %d %d %d ",p3,q2,p3,q1); Tcl_VarEval(interp,argv[9]," create line ",PlotCommand,"-tags {",argv[7],"} ", (char *) NULL); /*update every 100 points */ if (i - lasti > 100) { @@ -863,12 +863,12 @@ int copy; char *direction; char *graphName; - char *canvas; + const char *canvas; double x, y; Point bbox_ll, bbox_ur; int i, j; char cmdLine[1024]; - char **list; + const char **list; #if !(defined(__WIN32__) || defined(macintosh)) char data_name[256]; @@ -1987,7 +1987,7 @@ int argc, char *argv[]) { /* usage: powCreateDataFromList data_name list_o_data*/ int largc; - char **largv, **counter; + const char **largv, **counter; double *data, *datacounter; int i,j; int status = 0; @@ -2126,7 +2126,7 @@ char *graphName; int len; char *idxStr; - char *graphType; + const char *graphType; int zoomed; int xCount, yCount; int graph_is_scope; @@ -2257,7 +2257,7 @@ char *graphName; int len; char *idxStr; - char *graphType; + const char *graphType; int zoomed; int xCount, yCount; int graph_is_scope; @@ -2373,7 +2373,7 @@ char *canvas=".pow.pow"; char *graphName, *operation, *direction; int wcsStatus; - char *WCSstring; + const char *WCSstring; char powWCS[7]="powWCS"; char curveName[512]; struct wcsprm wcs; @@ -2865,7 +2865,7 @@ char *sign; char *regionFile; double *dataPar; - char **argvPtr; + const char **argvPtr; int i, numPars; int plen; --- a/tcltk/pow/PowCreateCurve.c +++ b/tcltk/pow/PowCreateCurve.c @@ -12,7 +12,7 @@ int new = 0, wcsStatus; char *str_ptr; int length = 0; - char *WCSstring; + const char *WCSstring; char powWCS[7]="powWCS"; entry_ptr = Tcl_CreateHashEntry(&PowCurveTable, curve_name, &new); --- a/tcltk/pow/PowCreateGraph.c +++ b/tcltk/pow/PowCreateGraph.c @@ -42,9 +42,9 @@ int len; int zoomed; char *idxStr; - char *graphType; + const char *graphType; int xCount, yCount; - char *WCSvalue; + const char *WCSvalue; char errormsg[512]; #if !(defined(__WIN32__) || defined(macintosh)) --- a/tcltk/pow/PowCreateImage.c +++ b/tcltk/pow/PowCreateImage.c @@ -1,8 +1,8 @@ #include "pow.h" -void PowCreateImage(char *image_name,char *data_name, int *xoffset, +void PowCreateImage(char *image_name, char *data_name, int *xoffset, int *yoffset, int *width, int *height, double *xorigin, - double *xinc, double *yorigin, double *yinc,char *xunits, + double *xinc, double *yorigin, double *yinc, char *xunits, char *yunits, char *zunits, int *status) { /* xinc or yinc == 0 will mean count by integers */ PowImage *image_instance; @@ -25,7 +25,7 @@ char smax[30]; double datum; int i, wcsStatus; - char *WCSstring; + const char *WCSstring; char powWCS[7]="powWCS"; Tcl_GetInt(interp,Tcl_GetVar(interp,"powPseudoImages",TCL_GLOBAL_ONLY), --- a/tcltk/pow/PowEventHandlers.c +++ b/tcltk/pow/PowEventHandlers.c @@ -169,7 +169,7 @@ * exists a partial command, so use * the secondary prompt. */ { - char *promptCmd; + const char *promptCmd; int code; promptCmd = Tcl_GetVar(interp, --- a/tcltk/pow/PowGrid.c +++ b/tcltk/pow/PowGrid.c @@ -39,20 +39,20 @@ int PowDrawGridLines( ClientData clientData, Tcl_Interp *interp, int argc, char *argv[] ); -int CreateGridPts( PowGraph *graph, int zoomed, char *graphType, int xCount, int yCount, +int CreateGridPts( PowGraph *graph, int zoomed, const char *graphType, int xCount, int yCount, Point BotLeft_real, Point BotLeft, Point TopRgt, GridPt **rtnGrid ); int GetTicks( int nGrid, GridPt Grid[], int useWCS, char *tickScal[2], int numTicks[2], double **ticks, char **axis ); int GetTics( double a1, double a2, int nlabel, int maxlabels, char *tickScal, double *list ); int PtBtwnPts( Point pt, Point pt1, Point pt2, char fixed ); -Point CalcXY( PowGraph *graph, Point pt, GridPt *G, int zoomed, char *graphType, int xCount, int yCount ); +Point CalcXY( PowGraph *graph, Point pt, GridPt *G, int zoomed, const char *graphType, int xCount, int yCount ); Point SolveXY( double Val, char axis, GridPt *G); -void CalcCoeff( PowGraph *graph, GridPt *G1, GridPt *G2, GridPt *G3, int zoomed, char *graphType, int xCount, int yCount ); +void CalcCoeff( PowGraph *graph, GridPt *G1, GridPt *G2, GridPt *G3, int zoomed, const char *graphType, int xCount, int yCount ); void changeListOrder(double *list, int n); int CanvToGraph( PowGraph *graph, Point Pt0, Point pt, Point *Pt, SideVal sd ); -int GraphToCanv( PowGraph *graph, int zoomed, char *graphType, int xCount, int yCount, +int GraphToCanv( PowGraph *graph, int zoomed, const char *graphType, int xCount, int yCount, Point Pt0, Point Pt, Point Pt0_real, Point *pt ); /*****************************************************************/ @@ -60,7 +60,8 @@ int PowDrawGridLines(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]) { - char *gn, *canvas, *color, *dash, **list; + char *gn, *canvas, *color, *dash; + const char **list; char *tickScal[2]; int useWCS, doGrid; Point bbox_ll, bbox_ur, BotLft_real, IntSects[16], GridSegs[100]; @@ -77,7 +78,7 @@ double tmp; int len; char *idxStr; - char *graphType; + const char *graphType; int zoomed; int xCount, yCount; @@ -397,7 +398,7 @@ &((Grid).imgPt), sd); \ } \ -int CreateGridPts(PowGraph *graph, int zoomed, char *graphType, int xCount, int yCount, +int CreateGridPts(PowGraph *graph, int zoomed, const char *graphType, int xCount, int yCount, Point BotLft_real, Point BotLft, Point TopRgt, GridPt **rtnGrid) { GridPt *Grid; @@ -894,7 +895,7 @@ int errFlag; int len; char *idxStr; - char *graphType; + const char *graphType; int zoomed; int xCount, yCount; @@ -938,7 +939,7 @@ return(errFlag); } -int GraphToCanv( PowGraph *graph, int zoomed, char *graphType, int xCount, int yCount, +int GraphToCanv( PowGraph *graph, int zoomed, const char *graphType, int xCount, int yCount, Point Pt0, Point Pt, Point Pt0_real, Point *pt ) { int errFlag; @@ -997,7 +998,7 @@ return 1; } -Point CalcXY ( PowGraph *graph, Point pt, GridPt *G, int zoomed, char *graphType, int xCount, int yCount ) +Point CalcXY ( PowGraph *graph, Point pt, GridPt *G, int zoomed, const char *graphType, int xCount, int yCount ) { /* Chai: 07/19/2007: This function is no longer used. */ @@ -1078,7 +1079,7 @@ return XY; } -void CalcCoeff( PowGraph *graph, GridPt *G1, GridPt *G2, GridPt *G3, int zoomed, char *graphType, int xCount, int yCount ) +void CalcCoeff( PowGraph *graph, GridPt *G1, GridPt *G2, GridPt *G3, int zoomed, const char *graphType, int xCount, int yCount ) { double dX,dY,ds; double dX2,dY2; @@ -1143,7 +1144,7 @@ int i, j, xbnds, ybnds; long nelem, elem; PowImage *img; - char **list; + const char **list; #if !(defined(__WIN32__) || defined(macintosh)) void *data; #endif --- a/tcltk/pow/PowInit.c +++ b/tcltk/pow/PowInit.c @@ -95,7 +95,7 @@ int Pow_Init(Tcl_Interp *interp_instance) { Tcl_DString pow_env; - char *charptr; + const char *charptr; char temp[1000]; #if !(defined(__WIN32__) || defined(macintosh)) Tcl_DString pow_script; --- a/tcltk/pow/PowUtils.c +++ b/tcltk/pow/PowUtils.c @@ -17,7 +17,7 @@ static int Pt_in_Poly( double x, double y, int nPts, double *Pts ); -int PowFindCurvesMinMax(char *curves, char *axis, double *min, double *max, +int PowFindCurvesMinMax(const char *curves, char *axis, double *min, double *max, int filter) /* Sets min and max to the minimum and maximum values found in the "axis" vector of each member of the list of curves. Initial values @@ -29,7 +29,7 @@ PowVector *current_vector; PowData *current_data; int curve_index,curveArgc; - char **curveArgv; + const char **curveArgv; double datum; int i; @@ -80,11 +80,11 @@ PowCurve *current_curve; PowVector *Xvec, *Yvec; int curve_index,curveArgc; - char **curveArgv; + const char **curveArgv; double xdatum, ydatum, xmin, xmax, ymin, ymax, tmp; double lxmin, lxmax, lymin, lymax; int i,j, logX, logY; - char *optVal; + const char *optVal; #if !(defined(__WIN32__) || defined(macintosh)) PowData *current_data; #endif @@ -201,7 +201,7 @@ { PowImage *current_image; int image_index,imageArgc; - char **imageArgv; + const char **imageArgv; double xorigin,xotherend,yorigin,yotherend,xcorner,ycorner; if(images == NULL || strstr(images,"NULL") != NULL) return TCL_OK; @@ -349,7 +349,7 @@ double tmp; int len; char *idxStr; - char *graphType; + const char *graphType; int zoomed; int xCount, yCount; @@ -398,7 +398,7 @@ } PowCurve * -PowFindCurve(char *curve_name) { +PowFindCurve(const char *curve_name) { Tcl_HashEntry *entry_ptr; PowCurve *curve_ptr; @@ -415,7 +415,7 @@ } PowImage * -PowFindImage(char *image_name) { +PowFindImage(const char *image_name) { Tcl_HashEntry *entry_ptr; PowImage *image_ptr; @@ -547,10 +547,10 @@ } -char *PowGetObjectOption(char *graph, char *obj, char *option, char *objType) +const char *PowGetObjectOption(char *graph, const char *obj, char *option, char *objType) { char *idxStr, gn[255]; - char *res; + const char *res; int len; len = strlen(graph); @@ -604,7 +604,7 @@ char powFitsHeaderCnt[17]="powFitsHeaderCnt"; int i, relax, HDRcnt, ctrl, nreject=0, nwcs=0; struct wcsprm *wcs; - char *HDRstring; + const char *HDRstring; /* input */ int ncoord, nelem; @@ -618,7 +618,7 @@ int coordSel; int useWCSInfo; - char *str = NULL; + const char *str = NULL; if ( WCS->graphName[0] != '\0' && strcmp(WCS->graphName, "NULL") != 0 ) { str = Tcl_GetVar2(interp,"useWCSInfo",WCS->graphName,TCL_GLOBAL_ONLY); @@ -733,7 +733,7 @@ char powFitsHeaderCnt[17]="powFitsHeaderCnt"; int i, relax, HDRcnt, ctrl, nreject=0, nwcs=0; struct wcsprm *wcs; - char *HDRstring; + const char *HDRstring; /* input */ int ncoord, nelem; @@ -747,7 +747,7 @@ int coordSel; int useWCSInfo; - char *str = NULL; + const char *str = NULL; if ( WCS->graphName[0] != '\0' && strcmp(WCS->graphName, "NULL") != 0 ) { str = Tcl_GetVar2(interp,"useWCSInfo",WCS->graphName,TCL_GLOBAL_ONLY); --- a/tcltk/pow/PowWCS.c +++ b/tcltk/pow/PowWCS.c @@ -39,7 +39,7 @@ char powFitsHeaderCnt[17]="powFitsHeaderCnt"; int i, relax, HDRcnt, ctrl, nreject=0, nwcs=0; struct wcsprm *wcs; - char *HDRstring; + const char *HDRstring; int status; int coordSel; Tcl_Obj *listObj; @@ -247,7 +247,7 @@ fprintf(stdout, "WCS->cdFrwd[1] : <%20.15f,%20.15f>\n", WCS->cdFrwd[1][0], WCS->cdFrwd[1][1]); fprintf(stdout, "WCS->cdRvrs[0] : <%20.15f,%20.15f>\n", WCS->cdRvrs[0][0], WCS->cdRvrs[0][1]); fprintf(stdout, "WCS->cdRvrs[1] : <%20.15f,%20.15f>\n", WCS->cdRvrs[1][0], WCS->cdRvrs[1][1]); - fprintf(stdout, "WCS->rot : <%d>\n", WCS->rot); + fprintf(stdout, "WCS->rot : <%20.15f>\n", WCS->rot); fprintf(stdout, "WCS->haveWCSinfo: <%d>\n", WCS->haveWCSinfo); fprintf(stdout, "**********************************\n"); fflush(stdout); @@ -386,7 +386,7 @@ FillinWCSStructure(&curve_ptr->WCS); if ( curve_ptr->WCS.type[0] == '\0' ) { - char *WCSstring; + const char *WCSstring; WCSstring = Tcl_GetVar2(interp, "powWCS", curveName,TCL_GLOBAL_ONLY); /* Tcl_SetVar2(interp,"powWCS", curveName, "", TCL_GLOBAL_ONLY); */ @@ -400,7 +400,7 @@ PowCurve *current_curve; PowImage *current_image; int index,Argc; - char **Argv; + const char **Argv; char *p; graph->WCS.type[0] = '\0'; --- a/tcltk/pow/Visu_Init.c +++ b/tcltk/pow/Visu_Init.c @@ -48,7 +48,7 @@ #if !(defined(__WIN32__) || defined(macintosh)) char *visu_env; char temp[1000]; - char *libDir; + const char *libDir; #endif #if !(defined(__WIN32__) || defined(macintosh)) --- a/tcltk/pow/pow.h +++ b/tcltk/pow/pow.h @@ -233,7 +233,7 @@ int x, int y, int width, int height, double zoomX, double zoomY, double Xoff, double Yoff)); -int PowFindCurvesMinMax(char *, char *, double *, double *, int); +int PowFindCurvesMinMax(const char *, char *, double *, double *, int); int PowFindCurvesValue (char *, char *, int, double *); int PowFindCurvesBBox(char *, char *, double *, double *, double *, double *, WCSdata *); @@ -245,7 +245,7 @@ int PowSortGraphMinMax(PowGraph *, double *, double *,double *, double *, double *, double *); -char *PowGetObjectOption(char *gn, char *obj, char *option, char *objType); +const char *PowGetObjectOption(char *gn, const char *obj, char *option, char *objType); #ifdef __WIN32__ __int64 PowExtractDatumLong(PowData *, int); @@ -255,9 +255,9 @@ double PowExtractDatum(PowData *, int); int PowPutDatum(PowData *,double,int); -PowCurve * PowFindCurve(char *); +PowCurve * PowFindCurve(const char *); PowVector * PowFindVector(char *); -PowImage * PowFindImage(char *); +PowImage * PowFindImage(const char *); PowGraph * PowFindGraph(char *); PowData * PowFindData(char *); int PowIsInRegion( double* , double *, int , char *, int* ); --- a/tcltk/pow/Visu_tkImgPict.c +++ b/tcltk/pow/Visu_tkImgPict.c @@ -109,16 +109,16 @@ */ static int ImgPictCmd _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, int argc, char **argv)); + Tcl_Interp *interp, int argc, const char **argv)); static int ParseSubcommandOptions _ANSI_ARGS_(( struct SubcommandOptions *optPtr, Tcl_Interp *interp, int allowedOptions, - int *indexPtr, int argc, char **argv)); + int *indexPtr, int argc, const char **argv)); static void ImgPictCmdDeletedProc _ANSI_ARGS_(( ClientData clientData)); static int ImgPictConfigureMaster _ANSI_ARGS_(( Tcl_Interp *interp, PictMaster *masterPtr, - int argc, char **argv, int flags)); + int argc, const char **argv, int flags)); static void ImgPictConfigureInstance _ANSI_ARGS_(( PictInstance *instancePtr)); static void ImgPictSetSize _ANSI_ARGS_((PictMaster *masterPtr, @@ -128,15 +128,15 @@ static int ImgPictCopy(Tcl_Interp *interp, PictMaster *masterPtr, int argc, - char **argv); + const char **argv); static int ImgPictSnap2Photo(Tcl_Interp *interp, PictMaster *masterPtr, int argc, - char **argv); + const char **argv); static int ImgPictSnap2Pict(Tcl_Interp *interp, PictMaster *masterPtr, int argc, - char **argv); + const char **argv); static int MatchFileFormat _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Channel f, char *fileName, char *formatString, Tk_PictImageFormat **imageFormatPtr, @@ -295,7 +295,7 @@ Tcl_HashEntry *entry; int isNew; int j, argc; - char **argv; + const char **argv; #ifdef DEBUG printf("ImgPictCreate\n"); @@ -303,7 +303,7 @@ /* Convert Tcl_Objs to char * */ argc = objc; - argv = (char **) ckalloc( argc * sizeof(char *) ); + argv = (const char **) ckalloc( argc * sizeof(char *) ); for( j=0; jinstancePtr) == NULL ) @@ -1322,7 +1322,7 @@ * current index in argv; this variable is * updated by this procedure. */ int argc; /* Number of arguments in argv[]. */ - char **argv; /* Arguments to be parsed. */ + const char **argv; /* Arguments to be parsed. */ { int index, c, bit, currentBit; size_t length; @@ -1544,7 +1544,7 @@ PictMaster *masterPtr; /* Pointer to data structure describing * overall Pict image to (re)configure. */ int argc; /* Number of entries in argv. */ - char **argv; /* Pairs of configuration options for image. */ + const char **argv; /* Pairs of configuration options for image. */ int flags; /* Flags to pass to Tk_ConfigureWidget, * such as TK_CONFIG_ARGV_ONLY. */ { @@ -2341,7 +2341,7 @@ static int ImgPictCopy(Tcl_Interp *interp, PictMaster *masterPtr, int argc, - char **argv) + const char **argv) { int index; int width, height; @@ -2469,7 +2469,7 @@ int ImgPictSnap2Photo(Tcl_Interp *interp, PictMaster *masterPtr, int argc, - char **argv) + const char **argv) { void *destHandle; int i,j,col; @@ -2599,7 +2599,7 @@ int ImgPictSnap2Pict(Tcl_Interp *interp, PictMaster *masterPtr, int argc, - char **argv) + const char **argv) { PictMaster *destmasterPtr; Tk_PictHandle destHandle; debian/patches/pow_nolinux.patch0000644000000000000000000000146312037753122014225 0ustar Author: Ole Streicher Description: Extend the known operating systems by Gnu HURD and kfreeBSD. --- a/tcltk/pow/configure.in +++ b/tcltk/pow/configure.in @@ -38,7 +38,7 @@ AC_MSG_ERROR(HEAsoft: Unable to guess system type. Please set it using --with-bindir option) fi changequote(,) - BINDIR=`$UNAME -s 2> /dev/null`_`$UNAME -r 2> /dev/null | sed 's:[^0-9]*\([0-9][0-9]*\.[0-9]*\).*:\1:'` + BINDIR=`$UNAME -s 2> /dev/null | sed 's:.*/::'`_`$UNAME -r 2> /dev/null | sed 's:[^0-9]*\([0-9][0-9]*\.[0-9]*\).*:\1:'` changequote([,]) lhea_machine=`$UNAME -m 2> /dev/null` BIN_EXT= @@ -58,7 +58,7 @@ EXT=hpu lhea_machine=`$UNAME -m 2> /dev/null | tr '/' ' ' | awk '{ print $2 }'` ;; - Linux*) + Linux*|kFreeBSD*|GNU*) EXT=lnx ;; OSF1*) debian/patches/fv_fix_sample.patch0000644000000000000000000000052212037753122014461 0ustar Author: Ole Streicher Description: insert the shell name on the top of the sample script --- a/ftools/guis/fv/scripts/XPAScript.csh +++ b/ftools/guis/fv/scripts/XPAScript.csh @@ -1,3 +1,4 @@ +#!/bin/csh ######################################################################## # # Sample C-Shell script for fv 2.6 debian/patches/pow_create_package.patch0000644000000000000000000000431412225452234015444 0ustar Author: Ole Streicher Description: Create and "package require" the POW package. --- a/tcltk/pow/POWplot.tcl +++ b/tcltk/pow/POWplot.tcl @@ -421,8 +421,8 @@ package require Itk package require Iwidgets -load [glob $POWLIB/libfitstcl.{s\[ol\]*,dylib}] -load [glob $POWLIB/libpow.{s\[ol\]*,dylib}] +package require fitsTcl +package require POW # Look for client/server flag --- a/tcltk/pow/PowInit.c +++ b/tcltk/pow/PowInit.c @@ -130,12 +130,9 @@ charptr = Tcl_GetVar2(interp,"env", "POW_LIBRARY", TCL_GLOBAL_ONLY); if( charptr == NULL ) { - puts("Could not find defaults."); - puts(" Set your POW_LIBRARY environment variable."); - return TCL_ERROR; - } else { - Tcl_DStringAppend(&pow_env,charptr, -1); + charptr = "/usr/share/ftools/POW"; } + Tcl_DStringAppend(&pow_env,charptr, -1); /* Brackets needed around %s to prevent Windows-style paths */ /* ... eg, c:\fv... from getting converted to control chars */ @@ -219,6 +216,9 @@ Pow_CreateCommands(interp); Tk_CreateItemType(&tkPowCurveType); + + Tcl_PkgProvide(interp, "POW", "3.0"); + return TCL_OK; } --- a/tcltk/pow/Makefile.in +++ b/tcltk/pow/Makefile.in @@ -79,6 +79,7 @@ shared: ${SHARED_OBJ} ${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} -o ${SHARED_LIB} + echo "pkg_mkIndex . libpow.so" | tclsh8.5 install: @if [ ! -d ${INSTALLDIR}/lib/tcltk/POW ]; then \ @@ -90,7 +91,7 @@ cp ${STATIC_LIB} ${INSTALLDIR}/lib/; \ else \ echo "cp ${SHARED_LIB} ${INSTALLDIR}/lib/tcltk/POW/"; \ - cp ${SHARED_LIB} ${INSTALLDIR}/lib/tcltk/POW/; \ + cp ${SHARED_LIB} pkgIndex.tcl ${INSTALLDIR}/lib/tcltk/POW/; \ fi mkdir -p ${INSTALLDIR}/bin @for file in ${SCRIPTS}; do \ @@ -103,13 +104,13 @@ cp $$file ${INSTALLDIR}/include/; \ done mkdir -p ${INSTALLDIR}/share/ftools/POW - @for file in ${TCLFILES}; do \ + @for file in ${TCLFILES} tclIndex; do \ echo "cp $$file ${INSTALLDIR}/share/ftools/POW/"; \ cp $$file ${INSTALLDIR}/share/ftools/POW/; \ done clean: - -rm -rf *.o *~ ${STATIC_LIB} ${SHARED_LIB} so_locations + -rm -rf *.o *~ ${STATIC_LIB} ${SHARED_LIB} pkgIndex.tcl so_locations distclean: clean -rm -f config.cache config.status config.log Makefile debian/patches/fv_fix_startup.patch0000644000000000000000000001044512037753122014707 0ustar Author: Ole Streicher Description: Replace the startup script by something simpler, and set the necessary environment. --- a/ftools/guis/fv/fv +++ b/ftools/guis/fv/fv @@ -1,126 +1,5 @@ #!/bin/sh -# -# $Id: fv,v 1.27 2006/05/01 14:51:38 chai Exp $ -# -# $Log: fv,v $ -# Revision 1.27 2006/05/01 14:51:38 chai -# Expand the fv to accept more than 9 parameters -# -# Revision 1.26 2004/05/24 15:45:43 irby -# Define and export DYLD_LIBRARY_PATH (Darwin). -# -# Revision 1.25 2001/02/05 21:55:04 ngan -# Automatically setting the enviroment XPA_ACL for hera module. -# -# Revision 1.24 2000/08/28 20:13:23 pwilson -# Move fv back to startup with wish... for updated itcl -# -# Revision 1.23 1999/12/16 22:20:37 pwilson -# Rename startup script to fvInit.tcl -# -# Revision 1.22 1999/11/09 16:55:32 pwilson -# Run itkwish3.1 -# -# Revision 1.21 1999/11/02 20:43:34 pwilson -# Restore the 'unset's of xxx_LIBRARY variables -# -# Revision 1.20 1999/04/14 19:01:50 pwilson -# Improve some environment variable handling, some 1D image problems, -# and an FTP file selection update problem... and a few other things -# -# Revision 1.19 1998/12/29 23:30:27 pwilson -# Modify fv startup scripts to run under itkwish instead of wish... avoids -# linker problems under SunOS 4. -# -# Revision 1.18 1998/08/07 18:07:23 jxu -# dynamically load itcl and itk -# -# Revision 1.17 1998/08/07 17:52:56 elwin -# Changed itkwish to itkwish3.0 -# -# Revision 1.16 1998/08/06 18:27:41 jxu -# FV using itcl3.0 -# -# Revision 1.15 1998/01/16 18:18:49 peachey -# Set POW_LIBRARY environment variable -# -# Revision 1.14 1997/12/04 22:07:59 jxu -# Added a WCS switch in fv -# Added a command line help option -# Make a graph bigger 700x700 -# -# Revision 1.13 1997/10/22 19:58:06 jxu -# add user option of -cmap {0 1 2 3} -# -# Revision 1.12 1997/10/08 19:44:23 jxu -# add larry's color map scheme. -# I found set free_cells to 2 is the best for me at least on my Linux box -# -# Revision 1.11 1997/09/04 18:24:26 jxu -# bug fixes and some enhancement -# -# Revision 1.10 1997/04/03 20:19:27 jxu -# take out the SYSPFILES variable -# -# Revision 1.9 1997/03/26 21:15:20 jxu -# Add echo "loading fv ... " -# -# Revision 1.8 1997/03/20 15:11:25 jxu -# Add in undo in header windows. -# Speed up the starting process -# Wrote new file dialog for speed -# Update the help files -# -# Revision 1.7 1997/03/14 20:05:49 elwin -# Changing fv for the new regime -# -# Revision 1.6 1996/12/06 13:30:49 oneel -# More changes to conform to the current regeim -# -# Revision 1.5 1996/10/31 21:48:24 elwin -# unset some variables to fix things for people with TCL variables -# already set. -# -# Revision 1.3.2.1 1996/10/15 20:45:18 elwin -# added itcl directory to LD_LIB_PATH variable -# -# Revision 1.4 1996/10/15 20:43:33 elwin -# added itcl directory to LD_LIBRARY_PATH -# -# Revision 1.3 1996/09/03 21:01:41 jxu -# *** empty log message *** -# -# Revision 1.2 1996/07/23 15:35:11 oneel -# itcl 2.1 updates to fv -# -# Revision 1.1 1996/07/16 19:35:28 jxu -# Get rid of the starting window -# -# Revision 1.1 1996/06/13 14:01:17 oneel -# itcl2 additions -# -# Revision 1.1 1996/06/11 19:35:36 oneel -# Fitsviewer install -# -# -(if [ "x$FV" = x ] ; then \ - FV=$FTOOLS; \ - export FV; -fi; \ -FITSVIEWER_LIBRARY=$FV/lib/fv; \ -LD_LIBRARY_PATH=$FV/lib:$LD_LIBRARY_PATH ;\ -if [ "x$DYLD_LIBRARY_PATH" = x ] ; then \ - DYLD_LIBRARY_PATH=$FV/lib; \ -else \ - DYLD_LIBRARY_PATH=$FV/lib:$DYLD_LIBRARY_PATH; \ -fi; \ -export DYLD_LIBRARY_PATH; \ -export FITSVIEWER_LIBRARY; \ -export LD_LIBRARY_PATH;\ -unset TCL_LIBRARY; unset TK_LIBRARY; unset TCLLIBPATH; \ -unset ITCL_LIBRARY; unset ITK_LIBRARY; \ -if [ "$#" -ge 2 -a "$2" = "hera" ] ; then \ - XPA_ACL=false; \ - export XPA_ACL; - fi; \ -$FV/bin/wish $FITSVIEWER_LIBRARY/fvInit.tcl -- "$@") +export FITSVIEWER_LIBRARY=/usr/share/ftools/fv +export FV_HELPDIR=/usr/share/doc/ftools-fv/doc +export XLIB_SKIP_ARGB_VISUALS=1 +exec wish $FITSVIEWER_LIBRARY/fvInit.tcl -- "$@" --- a/ftools/guis/fv/fvInit.tcl +++ b/ftools/guis/fv/fvInit.tcl @@ -12,8 +12,5 @@ # Add auto_load path lappend auto_path [file join "$env(FITSVIEWER_LIBRARY)" class] -# Add pathes for help files. -set env(FV_HELPDIR) [file join "$env(FITSVIEWER_LIBRARY)" doc] - eval fvInit $argv debian/ftools-pow.manpages0000644000000000000000000000002312037753122013011 0ustar debian/POWplot.man debian/fv.man0000644000000000000000000000447012037753122010305 0ustar .TH FV "1" "July 2009" "Heasoft" "User Commands" .SH NAME fv \- a tool for viewing and editing FITS format files .SH SYNOPSIS .B fv .SH DESCRIPTION .PP fv is a FITS file viewer and editor developed at the High Energy Astrophysics Science Archive Research Center (HEASARC) at NASA / GSFC. .PP To start up fv on Unix workstations, enter `fv' in a command window. You can optionally append the name of a FITS file, or multiple files, to be opened. For example, `fv ngc1316o.fit' opens a single file, and `fv ngc*' opens all the FITS files in the current directory whose name matches the string. On Windows PCs you can start fv either by double clicking on the fv desktop icon, or by dragging a FITS file from, say, Windows Explorer onto the fv icon. It is also possible to set up your Windows or Unix environment so that you can just double click (in the File Manager or on an e-mail attachment) on a FITS file that has a standard extension like `.fit' or `.fits' and then have fv automatically start up and open that file. .SH OPTIONS .PP .TP \fB\-cmap \fIm Set the colormap. .IP \fBm=0\fR Default behavior. I.e. choose the "best" colormap. .IP \fBm=1\fR Force POW to setup a new private pseudocolor colormap (very safe) .IP \fBm=2\fR Force POW to use truecolor mode (very safe, but looks bad on low color displays and runs slower than pseudocolor). Note: this will cause powSetupColormap to look for a truecolor visual; if it can't find one, it will allow the main Tk code to pick a visual, but POW will still use "truecolor mode" (i.e. the Tk photo widget) to display images. .IP \fBm=3\fR Force use of the screen default colormap. This should be reasonably safe now, but often won't be what you want. .TP \fB\-winmanager \fI1/0 Turn Window manager On and Off. .TP \fB\-quiet Startup fv without open dialog and stay open even if all files are closed. .TP \fB\-module \fImodName \fR or \fB\-modName Load a web module into fv. .TP \fB\-version Display fv Version. .TP \fB\-user Logon with user ID. .SH ENVIRONMENT The environment variable FVTMP defines what directory fv will use to create temporary files. .SH AUTHOR Text copied from heasoft's web page at http://heasarc.gsfc.nasa.gov/docs/software/lheasoft/ftools/fv/doc/startFv.html .SH "SEE ALSO" The program is documented fully by the online help that can be accessed from the built-in help viewer. debian/ftools-fv.docs0000644000000000000000000000006112037753122011756 0ustar ftools/guis/fv/doc/ ftools/guis/fv/Release_Notes debian/control0000644000000000000000000000351212225214430010565 0ustar Source: ftools-fv Section: science Priority: optional Maintainer: Debian Science Maintainers Uploaders: Ole Streicher Build-Depends: debhelper (>= 9), dh-autoreconf, libcfitsio3-dev, tcl8.5-dev, tk8.5-dev, wcslib-dev Standards-Version: 3.9.4 Homepage: http://heasarc.gsfc.nasa.gov/docs/software/lheasoft/ftools/fv/ Vcs-Git: git://anonscm.debian.org/debian-science/packages/ftools-fv.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/ftools-fv.git Package: ftools-fv Architecture: all Depends: ftools-pow, itcl3, itk3, iwidgets4, ${misc:Depends}, ${shlibs:Depends} Conflicts: fv Replaces: fv Suggests: saods9, xpa-tools Description: Tool for viewing and editing FITS format files Fv provides a graphical user interface to data stored in FITS (Flexible Image Transport System) files. Local files can be created, viewed and edited, files on the internet can be opened read-only through the http and ftp protocols. Through the POWplot program, FITS data can be visualized in a large variety of styles. An interface to the SkyView online database allows for searching, downloading, and plotting of images and object lists for a region of the sky. Package: ftools-pow Architecture: any Depends: itcl3, itk3, iwidgets4, tcl-fitstcl, tix, ${misc:Depends}, ${shlibs:Depends} Description: Curve plotting and image display interface tool POW is a curve plotting and image display interface tool written and distributed by the HEASARC at NASA/GSFC. . POW features a very flexible developer's interface and a "friendly" end user GUI interface. POW is a Tcl/Tk extension and can be called from standard C or FORTRAN main programs. debian/source/0000755000000000000000000000000012037753122010470 5ustar debian/source/format0000644000000000000000000000001412037753122011676 0ustar 3.0 (quilt) debian/ftools-fv.menu0000644000000000000000000000014012037753122011770 0ustar ?package(ftools-fv):needs="X11" section="Applications/Viewers" title="fv" command="/usr/bin/fv" debian/ftools-pow.install0000644000000000000000000000013612037753122012671 0ustar usr/bin/POWplot usr/include/pow.h usr/include/tkpict.h usr/lib/tcltk/POW usr/share/ftools/POW debian/compat0000644000000000000000000000000212037753122010366 0ustar 9 debian/changelog0000644000000000000000000000171712225452472011053 0ustar ftools-fv (5.3+dfsg-4) unstable; urgency=low [ Sergei Golovan ] * Fixed FTBFS with new Tcl/Tk after dropping /usr/bin/tclsh alternative and removing patch for tclPort.h. -- Ole Streicher Thu, 10 Oct 2013 09:20:23 +0200 ftools-fv (5.3+dfsg-3) unstable; urgency=low * Call wish8.5 and depend of tk8.5 (required because we use itcl{3} which depends on tk8.5). Closes: #725689 * Push standard to 3.9.4 w/o changes. * Propagate CPPFLAGS and LDFLAGS for hardening. -- Ole Streicher Wed, 09 Oct 2013 11:13:33 +0200 ftools-fv (5.3+dfsg-2) unstable; urgency=low * Fix FTBS on hurd -- Ole Streicher Thu, 18 Oct 2012 11:46:07 +0200 ftools-fv (5.3+dfsg-1) unstable; urgency=low * Initial release. Closes: #682205 * Replaces old "fv" package. Closes: #527670, #359142, #473002, #499725, #592693, #259548 -- Ole Streicher Mon, 03 Sep 2012 12:15:00 +0200 debian/ftools-pow.docs0000644000000000000000000000014712037753122012155 0ustar tcltk/pow/*.html tcltk/pow/stretcharrow.xbm tcltk/pow/mhh7.gif tcltk/pow/HOWTO tcltk/pow/Release_Notes debian/ftools-fv.examples0000644000000000000000000000006212037753122012645 0ustar ftools/guis/fv/sample_data ftools/guis/fv/scripts debian/ftools-fv.manpages0000644000000000000000000000001612037753122012621 0ustar debian/fv.man debian/repack-dfsg.sh0000755000000000000000000000160712037753122011721 0ustar #!/bin/sh # ./debian/repack # Repackage the source files as a DFSG tarball, with unnecessary # files removed. TMPDIR=$(mktemp --directory) trap "rm -fr ${TMPDIR} || exit 1" EXIT INT TERM ver=$2 orig_tar=$3 tardir=$(dirname ${orig_tar}) debiandir=$(dirname $0) pkgname=$(grep ^[^[:space:]] ${debiandir}/changelog | head -1|cut -d' ' -f1) echo $pkgname $ver $orig_tar $tardir $wd tar xf ${orig_tar} -C ${TMPDIR} srcdir=$(ls -d ${TMPDIR}/*) if [ -f ${debiandir}/dfsg.move ] ; then ( while read source target ; do mkdir -p ${srcdir}/${target} mv ${srcdir}/${source} ${srcdir}/${target} done ) < ${debiandir}/dfsg.move fi for fname in $(cat ${debiandir}/dfsg.remove | sed s/\#.\*//); do rm -rf ${srcdir}/${fname} done dfsg_tar=${tardir}/${pkgname}_${ver}+dfsg.orig.tar.gz tar czf ${dfsg_tar} -C ${TMPDIR} . exec uupdate --no-symlink --upstream-version ${ver}+dfsg ${dfsg_tar} debian/rules0000755000000000000000000000101012225215232010232 0ustar #!/usr/bin/make -f # -*- makefile -*- #DH_VERBOSE=1 %: dh $@ --with autoreconf override_dh_autoreconf: dh_autoreconf "(cd tcltk/pow ; autoreconf)" override_dh_auto_configure: dh_auto_configure -D tcltk/pow -- CC=gcc override_dh_auto_build: dh_auto_build -D tcltk/pow override_dh_auto_install: dh_auto_install -D tcltk/pow override_dh_fixperms: dh_fixperms chmod 0644 debian/ftools-*/usr/share/ftools/*/*.tcl override_dh_auto_clean: fgrep -q WCSLIB_OBJ_TMP tcltk/pow/Makefile || dh_auto_clean -D tcltk/pow debian/POWplot.man0000644000000000000000000000107112037753122011230 0ustar .TH POWPLOT "1" "July 2009" "Heasoft" "User Commands" .SH NAME POWplot \- vizualize FITS data .SH SYNOPSIS .B POWplot filename .SH DESCRIPTION .PP Through the POWplot program, FITS data can be visualized in a large variety of styles. An interface to the SkyView online database allows for searching, downloading, and plotting of images and object lists for a region of the sky. .SH OPTIONS .PP This program does not take any command line arguments. .SH "SEE ALSO" The program is documented fully by the online help that can be accessed from the built-in help viewer. debian/fv.desktop0000644000000000000000000000032612037753122011177 0ustar [Desktop Entry] Version=1.0 Name=fv FITS Editor GenericName=FITS Editor Comment=View and manipulate FITS-format files Type=Application Exec=fv Icon=fv MimeType=image/x-fits; Categories=Education;Science;Astronomy; debian/copyright0000644000000000000000000000402512037753122011124 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: fv Upstream-Contact: William Pence, Pan Chai Source: http://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/fv Files: * Copyright: 2000-2009, William Pence, Pan Chai 1991-1996, The Regents of the University of California 1994-1996, Sun Microsystems, Inc 1996, Pierre-Louis Bossart 1994, The Australian National University 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. Files: debian/* Copyright: 2012 Ole Streicher License: MIT see above Note: The package was first debianized by Jens Schmalzing Tue, 18 Sep 2001 21:37:02 +0200. debian/fv.xpm0000644000000000000000000001666212037753122010344 0ustar /* XPM */ static char * fv_xpm[] = { "48 48 172 2", " c None", ". c #E5E5E5", "+ c #A8A8A8", "@ c #424242", "# c #000000", "$ c #050505", "% c #545454", "& c #E4E4E4", "* c #030303", "= c #191919", "- c #222222", "; c #242424", "> c #181818", ", c #141414", "' c #595959", ") c #DBDBDB", "! c #ECECEC", "~ c #A6A6A6", "{ c #090909", "] c #4A4A4A", "^ c #B9B9B9", "/ c #E3E3E3", "( c #B3B3B3", "_ c #9F9F9F", ": c #868686", "< c #0E0E0E", "[ c #444444", "} c #A4A4A4", "| c #2A2A2A", "1 c #D8D8D8", "2 c #E2E2E2", "3 c #3E3E3E", "4 c #161616", "5 c #454545", "6 c #8D8D8D", "7 c #151515", "8 c #898989", "9 c #DEDEDE", "0 c #CDCDCD", "a c #B6B6B6", "b c #2D2D2D", "c c #848484", "d c #1F1F1F", "e c #636363", "f c #EAEAEA", "g c #BEBEBE", "h c #333333", "i c #505050", "j c #EBEBEB", "k c #2E2E2E", "l c #7C7C7C", "m c #A0A0A0", "n c #A1A1A1", "o c #AAAAAA", "p c #D5D5D5", "q c #C4C4C4", "r c #E7E7E7", "s c #CACACA", "t c #DDDDDD", "u c #D3D3D3", "v c #B1B1B1", "w c #626262", "x c #8B8B8B", "y c #9A9A9A", "z c #323232", "A c #3B3B3B", "B c #B5B5B5", "C c #696969", "D c #111111", "E c #4C4C4C", "F c #CCCCCC", "G c #C0C0C0", "H c #3C3C3C", "I c #B8B8B8", "J c #767676", "K c #656565", "L c #272727", "M c #717171", "N c #262626", "O c #2C2C2C", "P c #858585", "Q c #E0E0E0", "R c #535353", "S c #B0B0B0", "T c #DADADA", "U c #555555", "V c #DFDFDF", "W c #1C1C1C", "X c #9C9C9C", "Y c #959595", "Z c #1D1D1D", "` c #D7D7D7", " . c #9E9E9E", ".. c #3D3D3D", "+. c #CFCFCF", "@. c #434343", "#. c #AEAEAE", "$. c #DCDCDC", "%. c #585858", "&. c #9B9B9B", "*. c #989898", "=. c #BBBBBB", "-. c #252525", ";. c #797979", ">. c #909090", ",. c #101010", "'. c #737373", "). c #343434", "!. c #8F8F8F", "~. c #B2B2B2", "{. c #282828", "]. c #0A0A0A", "^. c #040404", "/. c #676767", "(. c #BDBDBD", "_. c #A2A2A2", ":. c #464646", "<. c #A3A3A3", "[. c #727272", "}. c #303030", "|. c #0F0F0F", "1. c #828282", "2. c #020202", "3. c #B4B4B4", "4. c #AFAFAF", "5. c #787878", "6. c #7D7D7D", "7. c #C2C2C2", "8. c #4D4D4D", "9. c #080808", "0. c #5A5A5A", "a. c #C9C9C9", "b. c #5C5C5C", "c. c #7E7E7E", "d. c #414141", "e. c #666666", "f. c #010101", "g. c #353535", "h. c #575757", "i. c #969696", "j. c #949494", "k. c #C7C7C7", "l. c #212121", "m. c #515151", "n. c #A9A9A9", "o. c #BFBFBF", "p. c #D0D0D0", "q. c #9D9D9D", "r. c #5E5E5E", "s. c #CBCBCB", "t. c #131313", "u. c #ABABAB", "v. c #E8E8E8", "w. c #1B1B1B", "x. c #747474", "y. c #C1C1C1", "z. c #4F4F4F", "A. c #D6D6D6", "B. c #E1E1E1", "C. c #474747", "D. c #888888", "E. c #0B0B0B", "F. c #939393", "G. c #CECECE", "H. c #BABABA", "I. c #3F3F3F", "J. c #E6E6E6", "K. c #757575", "L. c #ACACAC", "M. c #5B5B5B", "N. c #2F2F2F", "O. c #4E4E4E", " ", " . + @ # # # $ % & ", " + * = - ; > , ' ) ", " ! ~ { ] ^ / ( _ / ", " : < [ ", " } | , 1 ", " 2 3 4 5 ", " 6 7 # 8 ", " 9 ] # # 0 ", " a b # # 9 ", " c { # d / ", " ! e # # ] f ", " g h # # i j ", " ^ k # # l ", " m , # # n ", " 6 # # # o p q q 1 r s t ", " u v w # # # x v v v y z # # A B ) C D E F ", " G [ # # # # # # # # # # # # # # H u . e # # # + ", " I J K L # # D w J M # $ N O # # # P Q R # # < S ", " T U # # ] V > W X Y Z # # - ` .# # ..F ", " +.@.# # U / #.#. $.%.# # # &. *.# # l ", " =.-.# # ;. >.,.# # @. j '.# ).G ", " B W # # !. ~.{.# # ].. F > # M ", " ~ ^.# # !. /.# # # (. _.# :.p ", " <.# # # S [.# # # w 2 }.|.1. ", " 1.# # 2.3. 4.{.# # | 5.* ' ", " 6.# # d 7. r 8.# # # 0 9.b q ", " Q 0.# # k a. b.# # # N k c. ", " p d.# # U $. e.^.# # f.k & ", " +.g.# # h.t i.= # # 9.j. ", " k.l.# # c. g | # # m. n. ", " o.|.# # !. +.z # ] p. n. ", " I # # # q. P r.s. ", " _ # # t.u. v.Q ", " j.# # w.v ", " x.# # z y. ", " 2 8.# # z.A. ", " B.C.# # D. ", " A.d # E.F. ", " G.# # ] p ", " + # E.x. ", " j h $ C.s. ", " H.# - o ", " a.I.7 !. ", " f G G J. r K...b L. ", " ) M.N.N.@ O.@ { K k. ", " j C 9.# # # # 0.I J. ", " / 1 1 1 1 1 f "};