Changeset 3528 in Sophya


Ignore:
Timestamp:
Oct 12, 2008, 6:59:11 PM (17 years ago)
Author:
ansari
Message:

Instanciation explicite et enregistrement des adaptateurs NObjMgrAdapter pour TArray, et TMatrix/TVector <T> pour T=uint_4, uint_8, Reza 12/10/2008

Location:
trunk/SophyaPI/PIext
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaPI/PIext/graphexecut.cc

    r3491 r3528  
    419419usage += "                midas_pastel midas_heat midas_rainbow3 midas_bluered\n";
    420420usage += "                midas_bluewhite midas_redwhite\n";
    421 usage += "                multicol16 multicol64\n";
     421usage += "                multicol16 multicol64 rgb216cm rgb512cm rgb4096cm\n";
    422422usage += ">> revcmap : reverse colorMap\n";
    423423usage += ">> ZoomFactors :  zoomxN   ex: zoomx1 zoomx2 zoomx3 ...\n";
    … …  
    425425usage += ">> imagecenter=ix,iy : Position the image in widget\n";
    426426usage += ">> lut=ltyp,min,max : Sets LUT type and min/max\n";
    427 usage += "                   (ltyp=lin/log/sqrt/square)\n";
     427usage += "                   (ltyp=lin/log/sqrt/square/rgb)\n";
    428428usage += ">> autolut=alt[,ns[,min,max]] : AutoLut method selection \n";
    429429usage += "                   (alt=minmax/meansig/hispeak/histail/hisrng)\n";

  • trunk/SophyaPI/PIext/nomtarradapter.cc

    r3478 r3528  
    496496#ifdef __CXX_PRAGMA_TEMPLATES__
    497497#pragma define_template NOMAdapter_TArray<uint_2>
     498#pragma define_template NOMAdapter_TArray<uint_4>
     499#pragma define_template NOMAdapter_TArray<uint_8>
    498500#pragma define_template NOMAdapter_TArray<int_2>
    499501#pragma define_template NOMAdapter_TArray<int_4>
    … …  
    504506#pragma define_template NOMAdapter_TArray< complex<r_8> >
    505507#pragma define_template NTupInt_TArray<uint_2>
     508#pragma define_template NTupInt_TArray<uint_4>
     509#pragma define_template NTupInt_TArray<uint_8>
    506510#pragma define_template NTupInt_TArray<int_2>
    507511#pragma define_template NTupInt_TArray<int_4>
    … …  
    515519#if defined(ANSI_TEMPLATES)
    516520template class NOMAdapter_TArray<uint_2>;
     521template class NOMAdapter_TArray<uint_4>;
     522template class NOMAdapter_TArray<uint_8>;
    517523template class NOMAdapter_TArray<int_2>;
    518524template class NOMAdapter_TArray<int_4>;
    … …  
    523529template class NOMAdapter_TArray< complex<r_8> >;
    524530template class NTupInt_TArray<uint_2>;
     531template class NTupInt_TArray<uint_4>;
     532template class NTupInt_TArray<uint_8>;
    525533template class NTupInt_TArray<int_2>;
    526534template class NTupInt_TArray<int_4>;

  • trunk/SophyaPI/PIext/nomtmatvecadapter.cc

    r3335 r3528  
    326326AnyDataObj* NOMAdapter_TMatrix<T>::FitResidusObj(GeneralFit& mfit)
    327327{
     328ArrayFitter<T> arrfit;
    328329TVector<T>* vec = dynamic_cast<TVector<T> *>(mMtx);
    329330if(vec) {
    330   TVector<T>* v = new TVector<T>(ObjectFitter::FitResidus(*vec,mfit),true);
     331  TVector<T>* v = new TVector<T>(arrfit.FitResidus(*vec, mfit),true);
    331332  return v;
    332333} else {
    333   TMatrix<T>* m = new TMatrix<T>(ObjectFitter::FitResidus(*mMtx,mfit),true);
     334  TMatrix<T>* m = new TMatrix<T>(arrfit.FitResidus(*mMtx,mfit),true);
    334335  return m;
    335336}
    … …  
    339340AnyDataObj* NOMAdapter_TMatrix<T>::FitFunctionObj(GeneralFit& mfit)
    340341{
     342ArrayFitter<T> arrfit;
    341343TVector<T>* vec = dynamic_cast<TVector<T> *>(mMtx);
    342344if(vec) {
    343   TVector<T>* v = new TVector<T>(ObjectFitter::FitFunction(*vec,mfit),true);
     345  TVector<T>* v = new TVector<T>(arrfit.FitFunction(*vec,mfit),true);
    344346  return v;
    345347} else {
    346   TMatrix<T>* m = new TMatrix<T>(ObjectFitter::FitFunction(*mMtx,mfit),true);
     348  TMatrix<T>* m = new TMatrix<T>(arrfit.FitFunction(*mMtx,mfit),true);
    347349  return m;
    348350}
    … …  
    493495#ifdef __CXX_PRAGMA_TEMPLATES__
    494496#pragma define_template NOMAdapter_TMatrix<uint_2>
     497#pragma define_template NOMAdapter_TMatrix<uint_4>
     498#pragma define_template NOMAdapter_TMatrix<uint_8>
    495499#pragma define_template NOMAdapter_TMatrix<int_2>
    496500#pragma define_template NOMAdapter_TMatrix<int_4>
    … …  
    501505#pragma define_template NOMAdapter_TMatrix< complex<r_8> >
    502506#pragma define_template NTupInt_TMatrix<uint_2>
     507#pragma define_template NTupInt_TMatrix<uint_4>
     508#pragma define_template NTupInt_TMatrix<uint_8>
    503509#pragma define_template NTupInt_TMatrix<int_2>
    504510#pragma define_template NTupInt_TMatrix<int_4>
    … …  
    512518#if defined(ANSI_TEMPLATES)
    513519template class NOMAdapter_TMatrix<uint_2>;
     520template class NOMAdapter_TMatrix<uint_4>;
     521template class NOMAdapter_TMatrix<uint_8>;
    514522template class NOMAdapter_TMatrix<int_2>;
    515523template class NOMAdapter_TMatrix<int_4>;
    … …  
    520528template class NOMAdapter_TMatrix< complex<r_8> >;
    521529template class NTupInt_TMatrix<uint_2>;
     530template class NTupInt_TMatrix<uint_4>;
     531template class NTupInt_TMatrix<uint_8>;
    522532template class NTupInt_TMatrix<int_2>;
    523533template class NTupInt_TMatrix<int_4>;

  • trunk/SophyaPI/PIext/piinit.cc

    r3222 r3528  
    7373  serv->RegisterClass(new Matrix, new NOMAdapter_Matrix );
    7474#else
     75//  Octobre 2008 : prise en charge tableaux/matrice/vecteurs en uint_4 uint_8
    7576  serv->RegisterClass(new TArray<uint_2>, new NOMAdapter_TArray<uint_2> );
     77  serv->RegisterClass(new TArray<uint_4>, new NOMAdapter_TArray<uint_4> );
     78  serv->RegisterClass(new TArray<uint_8>, new NOMAdapter_TArray<uint_8> );
    7679  serv->RegisterClass(new TArray<int_2>, new NOMAdapter_TArray<int_2> );
    7780  serv->RegisterClass(new TArray<int_4>, new NOMAdapter_TArray<int_4> );
    … …  
    8487  serv->RegisterClass(new TVector<uint_2>, new NOMAdapter_TMatrix<uint_2> );
    8588  serv->RegisterClass(new TMatrix<uint_2>, new NOMAdapter_TMatrix<uint_2> );
     89  serv->RegisterClass(new TVector<uint_4>, new NOMAdapter_TMatrix<uint_4> );
     90  serv->RegisterClass(new TMatrix<uint_4>, new NOMAdapter_TMatrix<uint_4> );
     91  serv->RegisterClass(new TVector<uint_8>, new NOMAdapter_TMatrix<uint_8> );
     92  serv->RegisterClass(new TMatrix<uint_8>, new NOMAdapter_TMatrix<uint_8> );
    8693  serv->RegisterClass(new TVector<int_2>, new NOMAdapter_TMatrix<int_2> );
    8794  serv->RegisterClass(new TMatrix<int_2>, new NOMAdapter_TMatrix<int_2> );
    … …  
    103110      NOMAdapter_Image<T> , deplace ci-dessous dans SANS_EVOLPLANCK */
    104111  serv->RegisterClass(new Image<uint_2>, new NOMAdapter_TMatrix<uint_2> );
     112  serv->RegisterClass(new Image<uint_4>, new NOMAdapter_TMatrix<uint_4> );
     113  serv->RegisterClass(new Image<uint_8>, new NOMAdapter_TMatrix<uint_8> );
    105114  serv->RegisterClass(new Image<int_2>, new NOMAdapter_TMatrix<int_2> );
    106115  serv->RegisterClass(new Image<int_4>, new NOMAdapter_TMatrix<int_4> );

  • trunk/SophyaPI/PIext/pitvmaad.cc

    r3520 r3528  
    135135#ifdef __CXX_PRAGMA_TEMPLATES__
    136136#pragma define_template POTVectorAdapter< uint_2 >
     137#pragma define_template POTVectorAdapter< uint_4 >
     138#pragma define_template POTVectorAdapter< uint_8 >
    137139#pragma define_template POTVectorAdapter< int_2 >
    138140#pragma define_template POTVectorAdapter< int_4 >
    … …  
    144146
    145147#pragma define_template POTMatrixAdapter< uint_2 >
     148#pragma define_template POTMatrixAdapter< uint_4 >
     149#pragma define_template POTMatrixAdapter< uint_8 >
    146150#pragma define_template POTMatrixAdapter< int_2 >
    147151#pragma define_template POTMatrixAdapter< int_4 >
    … …  
    155159#if defined(ANSI_TEMPLATES)
    156160template class POTVectorAdapter< uint_2 >;
     161template class POTVectorAdapter< uint_4 >;
     162template class POTVectorAdapter< uint_8 >;
    157163template class POTVectorAdapter< int_2 >;
    158164template class POTVectorAdapter< int_4 >;
    … …  
    164170
    165171template class POTMatrixAdapter< uint_2 >;
     172template class POTMatrixAdapter< uint_4 >;
     173template class POTMatrixAdapter< uint_8 >;
    166174template class POTMatrixAdapter< int_2 >;
    167175template class POTMatrixAdapter< int_4 >;
Note: See TracChangeset for help on using the changeset viewer.