Changeset 1136 in Sophya for trunk/SophyaExt/FitsIOServer/fitsbntbllinereader.cc

Timestamp:

Aug 24, 2000, 12:18:02 PM (25 years ago)

Author:

ansari

Message:

structuration a la ppersist+ convention sur hdu

File:

• trunk/SophyaExt/FitsIOServer/fitsbntbllinereader.cc (modified) (11 diffs)

trunk/SophyaExt/FitsIOServer/fitsbntbllinereader.cc

@@ -20 +20 @@
 
   //  FitsFile* fn=ReadFInit(inputfile,hdunum);
-  ReadFInit(inputfile,hdunum);
-
+  //  ReadFInit(inputfile,hdunum);
+  inFits_  = new FitsInFile (inputfile);
+  inFits_->ReadFInit(hdunum);
 
   //  if (!fn->IsFitsTable())
-  if (!IsFitsTable())
+  if (!inFits_->IsFitsTable())
     {
       throw PException("FITS_BntblLineReader: the fits file seems not to be a bintable nor ASCII table");
@@ -32 +33 @@
   int nbcols, nbentries;
   //  nbcols = fn->NbColsFromFits();
-  nbcols = NbColsFromFits();
+  nbcols = inFits_->NbColsFromFits();
   nbentries = 0;
   int k;
   //  for (k=0; k<nbcols; k++) nbentries=max( nbentries, fn->NentriesFromFits(k) );
-  for (k=0; k<nbcols; k++) nbentries=max( nbentries, NentriesFromFits(k) );
+  for (k=0; k<nbcols; k++) nbentries=max( nbentries, inFits_->NentriesFromFits(k) );
 
   //
@@ -53 +54 @@
     {
       //      char ss= fn->ColTypeFromFits(k);
-      char ss= ColTypeFromFits(k);
+      char ss= inFits_->ColTypeFromFits(k);
       if (ss == 'D') DfitsCol.push_back(k);
       else if (ss == 'E') FfitsCol.push_back(k);
@@ -69 +70 @@
       ColName_[compt] = new char[LONNOM+1]; 
       //      strncpy(ColName_[compt], fn->ColNameFromFits(DfitsCol[k]).c_str(), LONNOM);
-      strncpy(ColName_[compt], ColNameFromFits(DfitsCol[k]).c_str(), LONNOM);
+      strncpy(ColName_[compt], inFits_->ColNameFromFits(DfitsCol[k]).c_str(), LONNOM);
       ColName_[compt++][ LONNOM] =  '\0';
     }
@@ -76 +77 @@
       ColName_[compt] = new char[LONNOM+1]; 
       //      strncpy(ColName_[compt], fn->ColNameFromFits(FfitsCol[k]).c_str(), LONNOM);
-      strncpy(ColName_[compt], ColNameFromFits(FfitsCol[k]).c_str(), LONNOM);
+      strncpy(ColName_[compt], inFits_->ColNameFromFits(FfitsCol[k]).c_str(), LONNOM);
       ColName_[compt++][ LONNOM] =  '\0';
     }
@@ -83 +84 @@
       ColName_[compt] = new char[LONNOM+1]; 
       //      strncpy(ColName_[compt], fn->ColNameFromFits(IfitsCol[k]).c_str(), LONNOM);
-      strncpy(ColName_[compt], ColNameFromFits(IfitsCol[k]).c_str(), LONNOM);
+      strncpy(ColName_[compt], inFits_->ColNameFromFits(IfitsCol[k]).c_str(), LONNOM);
       ColName_[compt++][ LONNOM] =  '\0';
     }
@@ -90 +91 @@
       ColName_[compt] = new char[LONNOM+1]; 
       //      strncpy(ColName_[compt], fn->ColNameFromFits(SfitsCol[k]).c_str(), LONNOM);
-      strncpy(ColName_[compt], ColNameFromFits(SfitsCol[k]).c_str(), LONNOM);
+      strncpy(ColName_[compt], inFits_->ColNameFromFits(SfitsCol[k]).c_str(), LONNOM);
       ColName_[compt++][LONNOM] =  '\0';
     }
@@ -115 +116 @@
       taille_des_chaines_ = 0;
       //      for (k=0; k< ccount_; k++)  taille_des_chaines_ = max( taille_des_chaines_, fn->ColStringLengthFromFits(SfitsCol[k]) );
-      for (k=0; k< ccount_; k++)  taille_des_chaines_ = max( taille_des_chaines_, ColStringLengthFromFits(SfitsCol[k]) );
+      for (k=0; k< ccount_; k++)  taille_des_chaines_ = max( taille_des_chaines_, inFits_->ColStringLengthFromFits(SfitsCol[k]) );
       for (k=0; k<ccount_; k++) cdata_[k]=new char[taille_des_chaines_+1];
     }
@@ -123 +124 @@
 FITS_BntblLineReader::~FITS_BntblLineReader()
 {
+  if (inFits_ != NULL) delete inFits_;
   if (ddata_ != NULL) delete [] ddata_;
   if (fdata_ != NULL) delete [] fdata_;
@@ -147 +149 @@
 XNTuple FITS_BntblLineReader::ReadNextLine()
 {
-  GetBinTabLine(nextLineToBeRead_++, ddata_, fdata_, idata_, cdata_ );
+  inFits_->GetBinTabLine(nextLineToBeRead_++, ddata_, fdata_, idata_, cdata_ );
   XNTuple xnt(dcount_, fcount_, icount_,ccount_, ColName_); 
   xnt.Fill(ddata_, fdata_, idata_, cdata_);    
@@ -153 +155 @@
 }
 
-void  FITS_BntblLineReader::ReadFromFits()
+void  FITS_BntblLineReader::ReadFromFits(FitsInFile&)
 {   
 }
 
-void FITS_BntblLineReader::WriteToFits()
+void FITS_BntblLineReader::WriteToFits(FitsOutFile&)
 {
 }