Changeset 701 in Sophya for trunk/SophyaLib/Samba/scan.cc

Timestamp:

Jan 4, 2000, 3:27:29 PM (26 years ago)

Author:

ansari

Message:

mise a jour de persistances par objets delegues

File:

• trunk/SophyaLib/Samba/scan.cc (modified) (5 diffs)

trunk/SophyaLib/Samba/scan.cc

@@ -92 +92 @@
 
 //++
-Scan::Scan(const Scan& s)
+Scan::Scan(const Scan& s,  bool share) :  sPix_(s.sPix_ , share)
 
 //    copy  constructor
@@ -106 +106 @@
   TempsInitial_ = s.TempsInitial_;
   PhiZero_      = s.PhiZero_;
-  sPix_=s.sPix_;
   for (int k=0; k<9; k++) Rota_[k]=s. Rota_[k];
 }
@@ -257 +256 @@
 void Scan::InitNull() {
   //  sPix_=NULL;
-  sPix_.Reset();
+  //  sPix_.Reset(); pas de reset (pour le cas de share)
   mInfo_=NULL;
 }         
@@ -389 +388 @@
   dobj->SetFloatParams(Ouverture,OmegaTeta,OmegaPhi,OmegaRad,
                        FrequenceEch,TempsFinal,TempsInitial,PhiZero,Rota);
-  r_8* sPix=new r_8[NmaxPts];
-  PIOSReadArray(is, sPix, NmaxPts);
-  dobj->setDataBlock(sPix, NmaxPts);
-  delete [] sPix;
+// On lit le DataBlock;
+  FIO_NDataBlock<r_8> fio_nd(&dobj->DataBlock());
+  fio_nd.Read(is);
 }
 //++
@@ -438 +436 @@
   os.PutR8s(Rota, 9);
 
-  PIOSWriteArray(os,(dobj->getDataBlock())->Data(), dobj->NbPoints());
-
-}
+// On ecrit le dataBlock 
+  FIO_NDataBlock<r_8> fio_nd(&dobj->DataBlock());
+  fio_nd.Write(os);
+
+}