Changeset 1359 in Sophya for trunk/SophyaExt/FitsIOServer/fitsfile.cc

Timestamp:

Dec 19, 2000, 12:27:39 PM (25 years ago)

Author:

lemeur

Message:

extension bntblLineRW aux long et byte

File:

• trunk/SophyaExt/FitsIOServer/fitsfile.cc (modified) (8 diffs)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -8 +8 @@
 
 
-void BnTblLine::setFormat(int dc, int fc, int ic, int cc, vector<string> names)
+void BnTblLine::setFormat(int dc, int fc, int ic,  int lc, int bc,int cc, vector<string> names)
    {
-    int nbcols = dc + fc + ic + cc;
+    int nbcols = dc + fc + ic + cc + lc + bc;
     int maxName = names.size();
     if (nbcols != maxName)
@@ -23 +23 @@
     if (ic >0) idata_ = vector<int>(fc);
     if (cc >0) cdata_ = vector<string>(fc);
+    if (lc >0) ldata_ = vector<long>(lc);
+    if (bc >0) bdata_ = vector<unsigned char>(bc);
    }
 
 bool BnTblLine::sameFormat(const BnTblLine& btl) const
    {
-     if (btl.ddata_.size() == ddata_.size() && btl.fdata_.size() == fdata_.size() && btl.idata_.size() == idata_.size() && btl.cdata_.size() == cdata_.size()) return true;
+     if (btl.ddata_.size() == ddata_.size() && btl.fdata_.size() == fdata_.size() && btl.idata_.size() == idata_.size() && btl.cdata_.size() == cdata_.size() &&  btl.ldata_.size() == ldata_.size() &&  btl.bdata_.size() == bdata_.size()) return true;
      else return false;
    }
@@ -49 +51 @@
      cout << " *** variables string  " << endl;
      for (k=0; k < cdata_.size(); k++) cout << cdata_[k] << " ";
+     cout << endl;
+     cout << " *** variables long  " << endl;
+     for (k=0; k < ldata_.size(); k++) cout << ldata_[k] << " ";
+     cout << endl;
+     cout << " *** variables byte  " << endl;
+     for (k=0; k < bdata_.size(); k++) cout << (int)bdata_[k] << " ";
      cout << endl;
      cout << " ***************************** " << endl;
@@ -721 +729 @@
           break;
         case FitsDataType_int :
-          fits_read_col(fptr_,TINT,ncol+1,NoLine+1,1,1,&inull,&ligne.idata_[icount++],
-                        &anull,&status);
+          fits_read_col(fptr_,TINT,ncol+1,NoLine+1,1,1,&inull,&ligne.idata_[icount++], &anull,&status);
+          break;
+        case FitsDataType_long :
+          fits_read_col(fptr_,TLONG,ncol+1,NoLine+1,1,1,&inull,&ligne.ldata_[icount++], &anull,&status);
+          break;
+        case FitsDataType_byte :
+          fits_read_col(fptr_,TBYTE,ncol+1,NoLine+1,1,1,&inull,&ligne.bdata_[icount++], &anull,&status);
           break;
         case FitsDataType_char :
@@ -1074 +1087 @@
               break;
             case TLONG :
-              types.push_back(FitsDataType_int);
+              types.push_back(FitsDataType_long);
               break;
             case TSHORT :
@@ -1111 +1124 @@
               break;
             case TLONG :
-              types.push_back(FitsDataType_int);
+              types.push_back(FitsDataType_long);
               break;
             case TINT :
@@ -1125 +1138 @@
               break;
             case TBYTE :
-              types.push_back(FitsDataType_char);
-              taille_des_chaines.push_back(width);
-              rept/=width;
+              types.push_back(FitsDataType_byte);
               break;
             default :
@@ -1694 +1705 @@
       fits_write_col(fptr_,TINT,ncol+1,NoLine+1,1,1, &ligne.idata_[k] ,&status);
       if( status ) printerror( status, "PutBinTabLine : erreur ecriture entier"  );
+    }
+  for (k=0; k<ligne.ldata_.size(); k++, ncol++)
+    {
+      fits_write_col(fptr_,TLONG,ncol+1,NoLine+1,1,1, &ligne.ldata_[k] ,&status);
+      if( status ) printerror( status, "PutBinTabLine : erreur ecriture entier long"  );
+    }
+  for (k=0; k<ligne.bdata_.size(); k++, ncol++)
+    {
+      fits_write_col(fptr_,TBYTE,ncol+1,NoLine+1,1,1, &ligne.bdata_[k] ,&status);
+      if( status ) printerror( status, "PutBinTabLine : erreur ecriture byte"  );
     }