Just improve layouting

diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc
index c78fe7ec3da77e3dad87e7ede92886c1bb4d1b7c..c0e51c20703a5895fd1c4260acc949abae79c710 100644 (file)
--- a/src/VISU_I/VISUConfig.cc
+++ b/src/VISU_I/VISUConfig.cc
@@ -195,12 +195,13 @@ namespace VISU{
       bool isExist;
       QString aComment = VISU::Storable::FindValue(aMap,"myComment",&isExist);
       if ( isExist ) {
-       TCallbackMap::const_iterator i = VisuStoreMap.find(aComment.latin1());
-       if(MYDEBUG) MESSAGE("Storable::Create - "<<aComment.latin1()<<" "<<(i != VisuStoreMap.end()));
-       if(i == VisuStoreMap.end()) return NULL;
-       return (i->second)(theSObject,thePrefix,aMap);
+       TCallbackMap::const_iterator anIter = VisuStoreMap.find(aComment.latin1());
+       if(MYDEBUG) MESSAGE("Storable::Create - "<<aComment.latin1()<<" "<<(anIter != VisuStoreMap.end()));
+       if(anIter == VisuStoreMap.end()) 
+         return NULL;
+       return (anIter->second)(theSObject, thePrefix, aMap);
       }
-    }catch(std::logic_error& exc){
+    }catch(std::exception& exc){
       INFOS("Follow exception was occured :\n"<<exc.what());
     }catch(...){
       INFOS("Unknown exception was occured!");
@@ -212,18 +213,20 @@ namespace VISU{
   Storable
   ::FindValue(const TRestoringMap& theMap, 
              const std::string& theArg, 
-             bool* isFind)
+             bool* theIsFind)
   {
-    TRestoringMap::const_iterator i = theMap.find(theArg);
-    if(i == theMap.end()) {
+    TRestoringMap::const_iterator anIter = theMap.find(theArg);
+    if(anIter == theMap.end()) {
       if(MYDEBUG) MESSAGE("Storable::Init >> there is no value for "<<theArg);
-      if(isFind != NULL) *isFind = false;
+      if(theIsFind != NULL) 
+       *theIsFind = false;
       //throw std::logic_error(string("Storable::Init >> there is no value for ") + theArg);
       static QString BAD_VALUE("NULL");
       return BAD_VALUE;
     }
-    if(isFind != NULL) *isFind = true;
-    return i->second;
+    if(theIsFind != NULL) 
+      *theIsFind = true;
+    return anIter->second;
   }
 
 

diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc
index 4914a11510a56091c7f7a07290a4148e9546df85..86be553af228b00b4b573093f9d0294727c186de 100644 (file)
--- a/src/VISU_I/VISU_Result_i.cc
+++ b/src/VISU_I/VISU_Result_i.cc
@@ -1673,7 +1673,7 @@ VISU::Result_i
       }
       if(MYDEBUG)
        MESSAGE("Result_i::Restore - aFileName = " << myFileInfo.filePath() << "; " << myFileInfo.isFile());
-
+      
       const char* aPathLatin = myFileInfo.filePath().latin1();
       if (HDFascii::isASCII(aPathLatin)) {
        MESSAGE("ConvertFromASCIIToHDF(" << aPathLatin << ")");
@@ -1681,13 +1681,13 @@ VISU::Result_i
        MESSAGE("ConvertFromASCIIToHDF() DONE : " << aResultPath);
        char* aHDFFileName = new char[strlen(aResultPath) + 19];
        sprintf(aHDFFileName, "%shdf_from_ascii.hdf", aResultPath);
-
+       
        if (IsMultifile()) { // set this file as new - temporary
          static QString aCommand;
          aCommand.sprintf(" %s %s%s",aHDFFileName, aResultPath, myFileInfo.baseName().latin1());
-    aCommand = QDir::convertSeparators( aCommand );
-    aCommand.prepend( MOVE_COMMAND );
-
+         aCommand = QDir::convertSeparators( aCommand );
+         aCommand.prepend( MOVE_COMMAND );
+         
          if (system(aCommand.latin1()) == -1) {
            if(MYDEBUG) MESSAGE("VISU::Result_i::Restore - Can't execute the command :" << aCommand);
            return NULL;
@@ -1698,10 +1698,10 @@ VISU::Result_i
        } else { // change current temporary file to the new: with hdf-format
          static QString aCommand;
          aCommand.sprintf(" %s %s\0",aHDFFileName, myFileInfo.filePath().latin1());
-    aCommand = QDir::convertSeparators( aCommand );
-    aCommand.prepend( MOVE_COMMAND );
-
-    if (system(aCommand.latin1()) == -1) {
+         aCommand = QDir::convertSeparators( aCommand );
+         aCommand.prepend( MOVE_COMMAND );
+         
+         if (system(aCommand.latin1()) == -1) {
            if(MYDEBUG) MESSAGE("VISU::Result_i::Restore - Can't execute the command :" << aCommand);
            return NULL;
          } else {