update

knodlseder
1 parent 303e2207
Showing 10 changed files with 44 additions and 142 deletions
pyext/GFits.i
pyext/GFitsData.i
pyext/GFitsDblImage.i
pyext/GFitsHDU.i
pyext/GFitsHeader.i
pyext/GFitsHeaderCard.i
pyext/GFitsImage.i
pyext/GFitsImageDbl.i
pyext/GFitsTable.i
pyext/GFitsTableCol.i
 /***************************************************************************
  *                 GFits.i  - FITS file access class SWIG file             *
  * ----------------------------------------------------------------------- *
- *  copyright            : (C) 2008 by Jurgen Knodlseder                   *
+ *  copyright : (C) 2008-2010 by Jurgen Knodlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -34,10 +34,10 @@
 class GFits {
 public:
     // Constructors and destructors
-    GFits();
+    GFits(void);
     GFits(const std::string& filename);
     GFits(const GFits& fits);
-    ~GFits();
+    virtual ~GFits(void);
     // Methods
     void      clear(void);
 /***************************************************************************
  * GFitsData.hpp  - FITS data handling abstract base class SWIG interface  *
  * ----------------------------------------------------------------------- *
- *  copyright            : (C) 2008 by Jurgen Knodlseder                   *
+ *  copyright : (C) 2008-2010 by Jurgen Knodlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
-/***************************************************************************
- *  GFitsDblImage.hpp  - FITS double precision image class SWIG interface  *
- * ----------------------------------------------------------------------- *
- *  copyright            : (C) 2008 by Jurgen Knodlseder                   *
- * ----------------------------------------------------------------------- *
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-/**
- * @file GFitsDblImage.i
- * @brief GFitsDblImage class SWIG file.
- * @author J. Knodlseder
- */
-%{
-/* Put headers and other declarations here that are needed for compilation */
-#include "GFitsDblImage.hpp"
-%}
-%feature("notabstract") GFitsDblImage;
-
-/***********************************************************************//**
- * @class GFitsDblImage
- *
- * @brief Implements FITS double precision image SWIG interface
- ***************************************************************************/
-class GFitsDblImage : public GFitsImage {
-
-public:
-    // Constructors and destructors
-    GFitsDblImage();
-    GFitsDblImage(const GFitsDblImage& image);
-    ~GFitsDblImage();
-
-    // Methods
-    void link(double* pixels);
-    void set_nullval(const double* value);
-};
-
-
-/***********************************************************************//**
- * @brief GFitsDblImage class extension
- ***************************************************************************/
-%extend GFitsDblImage {
-    char *__str__() {
-        static char str_buffer[100001];
-        std::ostringstream buffer;
-        buffer << *self;
-	    std::string str = buffer.str();
-        strncpy(str_buffer, (char*)str.c_str(), 100001);
-	    str_buffer[100000] = '\0';
-	    return str_buffer;
-    }
-    GFitsDblImage(int nx) {
-        int naxis   = 1;
-        int naxes[] = {nx};
-        GFitsDblImage* image = new GFitsDblImage(naxis, naxes);
-        return image;
-    }
-    GFitsDblImage(int nx, int ny) {
-        int naxis   = 2;
-        int naxes[] = {nx, ny};
-        GFitsDblImage* image = new GFitsDblImage(naxis, naxes);
-        return image;
-    }
-    GFitsDblImage(int nx, int ny, int nz) {
-        int naxis   = 3;
-        int naxes[] = {nx, ny, nz};
-        GFitsDblImage* image = new GFitsDblImage(naxis, naxes);
-        return image;
-    }
-    GFitsDblImage(int nx, int ny, int nz, int nt) {
-        int naxis   = 4;
-        int naxes[] = {nx, ny, nz, nt};
-        GFitsDblImage* image = new GFitsDblImage(naxis, naxes);
-        return image;
-    }
-    double get(const int& ix) {
-        return (*self)(ix);
-    }
-    void set(const int& ix, const double& value) {
-        (*self)(ix) = value;
-    }
-    double get(const int& ix, const int& iy) {
-        return (*self)(ix, iy);
-    }
-    void set(const int& ix, const int& iy, const double& value) {
-        (*self)(ix, iy) = value;
-    }
-    double get(const int& ix, const int& iy, const int& iz) {
-        return (*self)(ix, iy, iz);
-    }
-    void set(const int& ix, const int& iy, const int& iz, const double& value) {
-        (*self)(ix, iy, iz) = value;
-    }
-    double get(const int& ix, const int& iy, const int& iz, const int& it) {
-        return (*self)(ix, iy, iz, it);
-    }
-    void set(const int& ix, const int& iy, const int& iz, const int& it,
-             const double& value) {
-        (*self)(ix, iy, iz, it) = value;
-    }
-    GFitsDblImage copy() {
-        return (*self);
-    }
-};
 /***************************************************************************
  *             GFitsHDU.i  - FITS HDU handling class SWIG file             *
  * ----------------------------------------------------------------------- *
- *  copyright            : (C) 2008 by Jurgen Knodlseder                   *
+ *  copyright : (C) 2008-2010 by Jurgen Knodlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -36,23 +36,31 @@
 class GFitsHDU {
 public:
     // Constructors and destructors
-    GFitsHDU();
+    GFitsHDU(void);
     GFitsHDU(const GFitsImage& image);
     GFitsHDU(const GFitsAsciiTable& table);
     GFitsHDU(const GFitsBinTable& table);
     GFitsHDU(const GFitsHDU& hdu);
-    ~GFitsHDU();
+    virtual ~GFitsHDU(void);
     // Methods
-    std::string    extname(void) const;
-    void           extname(const std::string& extname);
-    int            extno(void) const;
-    int            exttype(void) const;
-    GFitsHeader*   header(void) const;
-    GFitsData*     data(void) const;
-    GFitsTableCol* column(const std::string& colname) const;
-    void           primary(void);
-
+    std::string      extname(void) const;
+    void             extname(const std::string& extname);
+    int              extno(void) const;
+    int              exttype(void) const;
+    GFitsHeader*     header(void) const;
+    GFitsData*       data(void) const;
+    GFitsHeaderCard* card(const std::string& keyname) const;
+    GFitsHeaderCard* card(const int& cardno) const;
+    void             card(const std::string& keyname, const std::string& value,
+                          const std::string& comment);
+    void             card(const std::string& keyname, const double& value,
+                          const std::string& comment);
+    void             card(const std::string& keyname, const int& value,
+                          const std::string& comment);
+    GFitsTableCol*   column(const std::string& colname) const;
+    GFitsTableCol*   column(const int& colnum) const;
+    void             primary(void);
 };
 /***************************************************************************
  *           GFitsHeader.i  - FITS header handling class SWIG file         *
  * ----------------------------------------------------------------------- *
- *  copyright            : (C) 2008 by Jurgen Knodlseder                   *
+ *  copyright : (C) 2008-2010 by Jurgen Knodlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -37,11 +37,13 @@
 class GFitsHeader {
 public:
     // Constructors and destructors
-    GFitsHeader();
+    GFitsHeader(void);
     GFitsHeader(const GFitsHeader& header);
-    ~GFitsHeader();
+    virtual ~GFitsHeader(void);
     // Methods
+    void             clear(void);
+    int              size(void) const;
     void             update(const GFitsHeaderCard& card);
     GFitsHeaderCard* card(const std::string& keyname);
     GFitsHeaderCard* card(const int& cardno);
 /***************************************************************************
  *         GFitsHeaderCard.hpp  - FITS header card class SWIG file         *
  * ----------------------------------------------------------------------- *
- *  copyright            : (C) 2008 by Jurgen Knodlseder                   *
+ *  copyright : (C) 2008-2010 by Jurgen Knodlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -35,7 +35,7 @@
 class GFitsHeaderCard {
 public:
     // Constructors & Destructors
-    GFitsHeaderCard();
+    GFitsHeaderCard(void);
     GFitsHeaderCard(const std::string& keyname, const std::string& value,
                     const std::string& comment);
     GFitsHeaderCard(const std::string& keyname, const double& value,
@@ -43,7 +43,7 @@ public:
     GFitsHeaderCard(const std::string& keyname, const int& value,
                     const std::string& comment);
     GFitsHeaderCard(const GFitsHeaderCard& card);
-    ~GFitsHeaderCard();
+    virtual ~GFitsHeaderCard(void);
     // Methods to set card properties
     void         keyname(const std::string& keyname);
 /***************************************************************************
  *      GFitsImage.i  - FITS image abstract base class SWIG interface      *
  * ----------------------------------------------------------------------- *
- *  copyright            : (C) 2008 by Jurgen Knodlseder                   *
+ *  copyright : (C) 2008-2010 by Jurgen Knodlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
 /***************************************************************************
  *  GFitsImageDbl.hpp  - FITS double precision image class SWIG interface  *
  * ----------------------------------------------------------------------- *
- *  copyright            : (C) 2008 by Jurgen Knodlseder                   *
+ *  copyright : (C) 2008-2010 by Jurgen Knodlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -30,9 +30,9 @@ class GFitsImageDbl : public GFitsImage {
 public:
     // Constructors and destructors
-    GFitsImageDbl();
+    GFitsImageDbl(void);
     GFitsImageDbl(const GFitsImageDbl& image);
-    ~GFitsImageDbl();
+    virtual ~GFitsImageDbl(void);
     // Methods
     void    link(double* pixels);
 /***************************************************************************
  *     GFitsTable.i  - FITS table abstract base class SWIG interface       *
  * ----------------------------------------------------------------------- *
- *  copyright            : (C) 2008 by Jurgen Knodlseder                   *
+ *  copyright : (C) 2008-2010 by Jurgen Knodlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -29,16 +29,16 @@
 class GFitsTable : public GFitsData {
 public:
     // Constructors and destructors
-    GFitsTable();
+    GFitsTable(void);
     GFitsTable(int nrows);
     GFitsTable(const GFitsTable& table);
-    virtual ~GFitsTable();
+    virtual ~GFitsTable(void);
     // Methods
     void           append_column(GFitsTableCol& column);
     void           insert_column(int colnum, GFitsTableCol& column);
-    //void           append_rows(const int& nrows);
-    //void           insert_rows(const int& rownum, const int& nrows);
+    void           append_rows(const int& nrows);
+    void           insert_rows(const int& rownum, const int& nrows);
     GFitsTableCol* column(const std::string& colname);
     GFitsTableCol* column(const int& colnum);
     int            nrows(void) const;
 /***************************************************************************
  *    GFitsTableCol.i  - FITS table column abstract base class SWIG file   *
  * ----------------------------------------------------------------------- *
- *  copyright            : (C) 2008 by Jurgen Knodlseder                   *
+ *  copyright : (C) 2008-2010 by Jurgen Knodlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -29,11 +29,11 @@
 class GFitsTableCol {
 public:
     // Constructors and destructors
-    GFitsTableCol();
+    GFitsTableCol(void);
     GFitsTableCol(const std::string& name, const int& length,
                   const int& number,       const int& width);
     GFitsTableCol(const GFitsTableCol& column);
-    virtual ~GFitsTableCol();
+    virtual ~GFitsTableCol(void);
     // Virtual Methods
     virtual std::string string(const int& row, const int& inx = 0) = 0;