Changeset 44d90fd in tol

Timestamp:

Feb 24, 2012, 7:33:33 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

b6a0831

Parents:

b4f1dbf

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.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4202 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/OIS/oisloader.cpp (modified) (1 diff)

tol/OIS/oisloader.cpp

@@ -1444 +1444 @@
             else 
             {
-              BText expr = Compact(BParser::Unparse(tree,"  ","\n"));
-              if(name.HasName()) { expr = name+" = "+expr; }
-              Warning(BText("Cannot rebuild virtual expression of non "
-                      "bounded TimeSet ")+expr+ "\nOnly cached "
-                      "dates will be accessible between ["+beginCache+","+
-                      endCache+"]\nTo avoid this problem save just "
-                      "bounded time sets or use expressions that could "
-                      "be evaluated at OIS loading time." );
+              x = (BUserTimeSet*)GraTimeSet()->FindOperand(name,true);
+              if(!x)
+              {
+                BText expr = Compact(BParser::Unparse(tree,"  ","\n"));
+                if(name.HasName()) { expr = name+" = "+expr; }
+                Warning(BText("Cannot rebuild virtual expression of non "
+                        "bounded TimeSet ")+expr+ "\nOnly cached "
+                        "dates will be accessible between ["+beginCache+","+
+                        endCache+"]\nTo avoid this problem save just "
+                        "bounded time sets or use expressions that could "
+                        "be evaluated at OIS loading time." );
+              }
             } 
           }