From 81b65bbc54368418da320a6fe619b917a2addaf8 Mon Sep 17 00:00:00 2001
From: apo <apo@opencascade.com>
Date: Fri, 13 Jul 2007 09:15:09 +0000
Subject: [PATCH] To use advanced possibilities of Result::GetInput method

---
 src/VISU_I/VISU_DeformedShape_i.cc            |  5 ++++-
 src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc | 17 ++++++++++++-----
 src/VISU_I/VISU_ScalarMap_i.cc                |  5 ++++-
 src/VISU_I/VISU_StreamLines_i.cc              |  5 ++++-
 src/VISU_I/VISU_Vectors_i.cc                  |  5 ++++-
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/VISU_I/VISU_DeformedShape_i.cc b/src/VISU_I/VISU_DeformedShape_i.cc
index 4fb0f8b3..cea988c3 100644
--- a/src/VISU_I/VISU_DeformedShape_i.cc
+++ b/src/VISU_I/VISU_DeformedShape_i.cc
@@ -63,7 +63,10 @@ VISU::DeformedShape_i
 					     theTimeStampNumber,
 					     theIsMemoryCheck);
     if(aResult){
-      VISU::Result_i::PInput anInput = theResult->GetInput();
+      VISU::Result_i::PInput anInput = theResult->GetInput(theMeshName,
+							   theEntity,
+							   theFieldName,
+							   theTimeStampNumber);
       VISU::PField aField = anInput->GetField(theMeshName,
 					      (VISU::TEntity)theEntity,
 					      theFieldName);
diff --git a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc
index a6d4e340..27f611ab 100644
--- a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc
+++ b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc
@@ -65,7 +65,10 @@ VISU::ScalarMapOnDeformedShape_i
 				      theTimeStampNumber,
 				      false);
     if(theIsMemoryCheck && aResult){
-      VISU::Result_i::PInput anInput = theResult->GetInput();
+      VISU::Result_i::PInput anInput = theResult->GetInput(theMeshName,
+							   theEntity,
+							   theFieldName,
+							   theTimeStampNumber);
       const VISU::PField aField = anInput->GetField(theMeshName,
 						    (VISU::TEntity)theEntity,
 						    theFieldName);
@@ -81,7 +84,8 @@ VISU::ScalarMapOnDeformedShape_i
       if(anIsEstimated)
 	aSize *= INCMEMORY;
       aResult = VISU_PipeLine::CheckAvailableMemory(aSize);
-      MESSAGE("ScalarMapOnDeformedShape_i::IsPossible - CheckAvailableMemory = "<<float(aSize)<<"; aResult = "<<aResult);
+      if(MYDEBUG) 
+	MESSAGE("ScalarMapOnDeformedShape_i::IsPossible - CheckAvailableMemory = "<<float(aSize)<<"; aResult = "<<aResult);
     }
   }catch(std::exception& exc){
     INFOS("Follow exception was occured :\n"<<exc.what());
@@ -310,8 +314,8 @@ VISU::ScalarMapOnDeformedShape_i
 void
 VISU::ScalarMapOnDeformedShape_i
 ::SetScalarField(VISU::Entity theEntity,
-		   const char* theFieldName,
-		   CORBA::Long theTimeStampNumber)
+		 const char* theFieldName,
+		 CORBA::Long theTimeStampNumber)
 {
   bool anIsModified = false;
 
@@ -328,7 +332,10 @@ VISU::ScalarMapOnDeformedShape_i
     return;
 
   VISU::TEntity aEntity = VISU::TEntity(theEntity);
-  VISU::Result_i::PInput anInput = GetCResult()->GetInput();
+  VISU::Result_i::PInput anInput = GetCResult()->GetInput(GetCMeshName(),
+							  theEntity,
+							  theFieldName,
+							  theTimeStampNumber);
   myScalarField = anInput->GetField(GetCMeshName(), aEntity, theFieldName);
 
   VISU::PUnstructuredGridIDMapper anIDMapper = 
diff --git a/src/VISU_I/VISU_ScalarMap_i.cc b/src/VISU_I/VISU_ScalarMap_i.cc
index b3f851e3..b22a9250 100644
--- a/src/VISU_I/VISU_ScalarMap_i.cc
+++ b/src/VISU_I/VISU_ScalarMap_i.cc
@@ -67,7 +67,10 @@ VISU::ScalarMap_i
   try{
     if(theResult){
       bool anIsEstimated = true;
-      VISU::Result_i::PInput anInput = theResult->GetInput();
+      VISU::Result_i::PInput anInput = theResult->GetInput(theMeshName,
+							   theEntity,
+							   theFieldName,
+							   theTimeStampNumber);
       size_t aSize = anInput->GetTimeStampOnMeshSize(theMeshName,
 						     (VISU::TEntity)theEntity,
 						     theFieldName,
diff --git a/src/VISU_I/VISU_StreamLines_i.cc b/src/VISU_I/VISU_StreamLines_i.cc
index 1a2149b3..2d0ad30e 100644
--- a/src/VISU_I/VISU_StreamLines_i.cc
+++ b/src/VISU_I/VISU_StreamLines_i.cc
@@ -59,7 +59,10 @@ VISU::StreamLines_i
     if(!TSuperClass::IsPossible(theResult, theMeshName, theEntity, theFieldName, theTimeStampNumber, false)) 
       return 0;
 
-    VISU::Result_i::PInput anInput = theResult->GetInput();
+    VISU::Result_i::PInput anInput = theResult->GetInput(theMeshName,
+							 theEntity,
+							 theFieldName,
+							 theTimeStampNumber);
     VISU::PUnstructuredGridIDMapper anIDMapper = 
       anInput->GetTimeStampOnMesh(theMeshName,
 				  VISU::TEntity(theEntity),
diff --git a/src/VISU_I/VISU_Vectors_i.cc b/src/VISU_I/VISU_Vectors_i.cc
index 0d9fe407..65a84d24 100644
--- a/src/VISU_I/VISU_Vectors_i.cc
+++ b/src/VISU_I/VISU_Vectors_i.cc
@@ -65,7 +65,10 @@ VISU::Vectors_i
 					     false);
     if(theIsMemoryCheck && aResult){
       bool anIsEstimated = true;
-      VISU::Result_i::PInput anInput = theResult->GetInput();
+      VISU::Result_i::PInput anInput = theResult->GetInput(theMeshName,
+							   theEntity,
+							   theFieldName,
+							   theTimeStampNumber);
       size_t aSize = anInput->GetTimeStampOnMeshSize(theMeshName,
 						     (VISU::TEntity)theEntity,
 						     theFieldName,
-- 
2.39.2