X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Farray2d.h;h=d397e5f45160ce4824f5245eca3bfed47efe9cad;hp=8d7cf4e3c4f3c577ebef27db3669ba17fb98cbc7;hb=f13a8c004b8f182b42d9e4df2bcd7c7f030bf1ad;hpb=07b93dbf2b66fa23c5378ab0fa42f9a7f0083380

diff --git a/include/array2d.h b/include/array2d.h
index 8d7cf4e..d397e5f 100644
--- a/include/array2d.h
+++ b/include/array2d.h
@@ -1,53 +1,108 @@
+/*****************************************************************************
+** FILE IDENTIFICATION
+**
+**      Name:         array2d.h
+**      Purpose:      2-dimension array classes
+**      Programmer:   Kevin Rosenberg
+**      Date Started: June 2000
+**
+**  This is part of the CTSim program
+**  Copyright (c) 1983-2009 Kevin Rosenberg
+**
+**  This program is free software; you can redistribute it and/or modify
+**  it under the terms of the GNU General Public License (version 2) as
+**  published by the Free Software Foundation.
+**
+**  This program is distributed in the hope that it will be useful,
+**  but WITHOUT ANY WARRANTY; without even the implied warranty of
+**  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**  GNU General Public License for more details.
+**
+**  You should have received a copy of the GNU General Public License
+**  along with this program; if not, write to the Free Software
+**  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+******************************************************************************/
+
 #ifndef ARRAY2D_H
 #define ARRAY2D_H
 
-#include <kstddef.h>
+#include "ctsupport.h"
 
-template<class T> 
-class Array2d {
- private:
-    unsigned int nx;
-    unsigned int ny;
 
+template<class T>
+class Array2d {
  public:
-
-    T** array_data;
-
     Array2d (unsigned int x, unsigned int y)
-	{
-	    nx = x;
-	    ny = y;
-	    array_data = new T*[nx];
-	    
-	    for (int i = 0; i < nx; i++)
-		array_data[i] = new T[ny];
-	}
+        : m_nx(x), m_ny(y), array_data(0)
+        {
+            allocArray();
+        }
 
+    Array2d ()
+        : m_nx(0), m_ny(0), array_data(0)
+        {}
 
     ~Array2d ()
-	{
-	    for (int i = 0; i < nx; i++)
-		delete array_data[i];
-	    delete array_data;
-	}
-    
-    T** getArray (void) const
-	{ return array_data; }
+        {
+            deleteArray();
+        }
+
+    void initSetSize (unsigned int x, unsigned int y)
+        {
+            m_nx = x;
+            m_ny = y;
+            deleteArray();
+            allocArray();
+        }
+
+    T** getArray () const
+        { return array_data; }
 
     T* getColumn (unsigned int x) const
-	{ return array_data[x]; }
+        { return (array_data ? array_data[x] : NULL); }
 
     T getPoint (unsigned int x, unsigned int y) const
-	{ return (array_data[x][y]); }
+        { return (array_data ? array_data[x][y] : NULL); }
+
+    unsigned int sizeofPixel () const
+        {  return sizeof(T); }
+
+    unsigned int sizeofColumn () const
+        { return (sizeof(T) * m_ny); }
+
+    unsigned int sizeofArray () const
+        { return (sizeof(T) * m_nx * m_ny); }
+
+
+ private:
+    unsigned int m_nx;
+    unsigned int m_ny;
+    T** array_data;
+
+    void allocArray ()
+        {
+            if (array_data)
+                deleteArray();
+
+            array_data = new T*[m_nx];
+
+            for (unsigned int i = 0; i < m_nx; i++)
+                array_data[i] = new T[m_ny];
+        }
 
-    unsigned int sizeofPixel (void) const 
-	{  return sizeof(T); }
+    void deleteArray ()
+        {
+            if (array_data) {
+                for (unsigned int i = 0; i < m_nx; i++)
+                    delete array_data [i];
+                delete array_data;
+                array_data = NULL;
+            }
+        }
 
-    unsigned int sizeofColumn (void) const
-	{ return (sizeof(T) * ny); }
 
-    unsigned int sizeofArray (void) const
-	{ return (sizeof(T) * nx * ny); }
+    Array2d& operator= (const Array2d& rhs); //assignment operator
+    Array2d (const Array2d& rhs);  // copy constructor
 };