diff options
Diffstat (limited to 'tksao/frame')
-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 |
4 files changed, 11 insertions, 37 deletions
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 *** |