Changeset 4980 for branches/1.3

Timestamp:

Feb 7, 2015 12:41:51 PM (9 years ago)

Author:

ldelgass

Message:

merge r4979 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/src/RpDicomToVtk.cc (modified) (6 diffs)
• gui/src/RpReadPoints.c (modified) (1 diff)

branches/1.3/gui/src/RpDicomToVtk.cc

@@ -27 +27 @@
 #include <stdio.h>
 #include "tcl.h"
+
+// #define RP_DICOM_TRACE
 
 static int
@@ -95 +97 @@
     int series = 0;
 
+#ifdef RP_DICOM_TRACE
     fprintf(stderr, "Num Studies: %d\n", numStudies);
+#endif
     vtkStringArray *files;
 #if 0
     for (int i = 0; i < numStudies; i++) {
         int numSeries = sorter->GetNumberOfSeriesInStudy(i);
+#ifdef RP_DICOM_TRACE
         fprintf(stderr, "Study %d: %d series\n", i, numSeries);
+#endif
         int k = sorter->GetFirstSeriesInStudy(i);
         for (int j = 0; j < numSeries; j++) {
@@ -144 +150 @@
 #ifdef USE_VTK_DICOM_PACKAGE
     vtkStringArray *ids = reader->GetStackIDs();
+#ifdef RP_DICOM_TRACE
     for (int i = 0; i < ids->GetNumberOfValues(); i++) {
         fprintf(stderr, "Stack: %s\n", ids->GetValue(i).c_str());
     }
+#endif
     vtkIntArray *fidxArray = reader->GetFileIndexArray();
     vtkDICOMMetaData *md = reader->GetMetaData();
@@ -160 +168 @@
     }
 #endif
+#ifdef RP_DICOM_TRACE
     fprintf(stderr, "Number of data elements: %d\n", md->GetNumberOfDataElements());
-
+#endif
     Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("num_files", -1));
     Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewIntObj(md->GetNumberOfInstances()));
@@ -234 +243 @@
 
     Tcl_ListObjAppendList(interp, objPtr, metaDataObj);
-
+#ifdef RP_DICOM_TRACE
     fprintf(stderr, "writing VTK\n");
-
+#endif
     vtkSmartPointer<vtkDataSetWriter> writer = vtkSmartPointer<vtkDataSetWriter>::New();
     writer->SetInputConnection(reader->GetOutputPort());
@@ -242 +251 @@
     writer->WriteToOutputStringOn();
     writer->Update();
-
+#ifdef RP_DICOM_TRACE
     fprintf(stderr, "writing VTK...done\n");
-
+#endif
     Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("vtkdata", -1));
 

branches/1.3/gui/src/RpReadPoints.c

@@ -88 +88 @@
     return TCL_OK;
 }
-    
+
 /* 
  *  ReadPoints string dimVar pointsVar