diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2018-10-25 19:54:34 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2018-10-25 19:54:34 (GMT) |
commit | 75bf3fdeb5a9800a29eacca28b7ab4eec8afe6c4 (patch) | |
tree | cb31fc91e8d0bd18b20bd1c0542f69c9f7cc53c6 | |
parent | 6ef82e9a53d814b4c9d136ee689ff3b73156ea58 (diff) | |
download | blt-75bf3fdeb5a9800a29eacca28b7ab4eec8afe6c4.zip blt-75bf3fdeb5a9800a29eacca28b7ab4eec8afe6c4.tar.gz blt-75bf3fdeb5a9800a29eacca28b7ab4eec8afe6c4.tar.bz2 |
new mask
-rwxr-xr-x | tksao/configure | 4 | ||||
-rw-r--r-- | tksao/configure.ac | 4 | ||||
-rw-r--r-- | tksao/frame/base.h | 18 | ||||
-rw-r--r-- | tksao/frame/baseload.C (renamed from tksao/frame/frload.C) | 13 | ||||
-rw-r--r-- | tksao/frame/frame.h | 2 | ||||
-rw-r--r-- | tksao/frame/frameload.C | 15 |
6 files changed, 15 insertions, 41 deletions
diff --git a/tksao/configure b/tksao/configure index 74ee0c1..ee6c875 100755 --- a/tksao/configure +++ b/tksao/configure @@ -5720,6 +5720,7 @@ frame/basebox.C frame/basecommand.C frame/baseellipse.C frame/baseline.C +frame/baseload.C frame/basemarker.C frame/basepolygon.C frame/box.C @@ -5762,13 +5763,13 @@ frame/fitsnrrd.C frame/fr3dcommand.C frame/fr3dmap.C frame/frame.C -frame/frameload.C frame/frame3d.C frame/frame3dbase.C frame/frame3dtruecolor16.C frame/frame3dtruecolor24.C frame/frame3dtruecolor8.C frame/framebase.C +frame/frameload.C frame/framergb.C frame/framergbtruecolor16.C frame/framergbtruecolor24.C @@ -5778,7 +5779,6 @@ frame/frametruecolor24.C frame/frametruecolor8.C frame/frblt.C frame/frcommand.C -frame/frload.C frame/frmap.C frame/frmarker.C frame/frmarkerxml.C diff --git a/tksao/configure.ac b/tksao/configure.ac index 2e565e0..73b58a2 100644 --- a/tksao/configure.ac +++ b/tksao/configure.ac @@ -149,6 +149,7 @@ frame/basebox.C frame/basecommand.C frame/baseellipse.C frame/baseline.C +frame/baseload.C frame/basemarker.C frame/basepolygon.C frame/box.C @@ -191,13 +192,13 @@ frame/fitsnrrd.C frame/fr3dcommand.C frame/fr3dmap.C frame/frame.C -frame/frameload.C frame/frame3d.C frame/frame3dbase.C frame/frame3dtruecolor16.C frame/frame3dtruecolor24.C frame/frame3dtruecolor8.C frame/framebase.C +frame/frameload.C frame/framergb.C frame/framergbtruecolor16.C frame/framergbtruecolor24.C @@ -207,7 +208,6 @@ frame/frametruecolor24.C frame/frametruecolor8.C frame/frblt.C frame/frcommand.C -frame/frload.C frame/frmap.C frame/frmarker.C frame/frmarkerxml.C diff --git a/tksao/frame/base.h b/tksao/frame/base.h index 17f9cea..e56b8dd 100644 --- a/tksao/frame/base.h +++ b/tksao/frame/base.h @@ -794,15 +794,15 @@ public: virtual void loadFitsSocketGZCmd(int, const char*, LayerType); virtual void loadFitsVarCmd(const char*, const char*, LayerType); - void loadArrAllocCmd(const char*, const char*, LayerType); - void loadArrAllocGZCmd(const char*, const char*, LayerType); - void loadArrChannelCmd(const char*, const char*, LayerType); - void loadArrMMapCmd(const char*, LayerType); - void loadArrMMapIncrCmd(const char*, LayerType); - void loadArrShareCmd(ShmType, int, const char*, LayerType); - void loadArrSocketCmd(int, const char*, LayerType); - void loadArrSocketGZCmd(int, const char*, LayerType); - void loadArrVarCmd(const char*, const char*, LayerType); + virtual void loadArrAllocCmd(const char*, const char*, LayerType); + virtual void loadArrAllocGZCmd(const char*, const char*, LayerType); + virtual void loadArrChannelCmd(const char*, const char*, LayerType); + virtual void loadArrMMapCmd(const char*, LayerType); + virtual void loadArrMMapIncrCmd(const char*, LayerType); + virtual void loadArrShareCmd(ShmType, int, const char*, LayerType); + virtual void loadArrSocketCmd(int, const char*, LayerType); + virtual void loadArrSocketGZCmd(int, const char*, LayerType); + virtual void loadArrVarCmd(const char*, const char*, LayerType); void loadENVISMMapCmd(const char*, const char*); diff --git a/tksao/frame/frload.C b/tksao/frame/baseload.C index 1b6eb88..bf40130 100644 --- a/tksao/frame/frload.C +++ b/tksao/frame/baseload.C @@ -2,19 +2,8 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "base.h" #include "context.h" -#include "fitsimage.h" - -#include "alloc.h" -#include "allocgz.h" -#include "channel.h" -#include "mmap.h" -#include "mmapincr.h" -#include "share.h" -#include "sshare.h" -#include "socket.h" -#include "socketgz.h" -#include "var.h" // *** Fits *** diff --git a/tksao/frame/frame.h b/tksao/frame/frame.h index d212af7..68fdb48 100644 --- a/tksao/frame/frame.h +++ b/tksao/frame/frame.h @@ -5,9 +5,9 @@ #ifndef __frame_h__ #define __frame_h__ +#include "framebase.h" #include "context.h" #include "fitsmask.h" -#include "framebase.h" #include "colorscale.h" // Frame diff --git a/tksao/frame/frameload.C b/tksao/frame/frameload.C index db15456..ff4323b 100644 --- a/tksao/frame/frameload.C +++ b/tksao/frame/frameload.C @@ -2,22 +2,7 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include <tkInt.h> - #include "frame.h" -#include "fitsimage.h" -#include "fitsmask.h" - -#include "alloc.h" -#include "allocgz.h" -#include "channel.h" -#include "mmap.h" -#include "mmapincr.h" -#include "share.h" -#include "sshare.h" -#include "socket.h" -#include "socketgz.h" -#include "var.h" // *** Fits *** |