debian/0000775000000000000000000000000012132127131007161 5ustar debian/patches/0000775000000000000000000000000012132126600010610 5ustar debian/patches/fixuptcl.patch0000664000000000000000000000426511702043065013503 0ustar Description: Fix issues with using system install Tcl/Tk 8.5 Author: Mathieu Malaterre Last-Update: 2011-11-27 Forwarded: not-needed Index: volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt 2011-07-18 10:01:20.000000000 +0000 +++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt 2012-01-07 13:17:16.000000000 +0000 @@ -15,7 +15,9 @@ ENDIF(COMMAND CMAKE_POLICY) PROJECT(VolView) - +include_directories( + ${TCL_INCLUDE_PATH} + ) # -------------------------------------------------------------------------- # We need VolViewLibraries Index: volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt 2012-01-07 12:56:34.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt 2012-01-07 12:56:34.000000000 +0000 @@ -16,7 +16,10 @@ PROJECT(KWVolView) - +include_directories( + ${TCL_INCLUDE_PATH} + /usr/include/VTKEdge + ) INCLUDE_REGULAR_EXPRESSION("^.*$") # -------------------------------------------------------------------------- @@ -540,8 +543,10 @@ TARGET_LINK_LIBRARIES(KWVolView ${KWWidgetsPro_LIBRARIES} ${VTKEdge_LIBRARIES} - cmtar - Curl + vtkKWEWidgets + vtkKWEVolumeRendering + #cmtar + curl ) IF(KWVolView_USE_GDCM) Index: volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2012-01-07 12:56:34.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2012-01-07 13:17:42.000000000 +0000 @@ -15,7 +15,10 @@ ENDIF(COMMAND CMAKE_POLICY) PROJECT(KWWidgetsPro) - +find_package(TCL REQUIRED) +include_directories( + ${TCL_INCLUDE_PATH} +) # -------------------------------------------------------------------------- # To use this library in a larger project you will need to SUBDIR into this # directory so that it gets built and then you will use the following variables debian/patches/fixmath.patch0000664000000000000000000002362311664452643013321 0ustar Description: Fix new API in VTK for converting radian to degree Author: Mathieu Malaterre Last-Update: 2011-11-27 Forwarded: not-needed Index: volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx 2011-09-05 15:43:10.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx 2011-09-05 15:43:58.000000000 +0000 @@ -1070,7 +1070,7 @@ { return; } - double theta = vtkMath::DoubleRadiansToDegrees() * acos( dotproduct ); + double theta = vtkMath::DegreesFromRadians( acos( dotproduct ) ); // Manipulate the transform to reflect the rotation this->Transform->Identity(); Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx 2011-09-05 15:43:10.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx 2011-09-05 15:43:58.000000000 +0000 @@ -59,8 +59,8 @@ atan2((double)rwi->GetLastEventPosition()[1] - (double)center[1], (double)rwi->GetLastEventPosition()[0] - (double)center[0]); - newAngle *= vtkMath::RadiansToDegrees(); - oldAngle *= vtkMath::RadiansToDegrees(); + newAngle = vtkMath::DegreesFromRadians( newAngle ); + oldAngle = vtkMath::DegreesFromRadians( oldAngle ); widget->RollPlane(newAngle - oldAngle); } @@ -94,8 +94,8 @@ double rxf = (double)dx * delta_azimuth * motionFactor; double ryf = (double)dy * delta_elevation * motionFactor; - rxf *= vtkMath::RadiansToDegrees(); - ryf *= vtkMath::RadiansToDegrees(); + rxf *= vtkMath::DegreesFromRadians( rxf ); + ryf *= vtkMath::DegreesFromRadians( ryf ); widget->TiltPlane(rxf, ryf); this->InvokeEvent(vtkKWEvent::ResliceChangingEvent, NULL); Index: volview-3.4/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx 2011-09-05 15:43:10.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx 2011-09-05 15:43:58.000000000 +0000 @@ -196,6 +196,7 @@ { quiet = appPro->GetTestingMode(); } - return this->Superclass::SaveScreenshotAllWidgetsToFile( filename, quiet ); + //return this->Superclass::SaveScreenshotAllWidgetsToFile( filename, quiet ); + return 0; } Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx 2011-09-05 15:43:10.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx 2011-09-05 15:43:58.000000000 +0000 @@ -584,7 +584,7 @@ return; } double cos_theta = vtkMath::Dot(oldz, z); - double theta = acos( cos_theta )*vtkMath::DoubleRadiansToDegrees(); + double theta = vtkMath::DegreesFromRadians( acos( cos_theta ) ); this->Transform->Identity(); this->Transform->Translate(origin[0],origin[1],origin[2]); this->Transform->RotateWXYZ(theta,axis); Index: volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h 2011-09-05 15:43:10.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h 2011-09-05 15:43:58.000000000 +0000 @@ -43,7 +43,7 @@ VolumeMapper = vtkSmartPointer< vtkPolyDataMapper >::New(); ObliqueMapper = vtkSmartPointer< vtkPolyDataMapper >::New(); ObliquePlaneCutter = vtkSmartPointer< vtkCutter >::New(); - ObliquePlane = vtkSmartPointer< vtkCutter >::New(); + ObliquePlane = vtkSmartPointer< vtkPlane >::New(); VolumeMapper->ScalarVisibilityOff(); ObliqueMapper->ScalarVisibilityOff(); ObliqueMapper->SetResolveCoincidentTopologyToPolygonOffset(); Index: volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx 2011-09-05 15:43:10.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx 2011-09-05 15:43:58.000000000 +0000 @@ -364,9 +364,9 @@ this->SupportsCompression( strategy )) { writer->SetCompression(true); - writer->SetCompressionTypeToJPEG2000(); - writer->SetJPEG2000CompressionRatio( this->CompressionRatio ); - writer->SetJPEG2000UseIrreversibleKernel(0); + //writer->SetCompressionTypeToJPEG2000(); + //writer->SetJPEG2000CompressionRatio( this->CompressionRatio ); + //writer->SetJPEG2000UseIrreversibleKernel(0); statusString = "Compressing using JPEG2000 .."; } @@ -375,7 +375,7 @@ { // Deflate stream is written out as a single file. writer->SetCompression(true); - writer->SetCompressionTypeToDeflate(); + //writer->SetCompressionTypeToDeflate(); statusString = "Compressing using Deflate .."; } Index: volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx 2011-09-05 15:43:10.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx 2011-09-05 15:43:58.000000000 +0000 @@ -532,7 +532,7 @@ this->VolumePropertyPresetSelector->FilterButtonVisibilityOn(); this->VolumePropertyPresetSelector->LocateButtonVisibilityOn(); this->VolumePropertyPresetSelector->EmailButtonVisibilityOn(); - this->VolumePropertyPresetSelector->RemovePresetAlsoRemoveFileOn(); + //this->VolumePropertyPresetSelector->RemovePresetAlsoRemoveFileOn(); this->VolumePropertyPresetSelector->SetPresetAddCommand( this, "VolumePropertyPresetAddCallback"); this->VolumePropertyPresetSelector->SetPresetUpdateCommand( @@ -607,7 +607,7 @@ this->WindowLevelPresetSelector->ThumbnailColumnVisibilityOn(); this->WindowLevelPresetSelector->LocateButtonVisibilityOn(); this->WindowLevelPresetSelector->EmailButtonVisibilityOn(); - this->WindowLevelPresetSelector->RemovePresetAlsoRemoveFileOn(); + //this->WindowLevelPresetSelector->RemovePresetAlsoRemoveFileOn(); this->WindowLevelPresetSelector->SetPresetAddCommand( this, "WindowLevelPresetAddCallback"); this->WindowLevelPresetSelector->SetPresetUpdateCommand( Index: volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx 2011-09-05 15:43:10.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx 2011-09-05 15:43:58.000000000 +0000 @@ -682,10 +682,10 @@ list->FindAndDeleteRow(0, labels->GetDirectionCosineLabel()); } - if (med_prop && med_prop->GetTableHeight()) + if (med_prop /*&& med_prop->GetTableHeight()*/) { - list->FindAndInsertCellText(0, labels->GetTableHeightLabel(), - 1, med_prop->GetTableHeight()); +// list->FindAndInsertCellText(0, labels->GetTableHeightLabel(), +// 1, med_prop->GetTableHeight()); } else { Index: volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx 2011-09-05 15:43:10.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx 2011-09-05 15:43:58.000000000 +0000 @@ -196,8 +196,8 @@ this->UndoStrokeButton->SetText("Undo stroke"); this->UndoStrokeButton->SetBalloonHelpString( "Undo the last draw/erase stroke"); - this->UndoStrokeButton->SetImageToPredefinedIcon( - vtkKWIcon::IconSilkArrowUndo); + //this->UndoStrokeButton->SetImageToPredefinedIcon( + // vtkKWIcon::IconSilkArrowUndo); this->AddWidget(this->UndoStrokeButton); // Redo @@ -208,8 +208,8 @@ this->RedoStrokeButton->SetText("Redo stroke"); this->RedoStrokeButton->SetBalloonHelpString( "Redo the last draw/erase stroke"); - this->RedoStrokeButton->SetImageToPredefinedIcon( - vtkKWIcon::IconSilkArrowRedo); + //this->RedoStrokeButton->SetImageToPredefinedIcon( + // vtkKWIcon::IconSilkArrowRedo); this->AddWidget(this->RedoStrokeButton); if (use_sep) @@ -438,4 +438,4 @@ { this->Superclass::PrintSelf(os,indent); os << indent << "SupportMultiSketchOperations: " << (this->GetSupportMultiSketchOperations() ? "on":"off") << endl; -} \ No newline at end of file +} Index: volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx 2011-09-05 15:43:10.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx 2011-09-05 15:43:58.000000000 +0000 @@ -598,8 +598,8 @@ this->PopulateInteractorWidgets(); this->InteractorWidgetSelector->Update(); this->InteractorWidgetSelector->SetEnabled(data ? this->GetEnabled() : 0); - this->InteractorWidgetPropertiesUpdatedCallback( - this->InteractorWidgetSelector->GetIdOfVisibleSelectedPreset()); + //this->InteractorWidgetPropertiesUpdatedCallback( + // this->InteractorWidgetSelector->GetIdOfVisibleSelectedPreset()); } } debian/patches/removemarkov.patch0000664000000000000000000000372711664452643014401 0ustar Description: Can't get plugin to compile: VolViewLibraries/KWVolView/Plugins/ITK/vvITKScalarKmeansMarkovRandomFieldToPaintbrush.h:441:7: error: no matching function for call to 'itk::Statistics::DistanceToCentroidMembershipFunction >::SetCentroid(vnl_vector&)' VolViewLibraries/KWVolView/Plugins/ITK/vvITKScalarKmeansMarkovRandomFieldToPaintbrush.h:441:7: note: candidate is: /usr/include/InsightToolkit/Review/Statistics/itkDistanceToCentroidMembershipFunction.txx:37:1: note: void itk::Statistics::DistanceToCentroidMembershipFunction::SetCentroid(const CentroidType&) [with TVector = itk::Vector, itk::Statistics::DistanceToCentroidMembershipFunction::CentroidType = itk::Array] /usr/include/InsightToolkit/Review/Statistics/itkDistanceToCentroidMembershipFunction.txx:37:1: note: no known conversion for argument 1 from 'vnl_vector' to 'const CentroidType& {aka const itk::Array&}' Author: Mathieu Malaterre Last-Update: 2011-11-27 Forwarded: not-needed Index: volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 15:48:25.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 15:49:51.000000000 +0000 @@ -69,7 +69,7 @@ #vvITKMultimodalityRegistrationRigidJointHistogramPlotter #vvITKLandmarkPreparation #vvITKScalarImageKMeansClassifier - vvITKScalarKmeansMarkovRandomField + #vvITKScalarKmeansMarkovRandomField vvITKSigmoid #vvITKShapeDetectionModule #vvITKSurfaceSpline @@ -83,7 +83,7 @@ vvITKWatershedRGBModule #vvITKRigidMIMetricPlotter vvITKThresholdImageToPaintbrush - vvITKScalarKmeansMarkovRandomFieldToPaintbrush + #vvITKScalarKmeansMarkovRandomFieldToPaintbrush vvITKPaintbrushCrop vvITKMergePaintbrushLabelImages ) debian/patches/addtoplevelcmake.patch0000664000000000000000000002017511702043065015147 0ustar Description: This patch allows building VolView against installed libraries: * GDCM * VTKEdge * ITK * VTK * Curl * TclTk 8.5 Author: Mathieu Malaterre Last-Update: 2011-11-27 Forwarded: not-needed Index: volview-3.4/VolViewPlatformComplete/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewPlatformComplete/CMakeLists.txt 2011-09-03 16:03:20.000000000 +0200 +++ volview-3.4/VolViewPlatformComplete/CMakeLists.txt 2011-09-03 16:08:28.000000000 +0200 @@ -133,7 +133,7 @@ NOT ITK_SOURCE_DIR OR NOT VolViewLibraries_SOURCE_DIR OR NOT VolViewApplications_SOURCE_DIR) - message(FATAL_ERROR "Make sure the source directories for the following components are set:\n - VTK,\n - KWWidgets,\n - ITK,\n - VolViewLibraries,\n - VolViewApplications.") +# message(FATAL_ERROR "Make sure the source directories for the following components are set:\n - VTK,\n - KWWidgets,\n - ITK,\n - VolViewLibraries,\n - VolViewApplications.") endif(NOT VTK_SOURCE_DIR OR NOT KWWidgets_SOURCE_DIR OR NOT ITK_SOURCE_DIR OR @@ -256,9 +256,9 @@ set(TclTk_LIB_DIR "${PROJECT_BINARY_DIR}/lib") set(TclTk_INSTALL_LIB_DIR "/lib") set(TclTk_INSTALL_BIN_DIR ${VolViewPlatform_INSTALL_BIN_DIR}) -add_subdirectory( - ${VolViewLibraries_SOURCE_DIR}/Utilities/TclTk - ${VolViewPlatform_BINARY_DIR}/VolViewLibraries/Utilities/TclTk) +#add_subdirectory( +# ${VolViewLibraries_SOURCE_DIR}/Utilities/TclTk +# ${VolViewPlatform_BINARY_DIR}/VolViewLibraries/Utilities/TclTk) set(OLD_BUILD_TESTING ${BUILD_TESTING}) set(BUILD_TESTING ${VTK_BUILD_TESTING}) @@ -266,7 +266,7 @@ set(METAIO_USE_OpenJPEG_DEFAULT ON) set(VTK_DIR ${VolViewPlatform_BINARY_DIR}/VTK) -add_subdirectory(${VTK_SOURCE_DIR} ${VTK_DIR}) +#add_subdirectory(${VTK_SOURCE_DIR} ${VTK_DIR}) set(BUILD_TESTING ${OLD_BUILD_TESTING}) @@ -322,8 +322,8 @@ # Volumetric Compression) among other things. SET( GDCM_USE_SYSTEM_OpenJPEG ON CACHE INTERNAL "" FORCE ) -set(GDCM_DIR ${VolViewPlatform_BINARY_DIR}/VolViewLibraries/Utilities/gdcm) -add_subdirectory(${VolViewLibraries_SOURCE_DIR}/Utilities/gdcm ${GDCM_DIR}) +#set(GDCM_DIR ${VolViewPlatform_BINARY_DIR}/VolViewLibraries/Utilities/gdcm) +#add_subdirectory(${VolViewLibraries_SOURCE_DIR}/Utilities/gdcm ${GDCM_DIR}) # -------------------------------------------------------------------------- # VolViewLibraries: Utilities: gettext @@ -341,8 +341,8 @@ set(OLD_BUILD_TESTING ${BUILD_TESTING}) set(BUILD_TESTING ${ITK_BUILD_TESTING}) -set(ITK_DIR ${VolViewPlatform_BINARY_DIR}/ITK) -add_subdirectory(${ITK_SOURCE_DIR} ${ITK_DIR}) +#set(ITK_DIR ${VolViewPlatform_BINARY_DIR}/ITK) +#add_subdirectory(${ITK_SOURCE_DIR} ${ITK_DIR}) set(BUILD_TESTING OFF) set(LesionSizingKit_DIR ${VolViewPlatform_BINARY_DIR}/LesionSizingKit) @@ -362,12 +362,12 @@ find_package(VTK REQUIRED) include(${VTK_USE_FILE}) -set(KWWidgets_DIR ${VolViewPlatform_BINARY_DIR}/KWWidgets) +#set(KWWidgets_DIR ${VolViewPlatform_BINARY_DIR}/KWWidgets) set(HTML_HELP_INCLUDE_PATH "" CACHE INTERNAL "" FORCE) set(HTML_HELP_LIBRARY "" CACHE INTERNAL "" FORCE) -add_subdirectory(${KWWidgets_SOURCE_DIR} ${KWWidgets_DIR}) +#add_subdirectory(${KWWidgets_SOURCE_DIR} ${KWWidgets_DIR}) # -------------------------------------------------------------------------- # VolViewLibraries Index: volview-3.4/VolViewLibraries/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewLibraries/CMakeLists.txt 2011-09-03 16:04:08.000000000 +0200 +++ volview-3.4/VolViewLibraries/CMakeLists.txt 2011-09-03 16:15:16.000000000 +0200 @@ -317,7 +317,7 @@ set(VTKEdge_BUILD_VolumeRendering_KIT_DEFAULT ON) set(VTKEdge_BUILD_Widgets_KIT_DEFAULT ON) set(VTKEdge_USE_ITK_DEFAULT ON) -subdirs(VTKEdge) +#subdirs(VTKEdge) mark_as_advanced( VTKEdge_BUILD_EXAMPLES VTKEdge_BUILD_PARAVIEW_PLUGINS @@ -377,7 +377,7 @@ subdirs(Utilities/ctnlib) # Curl -subdirs( Utilities/Curl ) +#subdirs( Utilities/Curl ) # -------------------------------------------------------------------------- # Utilities: gettext @@ -404,7 +404,7 @@ ${VTK_SOURCE_DIR} ${VTK_BINARY_DIR} ) -subdirs(Utilities/cmtar) +#subdirs(Utilities/cmtar) # with -fPIC if(UNIX AND NOT WIN32) find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) Index: volview-3.4/VolViewLibraries/KWCommonPro/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewLibraries/KWCommonPro/CMakeLists.txt 2011-09-03 16:17:24.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWCommonPro/CMakeLists.txt 2011-09-03 16:24:46.000000000 +0200 @@ -95,7 +95,7 @@ "Build KWCommonPro using GDCM DICOM support." ${default_val}) MARK_AS_ADVANCED(KWCommonPro_USE_GDCM) IF(KWCommonPro_USE_GDCM) - KWCommonPro_REQUIRE_PACKAGE(GDCM) + #KWCommonPro_REQUIRE_PACKAGE(GDCM) ENDIF(KWCommonPro_USE_GDCM) # -------------------------------------------------------------------------- Index: volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-03 19:12:06.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-03 19:12:33.000000000 +0200 @@ -75,7 +75,7 @@ # VTKEdge -KWWidgetsPro_REQUIRE_PACKAGE(VTKEdge) +#KWWidgetsPro_REQUIRE_PACKAGE(VTKEdge) # -------------------------------------------------------------------------- # Output directories Index: volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-03 19:13:06.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-03 19:14:58.000000000 +0200 @@ -78,10 +78,10 @@ "Build KWVolView with GDCM support." ${default_val}) MARK_AS_ADVANCED(KWVolView_USE_GDCM) IF(KWVolView_USE_GDCM) - KWVolView_REQUIRE_PACKAGE(GDCM) - IF(NOT GDCM_VTK) - MESSAGE(FATAL_ERROR "GDCM_VTK is OFF. Please configure and build GDCM with GDCM_VTK set to ON in order to use GDCM's reader and writer classes for VTK.") - ENDIF(NOT GDCM_VTK) + #KWVolView_REQUIRE_PACKAGE(GDCM) + #IF(NOT GDCM_VTK) + # MESSAGE(FATAL_ERROR "GDCM_VTK is OFF. Please configure and build GDCM with GDCM_VTK set to ON in order to use GDCM's reader and writer classes for VTK.") + #ENDIF(NOT GDCM_VTK) ENDIF(KWVolView_USE_GDCM) @@ -94,7 +94,7 @@ # VTKEdge -KWVolView_REQUIRE_PACKAGE(VTKEdge) +#KWVolView_REQUIRE_PACKAGE(VTKEdge) # Use the lesion sizing toolkit ? Index: volview-3.4/VolViewLibraries/KWVolView/CMake/ExportConfiguration/UseKWVolView.cmake =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/CMake/ExportConfiguration/UseKWVolView.cmake 2011-09-03 19:16:08.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWVolView/CMake/ExportConfiguration/UseKWVolView.cmake 2011-09-03 19:16:57.000000000 +0200 @@ -60,23 +60,23 @@ # Use VTKEdge. IF(NOT KWVolView_NO_USE_VTKEdge) SET(VTKEdge_DIR ${KWVolView_VTKEdge_DIR}) - FIND_PACKAGE(VTKEdge) - IF(VTKEdge_FOUND) - INCLUDE(${VTKEdge_USE_FILE}) - ELSE(VTKEdge_FOUND) - MESSAGE("VTKEdge not found in KWVolView_VTKEdge_DIR=\"${KWVolView_VTKEdge_DIR}\".") - ENDIF(VTKEdge_FOUND) + #FIND_PACKAGE(VTKEdge) + #IF(VTKEdge_FOUND) + # INCLUDE(${VTKEdge_USE_FILE}) + #ELSE(VTKEdge_FOUND) + # MESSAGE("VTKEdge not found in KWVolView_VTKEdge_DIR=\"${KWVolView_VTKEdge_DIR}\".") + #ENDIF(VTKEdge_FOUND) ENDIF(NOT KWVolView_NO_USE_VTKEdge) # Use GDCM. IF(KWVolView_USE_GDCM) SET(GDCM_DIR ${KWVolView_GDCM_DIR}) - FIND_PACKAGE(GDCM) - IF(GDCM_FOUND) - INCLUDE(${GDCM_USE_FILE}) - ELSE(GDCM_FOUND) - MESSAGE("GDCM not found in KWVolView_GDCM_DIR=\"${KWVolView_GDCM_DIR}\".") - ENDIF(GDCM_FOUND) + #FIND_PACKAGE(GDCM) + #IF(GDCM_FOUND) + # INCLUDE(${GDCM_USE_FILE}) + #ELSE(GDCM_FOUND) + # MESSAGE("GDCM not found in KWVolView_GDCM_DIR=\"${KWVolView_GDCM_DIR}\".") + #ENDIF(GDCM_FOUND) ENDIF(KWVolView_USE_GDCM) ENDIF(NOT KWVolView_USE_FILE_INCLUDED) debian/patches/updategdcm.patch0000664000000000000000000000421211664452643013767 0ustar Description: VolView uses GDCM 1.x API, replace with GDCM 2.x API Author: Mathieu Malaterre Last-Update: 2011-11-27 Forwarded: not-needed Index: volview-3.4/VolViewLibraries/KWCommonPro/vtkDICOMCollector.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWCommonPro/vtkDICOMCollector.cxx 2011-09-03 23:59:11.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWCommonPro/vtkDICOMCollector.cxx 2011-09-04 00:08:24.000000000 +0200 @@ -45,10 +45,10 @@ #include #ifdef KWCommonPro_USE_GDCM - #include "gdcmFileHelper.h" + //#include "gdcmFileHelper.h" #include "gdcmFile.h" - #include "gdcmDebug.h" - #include "gdcmCommon.h" + //#include "gdcmDebug.h" + //#include "gdcmCommon.h" #endif #ifdef KWCommonPro_USE_CTNLIB @@ -2567,13 +2567,13 @@ (&object, &dcm_table_height, &rtn_length, &ctx) != DCM_NORMAL || !rtn_length) { - hinfo->SetTableHeight(NULL); + //hinfo->SetTableHeight(NULL); } else { #endif table_height[rtn_length] = '\0'; - hinfo->SetTableHeight(table_height); + //hinfo->SetTableHeight(table_height); } #endif @@ -2728,9 +2728,10 @@ #if defined(KWCommonPro_USE_GDCM) && KWCommonPro_USE_GDCM_FOR_IMAGE gdcm::File *file = new gdcm::File(); - file->SetFileName(image->GetFileName()); - file->Load(); - if (!file->IsReadable()) + //file->SetFileName(image->GetFileName()); + //file->Load(); + //if(1||/*!file->IsReadable()*/) + if(1) #elif defined(KWCommonPro_USE_CTNLIB) DCM_OBJECT *object = NULL; DCM_Debug(FALSE); @@ -2758,10 +2759,10 @@ #if defined(KWCommonPro_USE_GDCM) && KWCommonPro_USE_GDCM_FOR_IMAGE - gdcm::FileHelper *file_helper = new gdcm::FileHelper(file); - size_t image_data_size = file_helper->GetImageDataSize(); - memcpy(data, file_helper->GetImageData(), image_data_size); - delete file_helper; + //gdcm::FileHelper *file_helper = new gdcm::FileHelper(file); + //size_t image_data_size = file_helper->GetImageDataSize(); + //memcpy(data, file_helper->GetImageData(), image_data_size); + //delete file_helper; high_bit = bits_stored - 1; debian/patches/removerpath.patch0000664000000000000000000000201411703051742014171 0ustar Description: We are using a shared forwared executable 'volview' which simply calls /usr/lib/VolView/VolView, rpath is not required anymore Author: Mathieu Malaterre Last-Update: 2012-01-10 Forwarded: not-needed Index: volview-3.4/VolViewPlatformComplete/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewPlatformComplete/CMakeLists.txt 2012-01-07 14:12:40.000000000 +0000 +++ volview-3.4/VolViewPlatformComplete/CMakeLists.txt 2012-01-07 14:26:01.000000000 +0000 @@ -85,8 +85,8 @@ # easier to use. The install tree would be busted anyway and require # special launchers. -set(CMAKE_SKIP_RPATH OFF CACHE INTERNAL "" FORCE) -set(VTK_USE_RPATH ON CACHE INTERNAL "" FORCE) +set(CMAKE_SKIP_RPATH ON CACHE INTERNAL "" FORCE) +set(VTK_USE_RPATH OFF CACHE INTERNAL "" FORCE) set(VTKEdge_PAINTBRUSH_LABEL_TYPE "VTK_UNSIGNED_CHAR" CACHE INTERNAL "" FORCE) if(APPLE) set(CMAKE_INSTALL_NAME_DIR "@executable_path/../lib" CACHE INTERNAL "" FORCE) debian/patches/fixfindtcl8.5.patch0000664000000000000000000000105412132067246014230 0ustar Index: volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt 2013-04-12 15:59:00.000000000 -0400 +++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt 2013-04-12 16:29:20.094364551 -0400 @@ -71,8 +71,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/vv-forward.c ) target_link_libraries(VolView -/usr/lib/libtcl8.5.so -/usr/lib/libtk8.5.so +tcl8.5 +tk8.5 ${OPENGL_LIBRARIES} ) install(TARGETS volview debian/patches/fixupcurl.patch0000664000000000000000000000373111664452643013700 0ustar Description: Use system installed curl, instead of convenient copy Author: Mathieu Malaterre Last-Update: 2011-11-27 Forwarded: not-needed Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx 2011-09-05 16:07:00.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx 2011-09-05 16:07:06.000000000 +0000 @@ -12,7 +12,7 @@ #include "vtkHTTPHandler.h" #include "vtkKWRemoteIOUtilities.h" -#include "Curl/curl/mprintf.h" +#include "curl/mprintf.h" vtkStandardNewMacro ( vtkHTTPHandler ); vtkCxxRevisionMacro ( vtkHTTPHandler, "$Revision: 1.10 $" ); Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx 2011-09-05 16:06:56.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx 2011-09-05 16:07:06.000000000 +0000 @@ -13,7 +13,7 @@ #include "vtkURIHandler.h" #include "vtkKWRemoteIOManager.h" -#include "Curl/curl/mprintf.h" +#include "curl/mprintf.h" //------------------------------------------------------------------------------ // The point of this function would be to return a string of the input data, Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h 2011-09-05 16:06:56.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h 2011-09-05 16:07:06.000000000 +0000 @@ -16,7 +16,7 @@ #pragma warning ( disable : 4786 ) #endif -#include "Curl/curl/curl.h" +#include "curl/curl.h" #include "vtkObjectFactory.h" #include #include debian/patches/fixupvtkedge.patch0000664000000000000000000000261411664452643014363 0ustar Description: VolView seems to requires files from VTKEdge 5.4 Author: Mathieu Malaterre Last-Update: 2011-11-27 Forwarded: not-needed Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWApplicationPro.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWApplicationPro.cxx 2011-09-04 00:37:52.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWApplicationPro.cxx 2011-09-04 00:40:03.000000000 +0200 @@ -32,9 +32,9 @@ #include "vtkKWCommonProConfigure.h" // Needed for KWCommonPro_USE_XML_RW #endif -#include "vtkKWEGPUInfoList.h" -#include "vtkKWEGPUInfo.h" -#include "vtkKWEGPUVolumeRayCastMapper.h" +//#include "vtkKWEGPUInfoList.h" +//#include "vtkKWEGPUInfo.h" +//#include "vtkKWEGPUVolumeRayCastMapper.h" #include #include @@ -295,6 +295,7 @@ // GPU +#if 0 vtkKWEGPUInfoList *l = vtkKWEGPUInfoList::New(); l->Probe(); if (l->GetNumberOfGPUs()) @@ -309,6 +310,7 @@ vtkKWEGPUVolumeRayCastMapper *mapper = vtkKWEGPUVolumeRayCastMapper::New(); os << k_("GPU Rendering") << ": " << (mapper->IsRenderSupported(renwin, NULL) ? k_("Supported") : k_("NOT supported")) << endl; mapper->Delete(); +#endif os << k_("Use GPU Rendering") << ": " << (this->UseGPURendering ? k_("Yes") : k_("No")) << endl; debian/patches/fixuptar.patch0000664000000000000000000000316411664452643013521 0ustar Description: VolView is using a special libtar library, not compatible with libtar-dev on debian remove tar functionalities for now Author: Mathieu Malaterre Last-Update: 2011-11-27 Forwarded: not-needed Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx 2011-09-05 16:02:26.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx 2011-09-05 16:04:23.000000000 +0000 @@ -21,8 +21,8 @@ #endif #include "vtkObjectFactory.h" -#include -#include +#include +//#include #include #include @@ -47,7 +47,7 @@ # include #endif -# include +# include # define cm_zlib_gzdopen gzdopen # define cm_zlib_gzclose gzclose # define cm_zlib_gzread gzread @@ -173,6 +173,7 @@ const char* rootDirectory, bool gzip, bool verbose) { +#if 0 TAR *t; char buf[TAR_MAXPATHLEN]; char pathname[TAR_MAXPATHLEN]; @@ -244,6 +245,7 @@ vtkGenericWarningMacro("Problem with tar_close(): "); return 0; } +#endif return 1; } @@ -253,7 +255,7 @@ const char *root_name, bool gzip) { - +#if 0 TAR *t; vtkKWRemoteIOUtilitiesGZStruct gzs; @@ -316,6 +318,7 @@ vtkGenericWarningMacro( << "Problem with tar_close(): " ); return 0; } +#endif return 1; } debian/patches/vvforward.patch0000664000000000000000000000426711703031223013661 0ustar Description: Because we reorganized the VolView install tree, we need to patch the forward-executable Author: Mathieu Malaterre Last-Update: 2011-11-27 Forwarded: not-needed Index: volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt 2012-01-07 14:12:44.000000000 +0000 +++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt 2012-01-08 21:37:39.000000000 +0000 @@ -45,3 +45,32 @@ INSTALL_DEFAULT_DATA_SAMPLES 1 DOCUMENTATION_FILE "Documentation/VolView 3 User Manual.pdf" ) + +set(dirs + "../lib/KWCommonPro" "../lib/KWCommon" "../lib/KWVolView" "../lib/VolViewApplications" "../lib/KWWidgetsPro" + ) + set(KWCommon_FORWARD_BIN_TO_LIB + "../lib/VolView" + ) + +foreach(dir ${dirs}) + set(OTHER_FORWARD + "${OTHER_FORWARD},\"${dir}\"") +endforeach() +set(KWCommon_FORWARD_EXE + VolView + ) +set(KWCommon_FORWARD_DIR_BUILD ${EXECUTABLE_OUTPUT_PATH}) +configure_file( + ${VolViewLibraries_SOURCE_DIR}/KWCommon/kw-forward.c.in + ${CMAKE_CURRENT_BINARY_DIR}/vv-forward.c + @ONLY + ) +add_executable( + volview + ${CMAKE_CURRENT_BINARY_DIR}/vv-forward.c + ) +install(TARGETS volview + # EXPORT ${TARGETS_NAME} + RUNTIME DESTINATION bin # COMPONENT Applications + ) Index: volview-3.4/VolViewLibraries/KWCommon/kw-forward.c.in =================================================================== --- volview-3.4.orig/VolViewLibraries/KWCommon/kw-forward.c.in 2012-01-07 14:06:01.000000000 +0000 +++ volview-3.4/VolViewLibraries/KWCommon/kw-forward.c.in 2012-01-07 14:12:45.000000000 +0000 @@ -12,7 +12,7 @@ #define vtksys_SHARED_FORWARD_DIR_BUILD "@KWCommon_FORWARD_DIR_BUILD@" #define vtksys_SHARED_FORWARD_PATH_BUILD "." -#define vtksys_SHARED_FORWARD_PATH_INSTALL "@KWCommon_FORWARD_BIN_TO_LIB@" +#define vtksys_SHARED_FORWARD_PATH_INSTALL "@KWCommon_FORWARD_BIN_TO_LIB@"@OTHER_FORWARD@ #define vtksys_SHARED_FORWARD_EXE_BUILD "@KWCommon_FORWARD_EXE@" #define vtksys_SHARED_FORWARD_EXE_INSTALL "@KWCommon_FORWARD_BIN_TO_LIB@/@KWCommon_FORWARD_EXE@" #define vtksys_SHARED_FORWARD_OPTION_PRINT "--print" debian/patches/fixmissingswab3.patch0000664000000000000000000000112612132126600014751 0ustar Index: volview-3.4/VolViewLibraries/Utilities/ctnlib/facilities/objects/dcm.c =================================================================== --- volview-3.4.orig/VolViewLibraries/Utilities/ctnlib/facilities/objects/dcm.c 2013-04-12 20:56:05.945795911 -0400 +++ volview-3.4/VolViewLibraries/Utilities/ctnlib/facilities/objects/dcm.c 2013-04-12 20:57:34.397709958 -0400 @@ -114,7 +114,7 @@ #include #endif /* declare swab */ -/*extern void swab(const void *from, void *to, ssize_t n);*/ +extern void swab(const void *from, void *to, ssize_t n); #ifdef MACOS #include debian/patches/fixfpic.patch0000664000000000000000000000555411737044341013305 0ustar Index: volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt 2012-04-02 21:59:10.000000000 +0200 +++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt 2012-04-02 22:22:24.000000000 +0200 @@ -70,6 +70,11 @@ volview ${CMAKE_CURRENT_BINARY_DIR}/vv-forward.c ) +target_link_libraries(VolView +/usr/lib/libtcl8.5.so +/usr/lib/libtk8.5.so +${OPENGL_LIBRARIES} +) install(TARGETS volview # EXPORT ${TARGETS_NAME} RUNTIME DESTINATION bin # COMPONENT Applications Index: volview-3.4/VolViewLibraries/KWCommonPro/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewLibraries/KWCommonPro/CMakeLists.txt 2012-04-02 22:19:51.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWCommonPro/CMakeLists.txt 2012-04-04 15:11:23.000000000 +0200 @@ -418,9 +418,11 @@ ${KWCommonPro_Instantiator_SRCS} ) +find_package(OpenGL REQUIRED) TARGET_LINK_LIBRARIES(KWCommonPro vtkHybrid ${KWCommon_LIBRARIES} + ${OPENGL_LIBRARIES} ) IF(KWCommonPro_USE_XML_RW) @@ -428,7 +430,7 @@ ENDIF(KWCommonPro_USE_XML_RW) IF(KWCommonPro_USE_GDCM) - TARGET_LINK_LIBRARIES(KWCommonPro ${GDCM_LIBRARIES}) + TARGET_LINK_LIBRARIES(KWCommonPro ${GDCM_LIBRARIES} gdcmMSFF) ENDIF(KWCommonPro_USE_GDCM) IF(KWCommonPro_USE_CTNLIB) Index: volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2012-04-02 22:23:09.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2012-04-02 22:25:02.000000000 +0200 @@ -386,6 +386,7 @@ TARGET_LINK_LIBRARIES(KWWidgetsPro ${KWWidgets_LIBRARIES} ${VTKEdge_LIBRARIES} + ${OPENGL_LIBRARIES} ) IF(KWWidgets_BUILD_VTK_WIDGETS) Index: volview-3.4/VolViewLibraries/KWCommon/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewLibraries/KWCommon/CMakeLists.txt 2012-04-02 22:27:12.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWCommon/CMakeLists.txt 2012-04-02 22:27:22.000000000 +0200 @@ -50,6 +50,7 @@ # We need VTK IF(NOT VTK_SOURCE_DIR) + FIND_PACKAGE(OpenGL REQUIRED) FIND_PACKAGE(VTK REQUIRED) INCLUDE(${VTK_USE_FILE}) ENDIF(NOT VTK_SOURCE_DIR) Index: volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt 2012-04-02 22:01:26.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt 2012-04-02 22:33:58.000000000 +0200 @@ -547,6 +547,10 @@ vtkKWEVolumeRendering #cmtar curl + vtkIOTCL + vtkGraphicsTCL + vtkImagingTCL + vtkFilteringTCL ) IF(KWVolView_USE_GDCM) debian/patches/fixslcreader.patch0000664000000000000000000000154011664452643014326 0ustar Description: VolView uses an API that never was merged into VTK Author: Mathieu Malaterre Last-Update: 2011-11-27 Forwarded: not-needed Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWOpenFileHelper.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWOpenFileHelper.cxx 2011-09-05 11:30:13.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWOpenFileHelper.cxx 2011-09-05 11:30:38.000000000 +0200 @@ -468,8 +468,8 @@ reader = slcReader; if (this->CheckReader(reader, fname, bestReaderValue) == 3) { - slcReader->SpacingSpecifiedFlagOn(); - slcReader->OriginSpecifiedFlagOn(); + //slcReader->SpacingSpecifiedFlagOn(); + //slcReader->OriginSpecifiedFlagOn(); return vtkKWOpenFileHelper::FILE_IS_VALID; } debian/patches/kwevm_smartvm.patch0000664000000000000000000000751411664452643014564 0ustar Description: vtkKWEVolumeMapper has been renamed vtkSmartVolumeMapper in VTK 5.8.0 (after VTK 5.4 transition) Author: Mathieu Malaterre Last-Update: 2011-11-27 Forwarded: not-needed Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-07-15 20:03:03.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-06 12:12:35.000000000 +0200 @@ -52,7 +52,7 @@ #include "vtkKW3DSplineSurfacesWidget.h" #include "vtkKWApplication.h" #include "vtkKWApplicationPro.h" -#include "vtkKWEVolumeMapper.h" +#include "vtkSmartVolumeMapper.h" #include "vtkKWEvent.h" #include "vtkKWEventMap.h" #include "vtkKWFrame.h" @@ -117,7 +117,7 @@ this->Volume = vtkVolume::New(); - this->VolumeMapper = vtkKWEVolumeMapper::New(); + this->VolumeMapper = vtkSmartVolumeMapper::New(); this->Volume->SetMapper(this->VolumeMapper); this->Volume->SetProperty(this->VolumeProperty); @@ -805,8 +805,8 @@ if (app_pro) { this->VolumeMapper->SetRequestedRenderMode( - app_pro->GetUseGPURendering() ? vtkKWEVolumeMapper::DefaultRenderMode - : vtkKWEVolumeMapper::RayCastAndTextureRenderMode); + app_pro->GetUseGPURendering() ? vtkSmartVolumeMapper::DefaultRenderMode + : vtkSmartVolumeMapper::RayCastAndTextureRenderMode); // : vtkKWEVolumeMapper::RayCastRenderMode); } @@ -1210,10 +1210,10 @@ (this->RenderMode == vtkKWRenderWidget::InteractiveRender) ||// we are interactive rendering (this->VolumeMapper->GetRequestedRenderMode() == - vtkKWEVolumeMapper::RayCastAndTextureRenderMode && + vtkSmartVolumeMapper::RayCastAndTextureRenderMode && !this->IsCreated()) || // we are not created but use raycast (this->VolumeMapper->GetRequestedRenderMode() == - vtkKWEVolumeMapper::DefaultRenderMode && + vtkSmartVolumeMapper::DefaultRenderMode && !this->IsMapped()) // we are not mapped and use GPU rendering ) { @@ -3644,7 +3644,7 @@ if (this->VolumeMapper) { this->AddVolumeMapperProgress( - this->VolumeMapper, + (vtkVolumeMapper*)this->VolumeMapper, ks_("Progress|Generating Image")); this->AddVolumeMapperGradientProgress( @@ -3727,8 +3727,8 @@ if (this->VolumeMapper) { this->VolumeMapper->SetRequestedRenderMode( - *iarg ? vtkKWEVolumeMapper::DefaultRenderMode - : vtkKWEVolumeMapper::RayCastAndTextureRenderMode); + *iarg ? vtkSmartVolumeMapper::DefaultRenderMode + : vtkSmartVolumeMapper::RayCastAndTextureRenderMode); } case vtkCommand::VolumeMapperRenderStartEvent: Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h =================================================================== --- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-07-15 20:03:03.000000000 +0200 +++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-09-06 12:12:35.000000000 +0200 @@ -30,7 +30,7 @@ class vtkKWInteractorStyleVolumeView; class vtkKWScalarBarWidget; class vtkKWScaleBarWidget; -class vtkKWEVolumeMapper; +class vtkSmartVolumeMapper; class vtkKWVolumeWidgetInternals; class vtkLight; class vtkPiecewiseFunction; @@ -81,7 +81,7 @@ // Description: // Accessors to the volume mapper - vtkGetObjectMacro(VolumeMapper, vtkKWEVolumeMapper); + vtkGetObjectMacro(VolumeMapper, vtkSmartVolumeMapper); // Description: // Projection type @@ -485,7 +485,7 @@ // Configure the event map virtual void ConfigureEventMap(); - vtkKWEVolumeMapper *VolumeMapper; + vtkSmartVolumeMapper *VolumeMapper; // Description: // Create the default renderers inside the render window. debian/patches/fixstring.patch0000664000000000000000000000175511713556357013702 0ustar Index: volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx =================================================================== --- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx 2012-02-01 21:57:15.000000000 +0100 +++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx 2012-02-01 22:30:04.000000000 +0100 @@ -190,14 +190,14 @@ switch (volume_data->GetScope()) { case vtkVVDataItem::ScopeMedical: - sprintf(buffer, ks_("Scope|Medical")); + sprintf(buffer, "%s", ks_("Scope|Medical")); break; case vtkVVDataItem::ScopeScientific: - sprintf(buffer, ks_("Scope|Scientific")); + sprintf(buffer, "%s", ks_("Scope|Scientific")); break; default: case vtkVVDataItem::ScopeUnknown: - sprintf(buffer, ks_("Scope|Unknown")); + sprintf(buffer, "%s", ks_("Scope|Unknown")); break; } list->FindAndInsertCellText(0, labels->GetDataScopeLabel(), debian/patches/series0000664000000000000000000000043312132070166012032 0ustar addtoplevelcmake.patch updategdcm.patch fixupvtkedge.patch fixslcreader.patch fixmath.patch removemarkov.patch kwevm_smartvm.patch fixuptcl.patch fixuptar.patch fixupcurl.patch vvforward.patch removerpath.patch fixstring.patch fixfpic.patch fixfindtcl8.5.patch fixmissingswab3.patch debian/rules0000775000000000000000000000212611735353330010254 0ustar #!/usr/bin/make -f #export DH_VERBOSE=1 DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk # http://bugs.debian.org/653916 CFLAGS += $(CPPFLAGS) CXXFLAGS += $(CPPFLAGS) DEB_HOST_ARCH:=$(shell dpkg-architecture -qDEB_HOST_ARCH) # http://bugs.debian.org/658273 CFLAGS += -fPIC CXXFLAGS += -fPIC LDFLAGS += -Wl,--as-needed %: dh $@ --parallel --sourcedirectory=VolViewPlatformComplete override_dh_auto_configure: dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo override_dh_compress: dh_compress -X.pdf override_dh_installdocs: # I could not figure out how to handle space in the filename with dh_installdocs #echo "$(DEB_BUILD_GNU_TYPE)" mkdir -p debian/volview/usr/share/doc/volview/ mv "debian/volview/usr/doc/VolView 3 User Manual.pdf" debian/volview/usr/share/doc/volview/VolView3UserManual.pdf rmdir debian/volview/usr/doc dh_installdocs override_dh_auto_install: dh_auto_install mv debian/volview/usr/bin/Plugins debian/volview/usr/lib/VolView mv debian/volview/usr/bin/VolView debian/volview/usr/lib/VolView get-orig-source: ./debian/get-orig-source debian/compat0000664000000000000000000000000211630202407010361 0ustar 8 debian/copyright0000664000000000000000000000620511735353330011131 0ustar Format: http://dep.debian.net/deps/dep5/ Upstream-Name: VolView Source: http://www.kitware.com/products/vvdownload.html Files: * Copyright: © 1999-2011 Kitware, Inc. License: BSD VolView uses an open-source license as follows: . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. . * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . * Neither the name of Kitware nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: VolViewLibraries/Utilities/ctnlib/* Copyright: 1993, RSNA and Washington University License: BSD The software and supporting documentation for the Radiological Society of North America (RSNA) 1993 Digital Imaging and Communications in Medicine (DICOM) Demonstration were developed at the Electronic Radiology Laboratory Mallinckrodt Institute of Radiology Washington University School of Medicine 510 S. Kingshighway Blvd. St. Louis, MO 63110 as part of the 1993 DICOM Central Test Node project for, and under contract with, the Radiological Society of North America. . THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND NEITHER RSNA NOR WASHINGTON UNIVERSITY MAKE ANY WARRANTY ABOUT THE SOFTWARE, ITS PERFORMANCE, ITS MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR USE, FREEDOM FROM ANY COMPUTER DISEASES OR ITS CONFORMITY TO ANY SPECIFICATION. THE ENTIRE RISK AS TO QUALITY AND PERFORMANCE OF THE SOFTWARE IS WITH THE USER. . Copyright of the software and supporting documentation is jointly owned by RSNA and Washington University, and free access is hereby granted as a license to use this software, copy this software and prepare derivative works based upon this software. However, any distribution of this software source code or supporting documentation or derivative works (source code and supporting documentation) must include the three paragraphs of the copyright notice. Files: debian/* Copyright: 2011-2012; Mathieu Malaterre License: BSD Same as above debian/doc-base.vv0000664000000000000000000000306211631351303011217 0ustar Document: volview Title: VolView 3.2 User Manual Author: Rick Avila Abstract: Welcome to VolView 3.2, a full featured data visualization application intended for the medical, scientific, and engineering research communities. VolView can interactively render, reformat, annotate, measure, animate and capture / print volumetric and image data, all of which can be saved into a visualization session file for use at a later time. The main features of VolView 3.2 include the ability to: • Simultaneously load a wide range of 2D and 3D image data formats including DICOM, TIFF, and JPEG images. • Rapidly volume render 3D scalar data with and without shading and support for maximum intensity projections. • Select from a collection of standard 2D/3D appearance presets. • Modify volume rendering transfer functions. • Perform 2D measurements including: linear, bi-dimensional, angular and contour. • Produce animations of 2D or 3D renderings. • Place 2D or 3D arrow and text annotations. • Save the entire system state into a session file, including snapshots of the system state, at multiple points during a visualization session. One of the strengths of VolView 3.2 is its ability to load and a wide range of display medical image data. However, it is important to recognize that VolView 3.2 has not been reviewed by government regulatory agencies (e.g. US FDA) and is not approved for clinical use. Section: Science/Medicine Format: PDF Files: /usr/share/doc/volview/VolView3UserManual.pdf debian/volview.desktop0000664000000000000000000000042411630465011012253 0ustar [Desktop Entry] Version=3.4.0 Name=VolView 3.4 GenericName=Advanced Volume Visualization Tool Comment=VolView allows volume viewing of image data sets Type=Application Terminal=false Icon=volview MimeType=application/x-volview; Categories=Education;Math;Science; Exec=volview debian/source/0000775000000000000000000000000011737054145010477 5ustar debian/source/format0000664000000000000000000000001411630202407011671 0ustar 3.0 (quilt) debian/get-orig-source0000775000000000000000000000320611707734720012142 0ustar #!/bin/sh set -eu PACKAGE=volview VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'` REVISION=`echo $VERSION | sed -e 's/^.*svn//g'` FOLDER=${PACKAGE}-${VERSION} TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz wget -c http://www.kitware.com/VolView/files/VolViewSrc.tar.gz tar xfz VolViewSrc.tar.gz # remove binaries: rm VolViewSrc/VolViewLibraries/Utilities/HtmlHelp/htmlhelp.lib rm VolViewSrc/VolViewApplications/Kitware/VolView/Testing/MouseRecorder/SelfPlayingScripts/*.exe # we are required to keep the .doc file, since it is the source for the pdf file # we are shipping with debian installation #rm VolViewSrc/VolViewApplications/Kitware/VolView/Documentation/*.doc # remove convenient libraries: rm -rf VolViewSrc/VolViewExternalLibraries/Insight/ rm -rf VolViewSrc/VolViewExternalLibraries/KWWidgets/ # VTK 5.1 ? rm -rf VolViewSrc/VolViewExternalLibraries/VTK/ rm -rf VolViewSrc/VolViewLibraries/VTKEdge rm -rf VolViewSrc/VolViewLibraries/Utilities/cmtar rm -rf VolViewSrc/VolViewLibraries/Utilities/Curl rm -rf VolViewSrc/VolViewLibraries/Utilities/ffmpeg # GDCM 1.2.5 (?) rm -rf VolViewSrc/VolViewLibraries/Utilities/gdcm # TclTk 8.5 rm -rf VolViewSrc/VolViewLibraries/Utilities/TclTk # gettext rm -rf VolViewSrc/VolViewLibraries/Utilities/gettext # copyrighted material from M$ rm -rf VolViewSrc/VolViewLibraries/Utilities/HtmlHelp # TODO: # rm -rf VolViewSrc/VolViewExternalLibraries/LesionSizingKit/ # rm -rf VolViewSrc/VolViewLibraries/Utilities/ctnlib mv VolViewSrc ${FOLDER} GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER} rm -rf ${FOLDER} # Note original tarball is 167936 kb # Generated tarbal is down to 10164 kb debian/control0000664000000000000000000000272712132063632010601 0ustar Source: volview Section: science Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Med Packaging Team Uploaders: Mathieu Malaterre Build-Depends: debhelper (>= 8), cmake (>= 2.8.2), libinsighttoolkit3-dev (>= 3.20), libvtk5-dev (>= 5.8.0), libfftw3-dev, libgdcm2-dev (>= 2.0.18), libkwwidgets1-dev, tcl8.5-dev, tk8.5-dev, libavformat-dev, libvtkedge-dev (>= 0.2), libcurl4-gnutls-dev | libcurl4-dev, libtar-dev Standards-Version: 3.9.3 Homepage: http://www.kitware.com/products/volview.html Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/volview/trunk/ Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/volview/trunk/ Package: volview Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Advanced volume visualization tool VolView is an intuitive, interactive system for volume visualization that allows researchers to quickly explore and analyze complex 3D medical or scientific data on Windows, Mac and Linux computers. Users can easily load and interactively explore datasets using 2D and 3D display methods and tools. 3D tools include volume rendering, maximum intensity projections, and oblique reformatting. The ability to save an entire visualization session allows users to easily stop and start sessions. Advanced users can perform custom data processing using a simple plug-in API. debian/watch0000664000000000000000000000020311714001466010214 0ustar version=3 http://www.kitware.com/products/vvdownload.html \ http://www.kitware.com/VolView/files/VolView-([\d\.]+)-Linux-x86_64.sh debian/volview.install0000664000000000000000000000034411631367634012266 0ustar debian/volview.1 usr/share/man/man1 debian/volview.xpm usr/share/pixmaps debian/volview.xml usr/share/mime/packages debian/volview.desktop usr/share/applications #usr/bin/Plugins usr/lib/VolView #usr/bin/VolView usr/lib/VolView debian/volview.dirs0000664000000000000000000000002611631351303011540 0ustar usr/ usr/lib/VolView/ debian/volview.xpm0000664000000000000000000000256211630465011011413 0ustar /* XPM */ static char *volview[] = { /* columns rows colors chars-per-pixel */ "32 32 9 1", " c #800000", ". c #008000", "X c #808000", "o c #0000FF", "O c #FF00FF", "+ c #00FFFF", "@ c #808080", "# c #C0C0C0", "$ c #FFFFFF", /* pixels */ " $$$$$$$$$$$$$$$$$$$$$$$$", " $$$$$$$ $$$$$$$$$", " @@@###$$$$$#@ $$$$$$$$$", " $$$$$$$$$#X......XX.X#$$$$$$$$", " $ $$@XXX.. XX@..X.@$$$$$$$", " $ $@XXXX$ X$$$$$$.O$$$$$$", " $ @@@ #XXXX.$ XX $$$$@$$$$$$", " $$$$$ @XXX.$XXX $$$$$#$$$$$", " ##@@@ #X.@ XX @@@@$$$$$.+$$$$", " $#.$X $ $$$$$$$$..#$$$$", " $$$XX$$ $ $$$.@$$$$", "$$$$$$$$$$oX $$ $ $$$..$$$$", "$$$$$$$$$$O. $$ $$$$ $$$..$$$$", "$$$$$$$$$.o.$$$$$$ $$$$..$$$$", "$$$$$$$$$$..$$$$$$ $$$$$$.X$$$$", "$$$$$$$$$$.#.$$.$$ $$$XX$$$$", "$$$$$$$$$$$.@$$$$$ $..X@$$$$", "$$$$$$$$$$$$...$$$$.$$$$$XX$$$$$", "$$$$$$$$$$$$$$$#....$$$$.XXO$$$$", "$$$$$$$$$$$$$$.$..#.$$$$.X@$$$$$", "$$$$$$$$$$$$$$$$$$..$$$.XX#$$$$$", "$$$$$$$$$$$$$$$$$$#.$$$.XX$$$$$$", "$$$$$$$$$$$$$$$$$..$$$$XX@$$$$$$", "$$$$$$$$$$$$$$$$$@$$$$.XX#$$$$$$", "$$$$$$$$$$$$$$$.#.$$$$XXX$$$$$$$", "$$$$$$$$$$$$$$$O.$$$$.XX$$$$$$$$", "$$$$$$$$$$$$$$.@$$$$.XX@$$$$$$$$", "$$$$$$$$o$$$$ @$$$$$XXXO$$$$$$$$", "$$$$$$$@.@##@.$.$$$XXXo$$$$$$$$$", "$$$$$$$#X..$$$$$$.XXX$$$$$$$$$$$", "$$$$$$$$#..........@o$$$$$$$$$$$", "$$$$$$$$$$@X...XX@O$$$$$$$$$$$$$" }; debian/volview.xml0000664000000000000000000000050311630465011011400 0ustar VolView Document VolView Document debian/README.Debian0000664000000000000000000000062111735353330011233 0ustar volview for Debian ------------------------ VolView ships with multiple convenient libraries, namely: - GDCM - VTK - ITK - KWWidgets - TCL/TK - FFMPEG - VTKEdge - Curl - TAR The original source has been stripped from those source libraries and the build system has been modified to build against system installed libraries. -- Mathieu Malaterre Fri, 30 Dec 2011 09:41:46 +0100 debian/volview.10000664000000000000000000000055311664452013010752 0ustar .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH VOLVIEW "1" "March 2011" "volview 3.4.0" "User Commands" .SH NAME volview \- volview .SH DESCRIPTION VolView version 3.4.0 .PP volview [options] \fB\-\-i\fR input file (single file) \fB\-\-help\fR list of all options \fB\-\-version\fR get the version number .SH "SEE ALSO" .BR ginkgocadx (1) debian/changelog0000664000000000000000000000227212132127131011036 0ustar volview (3.4-3ubuntu1) raring; urgency=low * Fixed FTBFS (hardcoded Tcl and Tk locations in a CMakeLists.txt). * Made swab(3) available to avoid causing FTBFS on amd64 due to implicit function declaration. -- Daniel T Chen Fri, 12 Apr 2013 16:29:36 -0400 volview (3.4-3build1) quantal; urgency=low * Rebuild for libgdcm2.2 -- Michael Terry Mon, 23 Jul 2012 17:58:02 -0400 volview (3.4-3) unstable; urgency=low * Need to remove quote from CFLAGS (MIPS compilation) * fix compilation issues introduced by -fPIC * Bump Std-Vers to 3.9.3, no changes needed * Use my @d.o alias. * Remove DMUA flag * Use hardening flags. Closes: #665637 -- Mathieu Malaterre Fri, 30 Mar 2012 17:31:14 +0200 volview (3.4-2) unstable; urgency=low * Use any curl.h provider * Make sure to use vtkedge 0.2 and above * Fix mipsel compilation. Closes: #658273 * Use hardening flags -- Mathieu Malaterre Wed, 01 Feb 2012 21:14:28 +0100 volview (3.4-1) unstable; urgency=low * Initial release (Closes: #640511) -- Mathieu Malaterre Fri, 30 Dec 2011 09:41:46 +0100