From: apo <apo@opencascade.com>
Date: Mon, 16 Jul 2007 06:10:38 +0000 (+0000)
Subject: To calcultate global MinMax
X-Git-Tag: T_MULTIPR_INDUS_Persistence~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bd98e05430b9576673b27e06435c023ee9184286;p=modules%2Fvisu.git

To calcultate global MinMax
---

diff --git a/src/VISU_I/VISU_MultiResult_i.cc b/src/VISU_I/VISU_MultiResult_i.cc
index e4832781..538cb33f 100644
--- a/src/VISU_I/VISU_MultiResult_i.cc
+++ b/src/VISU_I/VISU_MultiResult_i.cc
@@ -32,7 +32,9 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_ConvertorUtils.hxx"
 
+#include "MULTIPR_Obj.hxx"
 #include "MULTIPR_API.hxx"
+#include "MULTIPR_Exceptions.hxx"
 
 #include "SALOMEDS_Tool.hxx"
 #include "HDFascii.hxx"
@@ -1095,14 +1097,31 @@ VISU::MultiResult_i
 	INITMSG(MYDEBUG, "'"<<aFileName<<"'\n");
       }
     }
-    int aRes = multipr::merge(aFileNames, theMeshName.c_str(), theFieldName.c_str(), aFileName.c_str());
+    int aRes = false;
+    std::string anErrorMessage("empty mesh");
+    try {
+      INITMSG(MYDEBUG, "theMeshName = '"<<aFileName<<"'; theFieldName = '"<<theFieldName<<"'\n");
+      aRes = multipr::merge(aFileNames, theMeshName.c_str(), theFieldName.c_str(), aFileName.c_str());
+    }catch(std::exception& exc){
+      MSG(MYDEBUG,"Follow exception was occured in:\n"<<exc.what());
+      anErrorMessage = exc.what();
+    }catch(multipr::RuntimeException& exc){
+      std::ostringstream aStream;
+      exc.dump(aStream);
+      aStream<<ends;
+      MSG(MYDEBUG,"Follow exception was occured in:\n"<<aStream.str());
+      anErrorMessage = aStream.str();
+    }catch(...){
+      MSG(MYDEBUG,"Unknown exception !!!");
+    }
     INITMSGA(MYDEBUG, 0, "aRes = "<<aRes<<"\n");
     if (aRes == 0) {
-      QFile(aFileName.c_str()).remove();
-      throw std::runtime_error("empty mesh"); 
+      VISU::RemoveFile(aFileName);
+      throw std::runtime_error(anErrorMessage); 
     }
     PInput anInput(CreateConvertor(aFileName));
     anInput->BuildFields();
+    anInput->BuildMinMax();
     myRepresentation2Input[aRepresentationKey] = anInput;
     return anInput;
   }