Changeset 3069 in Sophya for trunk/SophyaExt/FitsIOServer/fitsswapper.h

Timestamp:

Sep 8, 2006, 4:30:31 PM (19 years ago)

Author:

ansari

Message:

Correction plusieurs bugs lies a SwFitsDataTable - Reza 08/09/2006

File:

• trunk/SophyaExt/FitsIOServer/fitsswapper.h (modified) (6 diffs)

trunk/SophyaExt/FitsIOServer/fitsswapper.h

@@ -11 +11 @@
 #include "fitsinoutfile.h"
 #include "fitsblkrw.h"
+
+#include "basedtable.h"
 
 /*!
@@ -25 +27 @@
 public:
   FITSDataSwapper() 
-    : fcol(0) , rowos(1)
+    : fcol(0) , rowos(1) , dtp(NULL)
   {
   }
-  FITSDataSwapper(FitsInOutFile & ios, int col) 
-    : fios(ios) , fcol(col), rowos(1)
+  FITSDataSwapper(FitsInOutFile & ios, int col, BaseDataTable* dt=NULL) 
+    : fios(ios) , fcol(col), rowos(1) , dtp(dt)
   {
   }
 
   inline FitsInOutFile & InOutStream() { return fios; }
+
   void SetInOutStream(FitsInOutFile & ios, int col) 
   {
@@ -53 +56 @@
     fcol = a.fcol;
     rowos = a.rowos;
+    dtp = a.dtp;
   }
 
@@ -60 +64 @@
     long row = rowos;
     if (osw)  row = oswp;
+    if (dtp != NULL)
+       if ((row+sz-1) > dtp->NRows() )  sz = dtp->NRows()-row+1;
     FitsBlockRW<T>::WriteColumnData(fios, fcol, row, 1, d, sz);
     if (!osw) rowos += sz;
@@ -67 +73 @@
   virtual void  ReadFromSwap(int_8 idx, int_8 swp, T* d, size_t sz)
   {
+    long nrows = fios.GetNbRows();
+    size_t szi = sz;
+    if ((swp+sz-1) > nrows) sz = nrows-swp+1;  
     FitsBlockRW<T>::ReadColumnData(fios, fcol, swp, 1, d, sz);
+    if (sz < szi) {
+      T zz = d[sz-1];
+      for(size_t k=sz; k<szi; k++)  d[k] = zz;
+    }
   }
 
   virtual DataSwapperInterface<T>* Clone()
   {
-    FITSDataSwapper<T> * rsw = new FITSDataSwapper<T>(fios, fcol) ;
+    FITSDataSwapper<T> * rsw = new FITSDataSwapper<T>(fios, fcol, dtp) ;
+    rsw->rowos = rowos;
+    rsw->dtp = dtp;    
     return rsw;
   }
@@ -80 +95 @@
   int fcol; 
   long rowos;
+  BaseDataTable* dtp;
 };