Changeset 4203

Show
Ignore:
Timestamp:
02/24/12 20:33:52 (2 years ago)
Author:
vdebuen
Message:

Fixes #1451

If there is a visible TimeSet with the same name of an OIS-stored TimeSet which expression is not reproducible
then the previously created will be used to avoid heavy warnings.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • tolp/branches/release_3.1/tol/OIS/oisloader.cpp

    r3691 r4203  
    14441444            else  
    14451445            { 
    1446               BText expr = Compact(BParser::Unparse(tree,"  ","\n")); 
    1447               if(name.HasName()) { expr = name+" = "+expr; } 
    1448               Warning(BText("Cannot rebuild virtual expression of non " 
    1449                       "bounded TimeSet ")+expr+ "\nOnly cached " 
    1450                       "dates will be accessible between ["+beginCache+","+ 
    1451                       endCache+"]\nTo avoid this problem save just " 
    1452                       "bounded time sets or use expressions that could " 
    1453                       "be evaluated at OIS loading time." ); 
     1446              x = (BUserTimeSet*)GraTimeSet()->FindOperand(name,true); 
     1447              if(!x) 
     1448              { 
     1449                BText expr = Compact(BParser::Unparse(tree,"  ","\n")); 
     1450                if(name.HasName()) { expr = name+" = "+expr; } 
     1451                Warning(BText("Cannot rebuild virtual expression of non " 
     1452                        "bounded TimeSet ")+expr+ "\nOnly cached " 
     1453                        "dates will be accessible between ["+beginCache+","+ 
     1454                        endCache+"]\nTo avoid this problem save just " 
     1455                        "bounded time sets or use expressions that could " 
     1456                        "be evaluated at OIS loading time." ); 
     1457              } 
    14541458            }  
    14551459          }