Changeset 3172 in Sophya for trunk/SophyaLib/BaseTools

Timestamp:

Feb 5, 2007, 10:02:52 AM (19 years ago)

Author:

ansari

Message:

Correction bug ds swsegdb.h (non ecriture buffer avec 1 seul buffer-relu) + ajout methode NDataBlock::RenewObjId() pour re-ecriture PPF , Reza 05/02/2007

Location:

trunk/SophyaLib/BaseTools

Files:

• ndatablock.h (modified) (2 diffs)
• sophyainit.cc (modified) (1 diff)
• sversion.h (modified) (1 diff)
• swsegdb.h (modified) (3 diffs)

trunk/SophyaLib/BaseTools/ndatablock.h

@@ -88 +88 @@
   void Realloc(size_t nnew,bool force=false);
   
+  //! Calls Delete() to set the size to zero (The memory is freed if last referenced structure)
+  inline void Dealloc() { Delete(); }
+
   // Informations pointeur/data
   //! Return pointer on data structure.
@@ -146 +149 @@
   NDataBlock<T> Div(const NDataBlock<T>& b) const;
 
+  //! Return thye associated object Id (or DataRef Id)
   inline uint_8 DRefId() { return mSRef->dsid; }
+  //! assign a new object Id (or DataRef Id) - useful for PPF write operations 
+  inline void RenewDRefId() { mSRef->dsid = AnyDataObj::getUniqueId(); } 
+  //! assign a new object Id (or DataRef Id) - useful for PPF write operations 
+  inline void RenewObjId() { mSRef->dsid = AnyDataObj::getUniqueId(); }
+  
 
 protected:

trunk/SophyaLib/BaseTools/sophyainit.cc

@@ -26 +26 @@
 int SophyaInitiator::FgInit = 0;
 // Module version number - 2.0 , Jul 2006
-#define MOD_VERS   2.0 
+// Module version number - 2.02 , Fev07 Ajout NDataBlock::RenewObjId()
+#define MOD_VERS   2.02
 
 // Pour garder la liste des modules et leurs numeros de version

trunk/SophyaLib/BaseTools/sversion.h

@@ -3 +3 @@
 
 #define SOPHYA_VERSION   2.1
-#define SOPHYA_REVISION  10
+#define SOPHYA_REVISION  20
 #define SOPHYA_TAG       "V_Jan2007"
 

trunk/SophyaLib/BaseTools/swsegdb.h

@@ -140 +140 @@
   virtual T const * GetCstSegment(size_t k) const 
   {
-    getSeg(k);
-    mSRef->fgcstbuff = true;
+    if (getSeg(k))  mSRef->fgcstbuff = true;
     return mSRef->buff;
   }
@@ -188 +187 @@
     mSRef = NULL;  
   } 
-  void getSeg(size_t k) const
-  {
-    if (k == mSRef->bidx)  return ;
+  bool getSeg(size_t k) const
+  {
+    if (k == mSRef->bidx)  return false;
     if ((mSRef->bidx >= 0) && !mSRef->fgcstbuff) {
       int_8 nswp = mSRef->swapper->WriteToSwap(mSRef->buff, mSRef->segsize, mSRef->bidx, 
@@ -199 +198 @@
     if (mSRef->fgwp[k]) 
       mSRef->swapper->ReadFromSwap(k, mSRef->swp[k], mSRef->buff, mSRef->segsize);
-    else { delete[] mSRef->buff;  mSRef->buff = new T[mSRef->segsize]; }  
+    //DEL-02022007    else { delete[] mSRef->buff;  mSRef->buff = new T[mSRef->segsize]; }  
     mSRef->bidx = k;
-    return;
+    return true;
   }