Merge from BR_V5_DEV 16Feb09

[modules/visu.git] / src / VISU_I / VISU_ColoredPrs3dFactory.hh

diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.hh b/src/VISU_I/VISU_ColoredPrs3dFactory.hh
index eae438dde6f3c32cd0e1d90887a1461728d257cc..4b5c2b41cf6836fc3a0c817dc1e5bfdd1901b0e1 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3dFactory.hh
+++ b/src/VISU_I/VISU_ColoredPrs3dFactory.hh
@@ -1,6 +1,6 @@
-//  VISU OBJECT : interactive object for VISU entities implementation
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
 //  This library is free software; you can redistribute it and/or
@@ -17,13 +17,13 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+//  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ColoredPrs3dCache_i.hh
 //  Author : Oleg UVAROV
 //  Module : VISU
-
+//
 #ifndef VISU_ColoredPrs3dFactory_HeaderFile
 #define VISU_ColoredPrs3dFactory_HeaderFile
 
@@ -33,7 +33,7 @@
 
 #include "VISU_I.hxx"
 #include "SALOME_GenericObjPointer.hh"
-#include "VISU_ScalarMapOnDeformedShape_i.hh"
+#include "VISU_DeformedShapeAndScalarMap_i.hh"
 #include "VISU_Plot3D_i.hh"
 #include "VISU_GaussPoints_i.hh"
 #include "VISU_StreamLines_i.hh"
@@ -52,7 +52,8 @@ namespace VISU
   namespace TL
   {
     //----------------------------------------------------------------------------
-    typedef TList<ScalarMapOnDeformedShape_i,
+    typedef TList<DeformedShapeAndScalarMap_i,
+                 TList<DeformedShapeAndScalarMap_i,
                  TList<DeformedShape_i,
                        TList<StreamLines_i,
                              TList<GaussPoints_i,
@@ -62,11 +63,12 @@ namespace VISU
                                                      TList<CutLines_i,
                                                            TList<Vectors_i,
                                                                  TList<Plot3D_i, 
-                                                                       TNullType> > > > > > > > > >
+                                                                       TNullType> > > > > > > > > > >
     TColoredPrs3dTypeList;
     
 
     typedef TList<TInt2Type<TSCALARMAPONDEFORMEDSHAPE>,
+                 TList<TInt2Type<TDEFORMEDSHAPEANDSCALARMAP>,
                  TList<TInt2Type<TDEFORMEDSHAPE>, 
                        TList<TInt2Type<TSTREAMLINES>,
                              TList<TInt2Type<TGAUSSPOINTS>,
@@ -76,7 +78,7 @@ namespace VISU
                                                      TList<TInt2Type<TCUTLINES>,
                                                            TList<TInt2Type<TVECTORS>,
                                                                  TList<TInt2Type<TPLOT3D>, 
-                                                                       TNullType> > > > > > > > > >
+                                                                       TNullType> > > > > > > > > > >
     TColoredPrs3dEnumList;