Changeset 594 in Sophya for trunk/SophyaPI/PIext/pitvmaad.h

Timestamp:

Nov 17, 1999, 7:49:32 PM (26 years ago)

Author:

ercodmgr

Message:

finalisation interfacage TMatrix, PixelMap - Reza 17/11/99

File:

• trunk/SophyaPI/PIext/pitvmaad.h (modified) (5 diffs)

trunk/SophyaPI/PIext/pitvmaad.h

@@ -8 +8 @@
 
 #include "machdefs.h"
-#include <math.h>
 #include "parradapter.h"
 
@@ -19 +18 @@
 class POTVectorAdapter : public P1DArrayAdapter {
 public :
-                  POTVectorAdapter(TVector<T>* v, bool ad=false) 
-                        : P1DArrayAdapter(v->NElts())
-                                { aDel = ad; mVec = v; }
-  virtual         ~POTVectorAdapter()
-                                { if (aDel) delete mVec; }
-  virtual double  Value(int i)
-                                { return((*mVec)(i)); }
+                  POTVectorAdapter(TVector<T>* v, bool ad=false); 
+  virtual         ~POTVectorAdapter();
+  virtual double  Value(int i);
 
 protected:
@@ -34 +29 @@
 typedef POTVectorAdapter<r_8> POVectorAdapter;
 
-double POTVectorAdapter< complex<float> >::Value(int i)
-{
-double re,im;
-re = (*mVec)(i).real();
-im = (*mVec)(i).imag();
-return(sqrt(re*re+im*im));
-}
-
-double POTVectorAdapter< complex<double> >::Value(int i)
-{
-double re,im;
-re = (*mVec)(i).real();
-im = (*mVec)(i).imag();
-return(sqrt(re*re+im*im));
-}
 
 // Adaptateur de matrice SOPHYA a P2DArrayAdapter
@@ -55 +35 @@
 class POTMatrixAdapter :  public P2DArrayAdapter {
 public :
-                  POTMatrixAdapter(TMatrix<T>* mtx, bool ad=false)
-                        : P2DArrayAdapter(mtx->NCols(), mtx->NRows())
-                        { aDel = ad; mMtx = mtx; }
-  virtual         ~POTMatrixAdapter()
-                        { if (aDel)  delete mMtx; }
-  virtual double  Value(int ix, int iy)
-                        { return((double)(*mMtx)(iy, ix)); }
+                  POTMatrixAdapter(TMatrix<T>* mtx, bool ad=false);
+  virtual         ~POTMatrixAdapter();
+  virtual double  Value(int ix, int iy);
 
 protected:
@@ -70 +46 @@
 typedef POTMatrixAdapter<r_8> POMatrixAdapter;
 
-double POTMatrixAdapter< complex<float> >::Value(int ix, int iy)
-{
-double re,im;
-re = (*mMtx)(iy, ix).real();
-im = (*mMtx)(iy, ix).imag();
-return(sqrt(re*re+im*im));
-}
-
-double POTMatrixAdapter< complex<double> >::Value(int ix, int iy)
-{
-double re,im;
-re = (*mMtx)(iy, ix).real();
-im = (*mMtx)(iy, ix).imag();
-return(sqrt(re*re+im*im));
-}
 #endif