Merge with version on tag OCC-V2_1_0d

[modules/visu.git] / src / VISU_I / VISU_ScalarMap_i.cc

diff --git a/src/VISU_I/VISU_ScalarMap_i.cc b/src/VISU_I/VISU_ScalarMap_i.cc
index a668d043c807246d55b3ad416b4a3f1e6a78eb6b..96beba4d0b59643604d023c0545083bd44ec3832 100644 (file)
--- a/src/VISU_I/VISU_ScalarMap_i.cc
+++ b/src/VISU_I/VISU_ScalarMap_i.cc
@@ -30,6 +30,9 @@
 #include "VISU_ScalarMapAct.h"
 #include "QAD_Config.h"
 
+#include <vtkDataSetMapper.h>
+#include <vtkTextProperty.h>
+
 using namespace VISU;
 using namespace std;
 
@@ -55,10 +58,10 @@ int VISU::ScalarMap_i::IsPossible(Result_i* theResult, const char* theMeshName,
       MESSAGE("ScalarMap_i::IsPossible - CheckAvailableMemory = "<<float(aSize)<<"; aResult = "<<aResult);
     }
     return aResult;
-  }catch(std::runtime_error& exc){
-    INFOS("Follow exception was accured :\n"<<exc.what());
+  }catch(std::exception& exc){
+    INFOS("Follow exception was occured :\n"<<exc.what());
   }catch(...){
-    INFOS("Unknown exception was accured!");
+    INFOS("Unknown exception was occured!");
   }
   return 0;
 }
@@ -463,11 +466,11 @@ VISU::Storable* VISU::ScalarMap_i::Build(int theRestoring){
       CreateAttributes(myStudy,anEntry.c_str(),aRefFatherEntry.c_str(),anIOR,myName.c_str(),"",aComment.latin1(),true);
       mySObject = myStudy->FindObjectIOR(anIOR);
     }
-  }catch(std::runtime_error& exc){
-    INFOS("Follow exception was accured :\n"<<exc.what());
+  }catch(std::exception& exc){
+    INFOS("Follow exception was occured :\n"<<exc.what());
     return NULL;
   }catch(...){
-    INFOS("Unknown exception was accured!");
+    INFOS("Unknown exception was occured!");
     return NULL;
   }
   if(myAddToStudy) aStudyBuilder->CommitCommand();