Changeset 802 in Sophya for trunk/SophyaLib/BaseTools/ndatablock.cc

Timestamp:

Apr 3, 2000, 7:32:27 PM (25 years ago)

Author:

ansari

Message:

Mise au point du nouveau schema (Version=2) de PPersist - Mise en place

de tag complet pour toutes les donnees/objets ecrits - Gestion a peu
pres correct des objets references plusieurs fois, ecrit une seule fois.
Mecanisme d'enregistrement pour les DataObject associe et Methodes
(PutObject/GetObjet) facilitant l'ecriture/lecture de DataObject.
Separation du fichier de la classe FIO_NDataBlock<T>.

Reza03/04/2000

File:

• trunk/SophyaLib/BaseTools/ndatablock.cc (modified) (4 diffs)

trunk/SophyaLib/BaseTools/ndatablock.cc

@@ -9 +9 @@
 #include "pexceptions.h"
 #include "ndatablock.h"
-#include "objfio.h"
 
 // define DEBUG_NDATABLOCK
@@ -613 +612 @@
 }
 
-////////////////////////////////////////////////////////////////
-// -------------------------------------------------------------------------
-//   Les objets delegues pour la gestion de persistance 
-// -------------------------------------------------------------------------
-
-/*
-template <class T>
-void ObjFileIO< NDataBlock<T> >::ReadSelf(PInPersist& is)
-template <class T>
-void ObjFileIO< NDataBlock<T> >::WriteSelf(POutPersist& os)
-*/
-
-// Pour pouvoir ecrire des tableaux de complex, en attendant 
-// PIn/POutPersist::Get/Put(complex<>)
-#include "piocmplx.h"
-
-template <class T>
-FIO_NDataBlock<T>::FIO_NDataBlock()
-{
-dobj=new NDataBlock<T>;
-ownobj=true;
-}
-
-template <class T>
-FIO_NDataBlock<T>::FIO_NDataBlock(string const & filename) 
-{
-dobj=new NDataBlock<T>;
-ownobj=true; 
-Read(filename);
-}
-
-template <class T>
-FIO_NDataBlock<T>::FIO_NDataBlock(const NDataBlock<T> & obj) 
-{ 
-dobj = new NDataBlock<T>(obj);
-ownobj=true; 
-}
-
-template <class T>
-FIO_NDataBlock<T>::FIO_NDataBlock(NDataBlock<T> * obj) 
-{ 
-dobj = obj;
-ownobj=false; 
-}
-
-template <class T>
-FIO_NDataBlock<T>::~FIO_NDataBlock()
-{
-if (ownobj && dobj) delete dobj;
-}
-
-template <class T>
-AnyDataObj* FIO_NDataBlock<T>::DataObj()
-{
-return(dobj);
-}
-
-template <class T>
-void FIO_NDataBlock<T>::SetDataObj(AnyDataObj & o)
-{
-NDataBlock<T> * po = dynamic_cast< NDataBlock<T> * >(&o);
-if (po == NULL) return;
-if (ownobj && dobj) delete dobj;
-dobj = po; ownobj = false;
-} 
-
-template <class T>
-void FIO_NDataBlock<T>::ReadSelf(PInPersist& is)
-{
-// On lit les 3 premiers uint_8
-uint_8 itab[3];
-is.Get(itab, 3);
-if (dobj == NULL) dobj = new NDataBlock<T>(itab[1]);
-else if (itab[1] != dobj->Size()) dobj->ReSize(itab[1]);
-// On lit le tableau de nombres
-PIOSReadArray(is, dobj->Data(), dobj->Size()); 
-}
-
-
-template <class T>
-void FIO_NDataBlock<T>::WriteSelf(POutPersist& os) const
-{
-if (dobj == NULL)   return;  // Attention - $CHECK$ Reza 26/04/99
-//  On ecrit 3 uint_8 
-//  0 : Numero de version,  1 : Taille,  2  reserve a l
-uint_8 itab[3];
-itab[0] = 1;
-itab[1] = dobj->Size();
-itab[2] = 0;
-os.Put(itab, 3);
-//  On ecrit le tableau de nombres 
-PIOSWriteArray(os, dobj->Data(), dobj->Size()); 
-}
 
 ///////////////////////////////////////////////////////////////
@@ -718 +624 @@
 #pragma define_template NDataBlock<r_4>
 #pragma define_template NDataBlock<r_8>
-#pragma define_template NDataBlock< complex<float> >
-#pragma define_template NDataBlock< complex<double> >
-// Instances des delegues FileIO (PPersist)
-#pragma define_template FIO_NDataBlock<uint_1>
-#pragma define_template FIO_NDataBlock<uint_2>
-#pragma define_template FIO_NDataBlock<int_2>
-#pragma define_template FIO_NDataBlock<int_4>
-#pragma define_template FIO_NDataBlock<int_8>
-#pragma define_template FIO_NDataBlock<uint_4>
-#pragma define_template FIO_NDataBlock<uint_8>
-#pragma define_template FIO_NDataBlock<r_8>
-#pragma define_template FIO_NDataBlock<r_4>
-#pragma define_template FIO_NDataBlock< complex<float> >
-#pragma define_template FIO_NDataBlock< complex<double> >
+#pragma define_template NDataBlock< complex<r_4> >
+#pragma define_template NDataBlock< complex<r_8> >
 #endif
 
@@ -744 +638 @@
 template class NDataBlock<r_4>;
 template class NDataBlock<r_8>;
-template class NDataBlock< complex<float> >;
-template class NDataBlock< complex<double> >;
-// Instances des delegues FileIO (PPersist)
-template class FIO_NDataBlock<uint_1>;
-template class FIO_NDataBlock<uint_2>;
-template class FIO_NDataBlock<int_2>;
-template class FIO_NDataBlock<int_4>;
-template class FIO_NDataBlock<int_8>;
-template class FIO_NDataBlock<uint_4>;
-template class FIO_NDataBlock<uint_8>;
-template class FIO_NDataBlock<r_8>;
-template class FIO_NDataBlock<r_4>;
-template class FIO_NDataBlock< complex<float> >;
-template class FIO_NDataBlock< complex<double> >;
-#endif
+template class NDataBlock< complex<r_4> >;
+template class NDataBlock< complex<r_8> >;
+#endif