Final version of the V2_2_0 in the main trunk of the CVS tree.

[modules/med.git] / src / MedClient / src / FIELDClient.cxx

diff --git a/src/MedClient/src/FIELDClient.cxx b/src/MedClient/src/FIELDClient.cxx
index a859c6039808de3b513f9e6862103116c5984151..1d49cd83042a9b38b25723fe816fbf43fd0e0039 100644 (file)
--- a/src/MedClient/src/FIELDClient.cxx
+++ b/src/MedClient/src/FIELDClient.cxx
@@ -1,24 +1,20 @@
-//#include "ReceiverFactory.hxx"
-
-//using namespace MEDMEM;
-
 template<class T1,class T2>
-FIELDClient<T1,T2>::FIELDClient(typename T2::_ptr_type ptrCorba,SUPPORT * S):_fieldPtr(T2::_duplicate(ptrCorba)),_ownSupport(false)
+FIELDClient<T1,T2>::FIELDClient(typename T2::_ptr_type ptrCorba,MEDMEM::SUPPORT * S):_fieldPtr(T2::_duplicate(ptrCorba)),_ownSupport(false)
 {
   if (!S) 
     {
       _ownSupport=true;
-      S=new SUPPORTClient(_fieldPtr->getSupport());
+      S=new MEDMEM::SUPPORTClient(_fieldPtr->getSupport());
     }
-  FIELD<T1>::setSupport(S);
+  MEDMEM::FIELD<T1>::setSupport(S);
 
   setName(_fieldPtr->getName());
 
-  FIELD<T1>::setDescription(_fieldPtr->getDescription());
+  MEDMEM::FIELD<T1>::setDescription(_fieldPtr->getDescription());
   int nc = _fieldPtr->getNumberOfComponents();
-  FIELD<T1>::setNumberOfComponents(nc);
+  MEDMEM::FIELD<T1>::setNumberOfComponents(nc);
 
-  FIELD<T1>::setNumberOfValues( S->getNumberOfElements(MED_ALL_ELEMENTS));
+  MEDMEM::FIELD<T1>::setNumberOfValues( S->getNumberOfElements(MED_EN::MED_ALL_ELEMENTS));
 
   string * _s = new string[nc];
 
@@ -26,17 +22,17 @@ FIELDClient<T1,T2>::FIELDClient(typename T2::_ptr_type ptrCorba,SUPPORT * S):_fi
   s = _fieldPtr->getComponentsNames();
   for (int i=0; i<nc; i++)
     _s[i] = s[i];
-  FIELD<T1>::setComponentsNames(_s);
+  MEDMEM::FIELD<T1>::setComponentsNames(_s);
 
   s = _fieldPtr->getComponentsDescriptions();
   for (int i=0; i<nc; i++)
     _s[i] = s[i];
-  FIELD<T1>::setComponentsDescriptions(_s);
+  MEDMEM::FIELD<T1>::setComponentsDescriptions(_s);
 
   s = _fieldPtr->getComponentsUnits();
   for (int i=0; i<nc; i++)
     _s[i] = s[i];
-  FIELD<T1>::setMEDComponentsUnits(_s);
+  MEDMEM::FIELD<T1>::setMEDComponentsUnits(_s);
 
   delete [] _s;
 
@@ -56,8 +52,8 @@ void FIELDClient<T1,T2>::fillCopy()
   //setValueType(typeChamps); WARNING TO DO.....
   //setValueType(_fieldPtr->getValueType());
   long n;
-  T1 *v = (T1 *)ReceiverFactory::getValue(_fieldPtr->getSenderForValue(MED_FULL_INTERLACE),n);
-  MEDARRAY<T1> * M = new MEDARRAY<T1>(v, FIELD<T1>::getNumberOfComponents(),FIELD<T1>::getNumberOfValues(),MED_FULL_INTERLACE,true,true);
+  T1 *v = (T1 *)ReceiverFactory::getValue(_fieldPtr->getSenderForValue(MED_EN::MED_FULL_INTERLACE),n);
+  MEDMEM::MEDARRAY<T1> * M = new MEDMEM::MEDARRAY<T1>(v, MEDMEM::FIELD<T1>::getNumberOfComponents(),MEDMEM::FIELD<T1>::getNumberOfValues(),MED_EN::MED_FULL_INTERLACE,true,true);
   setValue(M);
 }
 
@@ -67,6 +63,6 @@ FIELDClient<T1,T2>::~FIELDClient()
   _fieldPtr->release();
   CORBA::release(_fieldPtr);
   if(_ownSupport)
-    delete FIELD<T1>::_support;
+    delete MEDMEM::FIELD<T1>::_support;
 }