Changeset 4502

Timestamp:

Jul 15, 2014, 6:20:04 PM (10 years ago)

Author:

ldelgass

Message:

Cleanups. Remove unused variable, move check for <DX> header to C routine,
don't overwrite _dim written by VTK reader.

Location:

trunk

Files:

• gui/scripts/field.tcl (modified) (3 diffs)
• gui/src/RpDxToVtk.c (modified) (1 diff)
• packages/vizservers/nanovis/Makefile.in (modified) (1 diff)

trunk/gui/scripts/field.tcl

@@ -919 +919 @@
                 continue;               # Ignore this component
             }
-            set vector ""
             if 0 {
                 set f [open /tmp/$_path.$cname.dx "w"]
@@ -925 +924 @@
                 close $f
             }
-            # This is temporary.  I put a check for this in the DxToVtk
-            # parser.  
-            if { [string range $contents  0 3] == "<DX>" } {
-                set contents [string range $contents 4 end]
-            }
             if { [catch { Rappture::DxToVtk $contents } vtkdata] == 0 } {
                 ReadVtkDataSet $cname $vtkdata
+                if 0 {
+                    set f [open /tmp/$_path.$cname.vtk "w"]
+                    puts -nonewline $f $vtkdata
+                    close $f
+                }
             } else {
                 puts stderr "Can't parse dx data: $vtkdata"
-            }
-            if 0 {
-                set f [open /tmp/$_path.$cname.vtk "w"]
-                puts -nonewline $f $vtkdata
-                close $f
             }
             if { $_alwaysConvertDX ||
@@ -953 +947 @@
                     [Rappture::FlowHints ::\#auto $_field $cname $_units]
             }
-            set _dim 3
             incr _counter
         } elseif { $type == "dicom"} {

trunk/gui/src/RpDxToVtk.c

@@ -405 +405 @@
         string += 5;
         length -= 5;
+    } else if (strncmp("<DX>", string, 4) == 0) {
+        string += 4;
+        length -= 4;
     }
     pointsObjPtr = Tcl_NewStringObj("", -1);

trunk/packages/vizservers/nanovis/Makefile.in

@@ -68 +68 @@
                 -lvtkCommonCore-$(VTK_VERSION) \
                 -lvtkCommonDataModel-$(VTK_VERSION) \
-                -lvtkCommonExecutionModel-$(VTK_VERSION)  \
-                -lvtkCommonMisc-$(VTK_VERSION)  \
+                -lvtkCommonExecutionModel-$(VTK_VERSION) \
+                -lvtkCommonMisc-$(VTK_VERSION) \
                 -lvtkCommonSystem-$(VTK_VERSION) \
                 -lvtkCommonTransforms-$(VTK_VERSION) \