Changeset 1219 in Sophya for trunk/SophyaExt

Timestamp:

Oct 5, 2000, 11:17:43 AM (25 years ago)

Author:

ansari

Message:

dvlist dans ecriture ligne a ligne

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsbntbllineRW.cc (modified) (4 diffs)
• fitsbntbllineRW.h (modified) (4 diffs)

trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.cc

@@ -16 +16 @@
 }
 
-FITS_BntblLineReader::FITS_BntblLineReader(char inputfile[],int hdunum)
+FITS_BntblLineReader::FITS_BntblLineReader(char inputfile[],int hdunum) 
+                                                                 
 {
   InitNull();
@@ -98 +99 @@
 
 
-FITS_BntblLineWriter::FITS_BntblLineWriter()
-{
-  InitNull();
-}
 
-FITS_BntblLineWriter::FITS_BntblLineWriter(char inputfile[],int dc, int fc,int ic, int cc, vector<string> names,  WriteMode wrm)
+FITS_BntblLineWriter::FITS_BntblLineWriter(char inputfile[],int dc, int fc,int ic, int cc, vector<string> names,DVList& dvl,  WriteMode wrm)
 {
   int k;
@@ -132 +129 @@
       StringSizes[k] = names[dc+fc+ic+k].length();
     }            
-  DVList dvl;
   string extname("Lines_on_Binary_tbl"); 
+
   outFits_->makeHeaderBntblOnFits(types, names, 1, nbcols, dvl, extname,StringSizes); 
     ligne_.setFormat(dc, fc, ic, cc, names);
@@ -141 +138 @@
 FITS_BntblLineWriter::~FITS_BntblLineWriter()
 {
+  if (dvl_ != NULL) delete dvl_;
   if (outFits_ != NULL)  delete outFits_;
 }

trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.h

@@ -4 +4 @@
 #ifndef FITSBntblLineRW_SEEN
 #define FITSBntblLineRW_SEEN
+#include "dvlist.h"
 #include "fitsfile.h"
 //#include "xntuple.h"
@@ -58 +59 @@
 {
 
+
 public:
-FITS_BntblLineWriter();
- FITS_BntblLineWriter(char inputfile[],int dc, int fc, int ic, int cc, vector<string> names,  WriteMode wrm = clear);
+ FITS_BntblLineWriter(char inputfile[],int dc, int fc, int ic, int cc, vector<string> names, DVList& dvl, WriteMode wrm = clear);
 ~FITS_BntblLineWriter();
  void WriteNextLine( BnTblLine& WorkLine);
+
+// Renvoie une reference sur l''objet DVList Associe
+DVList& Info()
+  {
+    if (dvl_ == NULL)  dvl_ = new DVList;
+    return(*dvl_);
+  }
 
  private :
@@ -68 +76 @@
 inline void InitNull()
    {
+     dvl_ = NULL;
      outFits_ = NULL;
      nextLineToBeWritten_= 0;
@@ -84 +93 @@
   long nextLineToBeWritten_;
   BnTblLine ligne_;
+  DVList* dvl_;
 };