Changeset 701 in Sophya for trunk/SophyaLib/Samba/spheregorski.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/spheregorski.cc (modified) (8 diffs)

trunk/SophyaLib/Samba/spheregorski.cc

@@ -219 +219 @@
 //--
 {
-  cout << " constructeur de recopie " << endl;
   if(s.mInfo_) mInfo_= new DVList(*s.mInfo_);
 
@@ -1116 +1115 @@
 {
   dobj= new SphereGorski<T>;
-  dobj->DataBlock().SetTemp(true);
+  dobj->pixels_.SetTemp(true);
   ownobj= true;
   Read(filename);
@@ -1125 +1124 @@
 {
   dobj= new SphereGorski<T>(obj, true);
-  dobj->DataBlock().SetTemp(true);
+  dobj->pixels_.SetTemp(true);
   ownobj= true;
 }
@@ -1155 +1154 @@
     {
       dobj= new SphereGorski<T>;
-      dobj->DataBlock().SetTemp(true);
+      dobj->pixels_.SetTemp(true);
       ownobj= true;      
     }
 
 // Let's Read the SphereCoordSys object  -- ATTENTIOn - $CHECK$
-  SphereCoordSys* cs = dynamic_cast<SphereCoordSys*>(is.ReadObject());
-  dobj->SetCoordSys(cs);
-
+  FIO_SphereCoordSys fio_scs( dobj->GetCoordSys());
+  fio_scs.Read(is);
   // Pour savoir s'il y avait un DVList Info associe
   char strg[256];
@@ -1175 +1173 @@
   int_4 nSide;
   is.GetI4(nSide);
-  dobj->setSizeIndex(nSide);
-
   int_4 nPix;
   is.GetI4(nPix);
-  dobj->setNbPixels(nPix);
-
   double Omega;
   is.GetR8(Omega);
-  dobj->setPixSolAngle(Omega);
+  dobj->setParameters(nSide,nPix, Omega);
 
 // On lit le DataBlock;
-  is >> dobj->DataBlock();
+  FIO_NDataBlock<T> fio_nd(&dobj->pixels_);
+  fio_nd.Read(is);
 }
 
@@ -1192 +1187 @@
 void FIO_SphereGorski<T>::WriteSelf(POutPersist& os) const
 {
-
   if(dobj == NULL) 
     {
@@ -1200 +1194 @@
 
 // Let's write the SphereCoordSys object
-  dobj->GetCoordSys()->Write(os);
+  FIO_SphereCoordSys fio_scs( dobj->GetCoordSys());
+  fio_scs.Write(os);
 
   char strg[256];
@@ -1220 +1215 @@
   os.PutI4(nSide);
   os.PutI4(nPix);
-  os.PutR8(dobj->PixSolAngle(0));
+  os.PutR8(dobj->PixSolAngle());
 // On ecrit le dataBlock 
-  os << dobj->DataBlock();
+  FIO_NDataBlock<T> fio_nd(&dobj->pixels_);
+  fio_nd.Write(os);
 }