Changeset 3173 in Sophya for trunk

Timestamp:

Feb 5, 2007, 10:04:46 AM (19 years ago)

Author:

ansari

Message:

Ajout methodes TArray::ZeroSize() RenewObjId() - Reza 05/02/2007

Location:

trunk/SophyaLib/TArray

Files:

• basarr.cc (modified) (1 diff)
• basarr.h (modified) (1 diff)
• tarray.cc (modified) (1 diff)
• tarray.h (modified) (2 diffs)
• tarrinit.cc (modified) (1 diff)

trunk/SophyaLib/TArray/basarr.cc

@@ -741 +741 @@
 }
 
-
+//! Set the array sizes to zero, corresponding to an unallocated array
+void BaseArray::SetZeroSize()
+{
+  ndim_ = 0;
+  for(int_4 k=0; k<BASEARRAY_MAXNDIMS; k++) step_[k] = size_[k] = 0;
+  totsize_ = 0;
+  minstep_ = 0;
+  moystep_ = 0;
+  offset_ = 0;
+  // On ne change pas l'organisation memoire, le type de vecteur
+  // et le array type
+}
+

trunk/SophyaLib/TArray/basarr.h

@@ -183 +183 @@
   virtual void UpdateSubArraySizes(BaseArray & ra, int_4 ndim, sa_size_t * siz, sa_size_t * pos, sa_size_t * step) const;
 
+  // Pour mettre les tailles a zero
+  virtual void SetZeroSize();
+
   int_4  ndim_; //!< number of dimensions of array
   sa_size_t size_[BASEARRAY_MAXNDIMS]; //!< array of the size in each dimension

trunk/SophyaLib/TArray/tarray.cc

@@ -382 +382 @@
 }
 
+  //! To clear the array sizes - corresponding to an unallocated array.
+template <class T>
+TArray<T>&  TArray<T>::ZeroSize()
+{
+  if (NbDimensions() == 0)  return (*this);  
+  SetZeroSize();
+  mNDBlock.Dealloc();
+  return (*this); 
+}
 
 /*!

trunk/SophyaLib/TArray/tarray.h

@@ -67 +67 @@
   void Realloc(int_4 ndim, sa_size_t * siz, sa_size_t step=1, bool force=false);
 
+  //! To clear the array sizes - corresponding to an unallocated array.
+  virtual TArray<T>& ZeroSize();
+
   // Compacts size=1 array dimensions
   virtual TArray<T>& CompactAllDimensions();
@@ -212 +215 @@
   virtual void   WriteASCII(ostream& os) const;
 
+//! assign a new object Id (or DataRef Id) - useful for PPF write operations 
+  inline void RenewObjId() { mNDBlock.RenewObjId(); }
 //  Pour la gestion de persistance
   friend class  FIO_TArray<T>;

trunk/SophyaLib/TArray/tarrinit.cc

@@ -20 +20 @@
 
 // Module version number - 2.0 , Jul 2006
-#define MOD_VERS   2.0 
+// Module version number - 2.02 , Fev 2006: Ajout TArray::ZeroSize() , RenewObjId()
+#define MOD_VERS   2.02
 
 TArrayInitiator::TArrayInitiator()