Changeset 5433 for branches/1.3/gui

Timestamp:

May 6, 2015 1:44:38 PM (9 years ago)

Author:

ldelgass

Message:

merge r5432 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/field.tcl (modified) (1 diff)
• gui/src/RpDxToVtk.c (modified) (5 diffs)

branches/1.3/gui/scripts/field.tcl

@@ -932 +932 @@
             } else {
                 unset contents
-                puts stderr "Can't parse DX data"
+                # vtkdata variable holds error message
+                puts stderr "Can't parse DX data\n$vtkdata"
                 continue;               # Ignore this component
             }

branches/1.3/gui/src/RpDxToVtk.c

@@ -427 +427 @@
             isUniform = 1;
             if ((count[0] < 0) || (count[1] < 0) || (count[2] < 0)) {
-                sprintf(mesg, "invalid grid size: x=%d, y=%d, z=%d", 
+                sprintf(mesg, "Invalid grid size: x=%d, y=%d, z=%d", 
                         count[0], count[1], count[2]);
                 Tcl_AppendResult(interp, mesg, (char *)NULL);
@@ -446 +446 @@
             if (nAxes == 3) {
                 Tcl_AppendResult(interp, "too many delta statements", 
-                        (char *)NULL);
+                                 (char *)NULL);
                 return TCL_ERROR;
             }
@@ -502 +502 @@
                           " items %d data follows", &nPoints) == 1) {
             // XXX: Deprecated, invalid ordering of keywords
-            fprintf(stderr, "Invalid DX: 'rank' keyword should precede 'shape'.");
+            Tcl_AppendResult(interp, "Invalid DX: 'rank' keyword should precede 'shape'.", 
+                             (char *)NULL);
             return TCL_ERROR;
         } else if (sscanf(line, "object %*d class array type %*s rank 1 shape 3"
@@ -567 +568 @@
                 }
             }
+        } else if (sscanf(line, "object %*d class array type %*s rank 0"
+                          " times %d data follows", &nPoints) == 1) {
+            /* Handle incorrect keyword: Do any tools make this mistake? */
+            Tcl_AppendResult(interp, "Invalid DX: found 'times' where 'items' keyword was expected.", 
+                             (char *)NULL);
+            return TCL_ERROR; 
 #ifdef notdef
         } else {
@@ -576 +583 @@
     if (isUniform) {
         if (nPoints > 1 && nAxes == 0) {
-            fprintf(stderr, "Invalid DX file: uniform grid with no deltas found\n");
+            Tcl_AppendResult(interp, "Invalid DX file: uniform grid with no deltas found",
+                             (char *)NULL);
             return TCL_ERROR;
         }
         if (nPoints > 1 && ((dx == dy) && (dx == dz) && (dx == 0.0))) {
-            fprintf(stderr, "Invalid deltas in DX file: %g %g %g\n", dx, dy, dz);
+            sprintf(mesg, "Invalid deltas in DX file: %g %g %g", dx, dy, dz);
+            Tcl_AppendResult(interp, mesg, (char *)NULL);
             return TCL_ERROR;
         }
         if (dx < 0.0 || dy < 0.0 || dz < 0.0) {
-            fprintf(stderr, "Negative deltas not supported in DX file: %g %g %g\n", dx, dy, dz);
+            sprintf(mesg, "Negative deltas not supported in DX file: %g %g %g",
+                    dx, dy, dz);
+            Tcl_AppendResult(interp, mesg, (char *)NULL);
             return TCL_ERROR;
         }