Changeset 4128 for trunk/gui/src/RpDicomToVtk.cc

Timestamp:

Jan 16, 2014, 12:57:37 PM (11 years ago)

Author:

ldelgass

Message:

Fix for building --without-vtkdicom (the current default)

File:

• trunk/gui/src/RpDicomToVtk.cc (modified) (5 diffs)

trunk/gui/src/RpDicomToVtk.cc

@@ -60 +60 @@
     }
 
+#ifdef USE_VTK_DICOM_PACKAGE
     vtkSmartPointer<vtkDICOMReader> reader = vtkSmartPointer<vtkDICOMReader>::New();
-#ifdef USE_VTK_DICOM_PACKAGE
     vtkSmartPointer<vtkDICOMSorter> sorter = vtkSmartPointer<vtkDICOMSorter>::New();
     if (isDir) {
@@ -162 +162 @@
     fprintf(stderr, "Number of data elements: %d\n", md->GetNumberOfDataElements());
 
+    Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("num_files", -1));
+    Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewIntObj(md->GetNumberOfInstances()));
     Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("num_components", -1));
     Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewIntObj(numComp));
@@ -194 +196 @@
     Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("time_spacing", -1));
     Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewDoubleObj(reader->GetTimeSpacing()));
-
-    fprintf(stderr, "Time dim: %d, spacing: %g\n", reader->GetTimeDimension(), reader->GetTimeSpacing());
-    fprintf(stderr, "Number of files: %d\n", md->GetNumberOfInstances());
 #else
     Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("patient_name", -1));
@@ -219 +218 @@
     Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("gantry_angle", -1));
     Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewDoubleObj(reader->GetGantryAngle()));
-
-    fprintf(stderr, "Patient name: %s\n", reader->GetPatientName());
-    fprintf(stderr, "Transfer Syntax UID: %s\n", reader->GetTransferSyntaxUID());
-    fprintf(stderr, "Study UID: %s\n", reader->GetStudyUID());
-    fprintf(stderr, "Study ID: %s\n", reader->GetStudyID());
-    fprintf(stderr, "Components: %d\n", reader->GetNumberOfComponents());
-    fprintf(stderr, "Bits Allocated: %d\n", reader->GetBitsAllocated());
-    fprintf(stderr, "Pixel rep: %d (%s)\n", reader->GetPixelRepresentation(), reader->GetPixelRepresentation() ? "signed" : "unsigned");
+#if 0
     fprintf(stderr, "Position: %g %g %g\n",
             reader->GetImagePositionPatient()[0],
@@ -238 +230 @@
             reader->GetImageOrientationPatient()[4], 
             reader->GetImageOrientationPatient()[5]);
-    fprintf(stderr, "Rescale slope: %g, offset: %g\n", reader->GetRescaleSlope(), reader->GetRescaleOffset());
-    fprintf(stderr, "Gantry angle: %g\n", reader->GetGantryAngle());
+#endif
 #endif