Changeset 4128


Ignore:
Timestamp:
Jan 16, 2014 12:57:37 PM (7 years ago)
Author:
ldelgass
Message:

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

Location:
trunk/gui/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/gui/src/Makefile.in

    r4118 r4128  
    3232VTK_VERSION     = @VTK_VERSION@
    3333ENABLE_VTK_DICOM= @ENABLE_VTK_DICOM@
    34 VTK_LIB_SPEC    = -lvtkIOCore-$(VTK_VERSION) -lvtkIOLegacy-$(VTK_VERSION) -lvtkIOImage-$(VTK_VERSION)
     34VTK_LIB_SPEC    = -lvtkIOCore-$(VTK_VERSION) -lvtkIOLegacy-$(VTK_VERSION) -lvtkIOImage-$(VTK_VERSION) -lvtkCommonCore-$(VTK_VERSION)
    3535
    3636CC_SWITCHES     = $(SHLIB_CFLAGS) $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
  • trunk/gui/src/RpDicomToVtk.cc

    r4126 r4128  
    6060    }
    6161
     62#ifdef USE_VTK_DICOM_PACKAGE
    6263    vtkSmartPointer<vtkDICOMReader> reader = vtkSmartPointer<vtkDICOMReader>::New();
    63 #ifdef USE_VTK_DICOM_PACKAGE
    6464    vtkSmartPointer<vtkDICOMSorter> sorter = vtkSmartPointer<vtkDICOMSorter>::New();
    6565    if (isDir) {
     
    162162    fprintf(stderr, "Number of data elements: %d\n", md->GetNumberOfDataElements());
    163163
     164    Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("num_files", -1));
     165    Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewIntObj(md->GetNumberOfInstances()));
    164166    Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("num_components", -1));
    165167    Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewIntObj(numComp));
     
    194196    Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("time_spacing", -1));
    195197    Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewDoubleObj(reader->GetTimeSpacing()));
    196 
    197     fprintf(stderr, "Time dim: %d, spacing: %g\n", reader->GetTimeDimension(), reader->GetTimeSpacing());
    198     fprintf(stderr, "Number of files: %d\n", md->GetNumberOfInstances());
    199198#else
    200199    Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("patient_name", -1));
     
    219218    Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewStringObj("gantry_angle", -1));
    220219    Tcl_ListObjAppendElement(interp, metaDataObj, Tcl_NewDoubleObj(reader->GetGantryAngle()));
    221 
    222     fprintf(stderr, "Patient name: %s\n", reader->GetPatientName());
    223     fprintf(stderr, "Transfer Syntax UID: %s\n", reader->GetTransferSyntaxUID());
    224     fprintf(stderr, "Study UID: %s\n", reader->GetStudyUID());
    225     fprintf(stderr, "Study ID: %s\n", reader->GetStudyID());
    226     fprintf(stderr, "Components: %d\n", reader->GetNumberOfComponents());
    227     fprintf(stderr, "Bits Allocated: %d\n", reader->GetBitsAllocated());
    228     fprintf(stderr, "Pixel rep: %d (%s)\n", reader->GetPixelRepresentation(), reader->GetPixelRepresentation() ? "signed" : "unsigned");
     220#if 0
    229221    fprintf(stderr, "Position: %g %g %g\n",
    230222            reader->GetImagePositionPatient()[0],
     
    238230            reader->GetImageOrientationPatient()[4],
    239231            reader->GetImageOrientationPatient()[5]);
    240     fprintf(stderr, "Rescale slope: %g, offset: %g\n", reader->GetRescaleSlope(), reader->GetRescaleOffset());
    241     fprintf(stderr, "Gantry angle: %g\n", reader->GetGantryAngle());
     232#endif
    242233#endif
    243234
Note: See TracChangeset for help on using the changeset viewer.