Changeset 1462 in Sophya for trunk/ArchTOIPipe/Kernel/toi.h

Timestamp:

Apr 10, 2001, 6:35:25 PM (24 years ago)

Author:

cmv

Message:

changement getData... intermediaire NE COMPILE PAS cmv+rz 10/4/2001

File:

• trunk/ArchTOIPipe/Kernel/toi.h (modified) (4 diffs)

trunk/ArchTOIPipe/Kernel/toi.h

@@ -32 +32 @@
 
 #ifdef WITH_SOPHYA
+  // l'interface va etre modifiee, NE PAS UTILISER
   virtual Array         getData(int iStart, int iEnd);
   virtual Array         getError(int iStart, int iEnd);
   virtual TArray<int_4> getFlag(int iStart, int iEnd);
+  // l'interface va etre modifiee, NE PAS UTILISER
 #endif
+
+  enum DataStatus       {DATA_OK=0, DATA_DELETED, DATA_NOT_YET};
     
   virtual double        getData(int i);
-  virtual double        getError(int i);
-  virtual int_4         getFlag(int i);
+  virtual void          getData(int i,double &data,int_4 &flag);
+  //RZCMV  virtual DataStatus    getDataError(int i,double &data,double &error,int_4 &flag);
 
-  enum DataStatus       {DATA_OK=0, DATA_DELETED, DATA_NOT_YET};
   virtual DataStatus    isDataAvail(int iStart, int iEnd);
   virtual DataStatus    isDataAvail(int i);
@@ -51 +54 @@
   
   virtual void          putData(int i, double value, int_4 flag=0);
-  virtual void          putDataError(int i, double value, 
-                                     double error, int_4 flag=0);
+  //RZCMV  virtual void          putDataError(int i, double value, 
+  //                                 double error, int_4 flag=0);
 
   virtual void          wontNeedBefore(int i);
@@ -82 +85 @@
   virtual TArray<int_4> doGetFlag(int iStart, int iEnd)=0;
 #endif
-  virtual double        doGetData(int i)=0;
-  virtual int_4         doGetFlag(int i)=0;
+  virtual void          doGetData(int i, double& data, int_4& flag)=0;
   virtual void          doPutData(int i, double value, int_4 flag=0)=0;
   virtual void          doWontNeedBefore(int i);
@@ -156 +158 @@
   virtual TArray<int_4> doGetFlag(int iStart, int iEnd);
 #endif
-  virtual double        doGetData(int i);
-  virtual int_4         doGetFlag(int i);
+  virtual void          doGetData(int i, double & val, int_4 & flg);
    
   virtual void          doPutData(int i, double value, int_4 flag=0);