From: enk <enk@opencascade.com>
Date: Wed, 18 Oct 2006 12:25:14 +0000 (+0000)
Subject: scalarmap raplaced by prsmerger
X-Git-Tag: mergeto_V3_2_0_maintainance_30Nov06~18
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9da6d1100594b37fffc4e265c91462550beaf548;p=modules%2Fvisu.git

scalarmap raplaced by prsmerger
---

diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx
index 92f1ea7d..9c387de3 100644
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -28,7 +28,7 @@
 #include "VISU_Result_i.hh"
 #include "VISU_Prs3d_i.hh"
 #include "VISU_Mesh_i.hh"
-#include "VISU_ScalarMap_i.hh"
+#include "VISU_PrsMerger_i.hh"
 #include "VISU_IsoSurfaces_i.hh"
 #include "VISU_DeformedShape_i.hh"
 #include "VISU_ScalarMapOnDeformedShape_i.hh"
@@ -149,7 +149,7 @@ void VISU_TimeAnimation::addField (_PTR(SObject) theField)
   FieldData aNewData;
   aNewData.myField = theField;
   aNewData.myNbFrames = 0;
-  aNewData.myPrsType = VISU::TSCALARMAP;
+  aNewData.myPrsType = VISU::TPRSMERGER;
   aNewData.myOffset[0] = aNewData.myOffset[1] = aNewData.myOffset[2] = 0;
   VISU::Storable::TRestoringMap aMap = getMapOfValue(aNewData.myField);
   aNewData.myNbTimes = VISU::Storable::FindValue(aMap,"myNbTimeStamps").toLong();
@@ -288,7 +288,7 @@ namespace
       int aRangeType = VISU::GetResourceMgr()->integerValue("VISU" , "scalar_range_type", 0);
       if( aRangeType != 1 ){
 	for(long aFrameId = 0; aFrameId < theData.myNbFrames; aFrameId++) {
-	  if (VISU::ScalarMap_i* aPrs = dynamic_cast<VISU::ScalarMap_i*>(theData.myPrs[aFrameId])){
+	  if (VISU::PrsMerger_i* aPrs = dynamic_cast<VISU::PrsMerger_i*>(theData.myPrs[aFrameId])){
 	    aPrs->SetRange(aMin, aMax);
 	    aPrs->SetOffset(theData.myOffset);
 	  }
@@ -318,8 +318,8 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
 
   using namespace VISU;
   switch (aData.myPrsType) {
-  case VISU::TSCALARMAP: // ScalarMap
-    GeneratePresentations<ScalarMap_i>(myStudy,
+  case VISU::TPRSMERGER: // ScalarMap
+    GeneratePresentations<PrsMerger_i>(myStudy,
 				       aData,
 				       aResult,
 				       isRangeDefined(),
@@ -894,8 +894,8 @@ std::string GetPresentationComment (VISU::VISUType thePrsType)
 {
   std::string aPrsCmt;
   switch (thePrsType) {
-  case VISU::TSCALARMAP:
-    aPrsCmt = VISU::ScalarMap_i::myComment;
+  case VISU::TPRSMERGER:
+    aPrsCmt = VISU::PrsMerger_i::myComment;
     break;
   case VISU::TISOSURFACE:
     aPrsCmt = VISU::IsoSurfaces_i::myComment;
@@ -1074,8 +1074,8 @@ void VISU_TimeAnimation::restoreFromStudy(_PTR(SObject) theField)
     string aStr = aName->Value();
     QString strName (aStr.c_str());
 
-    if (strName == VISU::ScalarMap_i::myComment.c_str())
-      aData.myPrsType = VISU::TSCALARMAP;
+    if (strName == VISU::PrsMerger_i::myComment.c_str())
+      aData.myPrsType = VISU::TPRSMERGER;
     else if (strName == VISU::IsoSurfaces_i::myComment.c_str())
       aData.myPrsType = VISU::TISOSURFACE;
     else if (strName == VISU::CutPlanes_i::myComment.c_str())