diff options
Diffstat (limited to 'tksao/frame')
40 files changed, 40 insertions, 40 deletions
diff --git a/tksao/frame/base.C b/tksao/frame/base.C index c6490b2..a1989b0 100644 --- a/tksao/frame/base.C +++ b/tksao/frame/base.C @@ -4,13 +4,13 @@ #include <tkInt.h> +#include "util.h" #include "base.h" #include "context.h" #include "fitsimage.h" #include "marker.h" #include "wcsast.h" #include "ps.h" -#include "util.h" #include "circle.h" #include "ellipse.h" diff --git a/tksao/frame/basebox.C b/tksao/frame/basebox.C index 8678f70..aebb31f 100644 --- a/tksao/frame/basebox.C +++ b/tksao/frame/basebox.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "basebox.h" #include "fitsimage.h" -#include "util.h" BaseBox::BaseBox(Base* p, const Vector& ctr, double ang) : BaseMarker(p, ctr, ang) diff --git a/tksao/frame/basecommand.C b/tksao/frame/basecommand.C index 2514d89..c87c075 100644 --- a/tksao/frame/basecommand.C +++ b/tksao/frame/basecommand.C @@ -5,6 +5,7 @@ #include <fstream> #include "fdstream.hpp" +#include "util.h" #include "base.h" #include "context.h" #include "fitsimage.h" @@ -12,7 +13,6 @@ #include "outfile.h" #include "outchannel.h" #include "outsocket.h" -#include "util.h" #include "sigbus.h" diff --git a/tksao/frame/baseellipse.C b/tksao/frame/baseellipse.C index 842d95a..f63a270 100644 --- a/tksao/frame/baseellipse.C +++ b/tksao/frame/baseellipse.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "baseellipse.h" #include "fitsimage.h" -#include "util.h" #define XPOINT_BLOCK 1024 diff --git a/tksao/frame/basemarker.h b/tksao/frame/basemarker.h index e1a98bf..03ca0e0 100644 --- a/tksao/frame/basemarker.h +++ b/tksao/frame/basemarker.h @@ -5,8 +5,8 @@ #ifndef __basemarker_h__ #define __basemarker_h__ -#include "marker.h" #include "util.h" +#include "marker.h" #define MAXANNULI 512 #define MAXANGLES 720 diff --git a/tksao/frame/colorscaletrue16.C b/tksao/frame/colorscaletrue16.C index 9cb3992..b9e3d3a 100644 --- a/tksao/frame/colorscaletrue16.C +++ b/tksao/frame/colorscaletrue16.C @@ -2,8 +2,8 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include "colorscaletrue16.h" #include "util.h" +#include "colorscaletrue16.h" ColorScaleTrueColor16::ColorScaleTrueColor16(int s, Visual* visual, int msb) : ColorScale(s), TrueColor16(visual) diff --git a/tksao/frame/colorscaletrue24.C b/tksao/frame/colorscaletrue24.C index 6c200ca..57587a9 100644 --- a/tksao/frame/colorscaletrue24.C +++ b/tksao/frame/colorscaletrue24.C @@ -2,8 +2,8 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include "colorscaletrue24.h" #include "util.h" +#include "colorscaletrue24.h" ColorScaleTrueColor24::ColorScaleTrueColor24(int s, Visual* visual, int msb) : ColorScale(s), TrueColor24(visual) diff --git a/tksao/frame/colorscaletrue32.C b/tksao/frame/colorscaletrue32.C index 8566aa9..e40c1b0 100644 --- a/tksao/frame/colorscaletrue32.C +++ b/tksao/frame/colorscaletrue32.C @@ -2,8 +2,8 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include "colorscaletrue32.h" #include "util.h" +#include "colorscaletrue32.h" ColorScaleTrueColor32::ColorScaleTrueColor32(int s, Visual* visual, int msb) : ColorScale(s), TrueColor24(visual) diff --git a/tksao/frame/compass.C b/tksao/frame/compass.C index 31be7bf..077dded 100644 --- a/tksao/frame/compass.C +++ b/tksao/frame/compass.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "compass.h" #include "fitsimage.h" -#include "util.h" Compass::Compass(const Compass& a) : Marker(a) { diff --git a/tksao/frame/context.C b/tksao/frame/context.C index 288e06c..8fe0767 100644 --- a/tksao/frame/context.C +++ b/tksao/frame/context.C @@ -2,11 +2,11 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "context.h" #include "fitsimage.h" #include "fvcontour.h" #include "convolve.h" -#include "util.h" #include "alloc.h" #include "allocgz.h" diff --git a/tksao/frame/contour.C b/tksao/frame/contour.C index 445236c..eb2612c 100644 --- a/tksao/frame/contour.C +++ b/tksao/frame/contour.C @@ -2,10 +2,10 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "contour.h" #include "base.h" #include "context.h" -#include "util.h" // ContourLevel ContourLevel::ContourLevel(Base* pp, double lev, diff --git a/tksao/frame/contourparser.C b/tksao/frame/contourparser.C index 40f5e73..cbd8931 100644 --- a/tksao/frame/contourparser.C +++ b/tksao/frame/contourparser.C @@ -225,11 +225,11 @@ #include <string.h> #include <iostream> +#include "util.h" #include "base.h" #include "context.h" #include "fitsimage.h" #include "contour.h" -#include "util.h" #undef yyFlexLexer #define yyFlexLexer ctFlexLexer diff --git a/tksao/frame/coord.C b/tksao/frame/coord.C index c01858b..be9c50c 100644 --- a/tksao/frame/coord.C +++ b/tksao/frame/coord.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "coord.h" #include "fitsimage.h" -#include "util.h" Coord coord; diff --git a/tksao/frame/fitsanalysis.C b/tksao/frame/fitsanalysis.C index db489cc..03a1230 100644 --- a/tksao/frame/fitsanalysis.C +++ b/tksao/frame/fitsanalysis.C @@ -4,11 +4,11 @@ #include <pthread.h> +#include "util.h" #include "analysis.h" #include "fitsimage.h" #include "context.h" #include "convolve.h" -#include "util.h" void FitsImage::analysis(int which, pthread_t* thread, void* targ) { diff --git a/tksao/frame/fitsbin.C b/tksao/frame/fitsbin.C index ca14267..2719b20 100644 --- a/tksao/frame/fitsbin.C +++ b/tksao/frame/fitsbin.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "fitsimage.h" #include "context.h" -#include "util.h" Matrix FitsImage::bin(const Vector& vv) { diff --git a/tksao/frame/fitsblock.C b/tksao/frame/fitsblock.C index 2c49281..c9a8efb 100644 --- a/tksao/frame/fitsblock.C +++ b/tksao/frame/fitsblock.C @@ -2,11 +2,11 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "fitsimage.h" #include "block.h" #include "context.h" #include "wcsast.h" -#include "util.h" void* blockproc(void* tt); diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C index 96e2043..e46c90b 100644 --- a/tksao/frame/fitsimage.C +++ b/tksao/frame/fitsimage.C @@ -4,9 +4,9 @@ #include <pthread.h> +#include "util.h" #include "fitsimage.h" #include "framebase.h" -#include "util.h" #include "context.h" #include "mmap.h" diff --git a/tksao/frame/fitsmap.C b/tksao/frame/fitsmap.C index 4631bab..9f320ab 100644 --- a/tksao/frame/fitsmap.C +++ b/tksao/frame/fitsmap.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "fitsimage.h" #include "context.h" -#include "util.h" // Map Point diff --git a/tksao/frame/fitsmask.C b/tksao/frame/fitsmask.C index ea8da13..47abc6e 100644 --- a/tksao/frame/fitsmask.C +++ b/tksao/frame/fitsmask.C @@ -2,10 +2,10 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "fitsmask.h" #include "base.h" #include "context.h" -#include "util.h" FitsMask::FitsMask(Base* pp, char* clr, MaskType mm, double ll, double hh) : mark_(mm), low_(ll), high_(hh) diff --git a/tksao/frame/fr3dcommand.C b/tksao/frame/fr3dcommand.C index 23ff192..9d2233c 100644 --- a/tksao/frame/fr3dcommand.C +++ b/tksao/frame/fr3dcommand.C @@ -2,11 +2,11 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "frame3dbase.h" #include "fitsimage.h" #include "context.h" #include "marker.h" -#include "util.h" void Frame3dBase::binToFitCmd() { diff --git a/tksao/frame/frame.C b/tksao/frame/frame.C index 3e5411a..530eb78 100644 --- a/tksao/frame/frame.C +++ b/tksao/frame/frame.C @@ -4,11 +4,11 @@ #include <tkInt.h> +#include "util.h" #include "frame.h" #include "fitsimage.h" #include "analysis.h" #include "ps.h" -#include "util.h" #include "sigbus.h" diff --git a/tksao/frame/frame3d.C b/tksao/frame/frame3d.C index 06c7457..581659c 100644 --- a/tksao/frame/frame3d.C +++ b/tksao/frame/frame3d.C @@ -2,10 +2,10 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "frame3d.h" #include "fitsimage.h" #include "ps.h" -#include "util.h" #include "sigbus.h" #include <pthread.h> diff --git a/tksao/frame/frame3dbase.C b/tksao/frame/frame3dbase.C index c1f612e..d4eacbb 100644 --- a/tksao/frame/frame3dbase.C +++ b/tksao/frame/frame3dbase.C @@ -4,12 +4,12 @@ #include <tkInt.h> +#include "util.h" #include "frame3dbase.h" #include "fitsimage.h" #include "marker.h" #include "context.h" #include "ps.h" -#include "util.h" #include "sigbus.h" Frame3dBase::Frame3dBase(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item) diff --git a/tksao/frame/framergb.C b/tksao/frame/framergb.C index 0e9501b..ee242a1 100644 --- a/tksao/frame/framergb.C +++ b/tksao/frame/framergb.C @@ -4,13 +4,13 @@ #include <tkInt.h> +#include "util.h" #include "framergb.h" #include "fitsimage.h" #include "outfile.h" #include "outchannel.h" #include "outsocket.h" #include "ps.h" -#include "util.h" #include "sigbus.h" diff --git a/tksao/frame/frmap.C b/tksao/frame/frmap.C index f856603..eb5d23d 100644 --- a/tksao/frame/frmap.C +++ b/tksao/frame/frmap.C @@ -2,10 +2,10 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "context.h" #include "framebase.h" #include "fitsimage.h" -#include "util.h" double Base::mapAngleFromRef(double angle, Coord::CoordSystem sys, Coord::SkyFrame sky) diff --git a/tksao/frame/frmarker.C b/tksao/frame/frmarker.C index bac3ff5..6150960 100644 --- a/tksao/frame/frmarker.C +++ b/tksao/frame/frmarker.C @@ -5,13 +5,13 @@ #include <fstream> #include "fdstream.hpp" +#include "util.h" #include "context.h" #include "base.h" #include "fitsimage.h" #include "fvcontour.h" #include "marker.h" #include "basemarker.h" -#include "util.h" #include "sigbus.h" #include "circle.h" diff --git a/tksao/frame/frmarkerxml.C b/tksao/frame/frmarkerxml.C index b4f17ab..cf52a63 100644 --- a/tksao/frame/frmarkerxml.C +++ b/tksao/frame/frmarkerxml.C @@ -6,10 +6,10 @@ #include "fdstream.hpp" #include <libxml/xmlreader.h> +#include "util.h" #include "context.h" #include "framebase.h" #include "fitsimage.h" -#include "util.h" static int xmlRead (void * context, char * buffer, int len) { diff --git a/tksao/frame/frsave.C b/tksao/frame/frsave.C index 1ca46e3..67278b7 100644 --- a/tksao/frame/frsave.C +++ b/tksao/frame/frsave.C @@ -2,6 +2,7 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "context.h" #include "framebase.h" #include "framergb.h" @@ -9,7 +10,6 @@ #include "outfile.h" #include "outchannel.h" #include "outsocket.h" -#include "util.h" #include "sigbus.h" #include "wcsast.h" diff --git a/tksao/frame/fvcontour.C b/tksao/frame/fvcontour.C index 4402cf1..3d49fd7 100644 --- a/tksao/frame/fvcontour.C +++ b/tksao/frame/fvcontour.C @@ -2,12 +2,12 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "fvcontour.h" #include "context.h" #include "base.h" #include "fitsimage.h" #include "convolve.h" -#include "util.h" #include "sigbus.h" diff --git a/tksao/frame/grid.C b/tksao/frame/grid.C index e18c0c8..6795066 100644 --- a/tksao/frame/grid.C +++ b/tksao/frame/grid.C @@ -2,10 +2,10 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "grid.h" #include "context.h" #include "fitsimage.h" -#include "util.h" extern "C" { #include "ast.h" diff --git a/tksao/frame/line.C b/tksao/frame/line.C index ec7b076..255e2a7 100644 --- a/tksao/frame/line.C +++ b/tksao/frame/line.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" // macos/win #include "line.h" #include "fitsimage.h" -#include "util.h" // macos Line::Line(Base* p, const Vector& ptr1, const Vector& ptr2) : BaseLine(p, ptr1, ptr2) diff --git a/tksao/frame/marker.C b/tksao/frame/marker.C index d4bf50b..b5d2ff8 100644 --- a/tksao/frame/marker.C +++ b/tksao/frame/marker.C @@ -2,11 +2,11 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "marker.h" #include "framebase.h" #include "frame3dbase.h" #include "fitsimage.h" -#include "util.h" extern "C" { #include "tkbltVector.h" diff --git a/tksao/frame/parser.C b/tksao/frame/parser.C index 58bc0f4..bbaf4c9 100644 --- a/tksao/frame/parser.C +++ b/tksao/frame/parser.C @@ -792,12 +792,12 @@ #include <string.h> #include <iostream> +#include "util.h" #include "base.h" #include "frame3d.h" #include "fitsimage.h" #include "fitsmask.h" #include "marker.h" -#include "util.h" #undef yyFlexLexer #define yyFlexLexer frFlexLexer diff --git a/tksao/frame/point.C b/tksao/frame/point.C index 6ba5a42..2132454 100644 --- a/tksao/frame/point.C +++ b/tksao/frame/point.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "point.h" #include "fitsimage.h" -#include "util.h" #define NUMSEG 16 diff --git a/tksao/frame/polygon.C b/tksao/frame/polygon.C index a01208c..6e27006 100644 --- a/tksao/frame/polygon.C +++ b/tksao/frame/polygon.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" // macos,win #include "polygon.h" #include "fitsimage.h" -#include "util.h" // macos Polygon::Polygon(const Polygon& a) : BasePolygon(a) { diff --git a/tksao/frame/projection.C b/tksao/frame/projection.C index 27af7ac..9bfc08b 100644 --- a/tksao/frame/projection.C +++ b/tksao/frame/projection.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" // macos,win #include "projection.h" #include "fitsimage.h" -#include "util.h" // macos Projection::Projection(const Projection& a) : BaseLine(a) { diff --git a/tksao/frame/ruler.C b/tksao/frame/ruler.C index 227fa52..10c7526 100644 --- a/tksao/frame/ruler.C +++ b/tksao/frame/ruler.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "ruler.h" #include "fitsimage.h" -#include "util.h" Ruler::Ruler(const Ruler& a) : BaseLine(a) { diff --git a/tksao/frame/segment.C b/tksao/frame/segment.C index f351c2f..e5edddb 100644 --- a/tksao/frame/segment.C +++ b/tksao/frame/segment.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" // macos,win #include "segment.h" #include "fitsimage.h" -#include "util.h" // macos Segment::Segment(Base* p, const Vector& ctr, const Vector& b) diff --git a/tksao/frame/tag.C b/tksao/frame/tag.C index acdf1d1..121b330 100644 --- a/tksao/frame/tag.C +++ b/tksao/frame/tag.C @@ -2,8 +2,8 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include "tag.h" #include "util.h" +#include "tag.h" Tag::Tag(const Tag& t) { diff --git a/tksao/frame/text.C b/tksao/frame/text.C index ae2a902..23f0fcd 100644 --- a/tksao/frame/text.C +++ b/tksao/frame/text.C @@ -2,9 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "util.h" #include "text.h" #include "fitsimage.h" -#include "util.h" EXTERN void TkDrawAngledChars(Display *display, Drawable drawable, GC gc, Tk_Font tkfont, |