[med-svn] r7664 - in trunk/packages/volview/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon Sep 5 09:48:19 UTC 2011
Author: malat-guest
Date: 2011-09-05 09:48:19 +0000 (Mon, 05 Sep 2011)
New Revision: 7664
Added:
trunk/packages/volview/trunk/debian/patches/fixcompissues.patch
trunk/packages/volview/trunk/debian/patches/fixslcreader.patch
Modified:
trunk/packages/volview/trunk/debian/control
trunk/packages/volview/trunk/debian/patches/series
Log:
More work on volume stuff
Modified: trunk/packages/volview/trunk/debian/control
===================================================================
--- trunk/packages/volview/trunk/debian/control 2011-09-05 08:46:14 UTC (rev 7663)
+++ trunk/packages/volview/trunk/debian/control 2011-09-05 09:48:19 UTC (rev 7664)
@@ -5,7 +5,7 @@
DM-Upload-Allowed: yes
Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Build-Depends: debhelper (>= 8), cmake (>= 2.8.2),
- libinsighttoolkit3-dev (>= 3.20), libvtk5-dev (>= 5.6),
+ libinsighttoolkit3-dev (>= 3.20), libvtk5-dev (>= 5.8),
libgdcm2-dev (>= 2.0.16), libkwwidgets1-dev, tcl8.5-dev, tk8.5-dev,
libavformat-dev, libvtkedge-dev, libcurl4-nss-dev
Standards-Version: 3.9.2
Added: trunk/packages/volview/trunk/debian/patches/fixcompissues.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixcompissues.patch (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/fixcompissues.patch 2011-09-05 09:48:19 UTC (rev 7664)
@@ -0,0 +1,197 @@
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 11:31:25.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 11:44:51.000000000 +0200
+@@ -13,6 +13,7 @@
+
+ #include "vtk3DCursorAnnotation.h"
+ #include "vtkActor.h"
++#include "vtkVolumeMapper.h"
+ #include "vtkBoundingBoxAnnotation.h"
+ #include "vtkCamera.h"
+ #include "vtkCellArray.h"
+@@ -52,7 +53,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"
+@@ -119,7 +120,7 @@
+
+ this->VolumeMapper = NULL; //vtkKWEVolumeMapper::New();
+
+- this->Volume->SetMapper(this->VolumeMapper);
++ //this->Volume->SetMapper(this->VolumeMapper);
+ this->Volume->SetProperty(this->VolumeProperty);
+
+ this->InteractiveUpdateRate = 8.0;
+@@ -245,7 +246,7 @@
+
+ if ( this->VolumeMapper )
+ {
+- this->VolumeMapper->Delete();
++ //this->VolumeMapper->Delete();
+ this->VolumeMapper = NULL;
+ }
+
+@@ -473,12 +474,14 @@
+ int i;
+ for (i = 0; i < mappers->GetNumberOfItems(); i++)
+ {
++#if 0
+ vtkVolumeMapper *vmapper = vtkVolumeMapper::SafeDownCast(
+ mappers->GetItemAsObject(i));
+ if (vmapper)
+ {
+ vmapper->SetInput(this->Input);
+ }
++#endif
+ }
+ mappers->Delete();
+ mappers = NULL;
+@@ -490,7 +493,7 @@
+ }
+
+ this->Input->Update();
+- this->VolumeMapper->Modified();
++ //this->VolumeMapper->Modified();
+
+ this->GetRenderer()->AddViewProp(this->Volume);
+
+@@ -574,6 +577,7 @@
+
+ for (i = 0; i < mappers->GetNumberOfItems(); i++)
+ {
++#if 0
+ vtkVolumeMapper *vmapper = vtkVolumeMapper::SafeDownCast(
+ mappers->GetItemAsObject(i));
+ if (vmapper)
+@@ -583,12 +587,14 @@
+ vmapper->GetInput()->GetWholeExtent());
+ vmapper->GetInput()->Update();
+ }
++#endif
+ }
+
+ // Set the cropping planes to the bounds
+
+ for (i = 0; i < mappers->GetNumberOfItems(); i++)
+ {
++#if 0
+ vtkVolumeMapper *vmapper = vtkVolumeMapper::SafeDownCast(
+ mappers->GetItemAsObject(i));
+ if (vmapper)
+@@ -596,6 +602,7 @@
+ vmapper->SetCroppingRegionPlanes(
+ bounds[0], bounds[1], bounds[2], bounds[3], bounds[4], bounds[5]);
+ }
++#endif
+ }
+
+ mappers->Delete();
+@@ -737,7 +744,7 @@
+
+ if (this->VolumeMapper)
+ {
+- mappers->AddItem(this->VolumeMapper);
++ //mappers->AddItem(this->VolumeMapper);
+ }
+ }
+
+@@ -804,10 +811,12 @@
+ vtkKWApplicationPro::SafeDownCast(this->GetApplication());
+ if (app_pro)
+ {
++#if 0
+ this->VolumeMapper->SetRequestedRenderMode(
+ app_pro->GetUseGPURendering() ? vtkKWEVolumeMapper::DefaultRenderMode
+ : vtkKWEVolumeMapper::RayCastAndTextureRenderMode);
+ // : vtkKWEVolumeMapper::RayCastRenderMode);
++#endif
+ }
+
+ this->ScaleBarWidget->SetApplication(this->GetApplication());
+@@ -962,9 +971,9 @@
+ void vtkKWVolumeWidget::LevelOfDetailRender()
+ {
+ if ( !this->VolumeMapper ||
+- !this->VolumeMapper->GetInput() ||
+- !this->Volume ||
+- !this->Volume->GetVisibility() )
++ /*!this->VolumeMapper->GetInput() || */
++ !this->Volume // ||
++ /* !this->Volume->GetVisibility() */ )
+ {
+ if (this->RenderWindow)
+ {
+@@ -1208,13 +1217,15 @@
+ renwin->CheckAbortStatus() || // we should abort anyway
+ renwin->GetEventPending() || // some events are pending
+ (this->RenderMode ==
+- vtkKWRenderWidget::InteractiveRender) ||// we are interactive rendering
++ vtkKWRenderWidget::InteractiveRender) //||// we are interactive rendering
++#if 0
+ (this->VolumeMapper->GetRequestedRenderMode() ==
+- vtkKWEVolumeMapper::RayCastAndTextureRenderMode &&
++ vtkKWEVolumeMapper::RayCastAndTextureRenderMode &&
+ !this->IsCreated()) || // we are not created but use raycast
+ (this->VolumeMapper->GetRequestedRenderMode() ==
+ vtkKWEVolumeMapper::DefaultRenderMode &&
+ !this->IsMapped()) // we are not mapped and use GPU rendering
++#endif
+ )
+ {
+ return 0;
+@@ -1229,15 +1240,17 @@
+ double up[3] = {0,0,1};
+ vtkVolume *vol = vtkVolume::New();
+ vol->SetProperty(prop);
+- vol->SetMapper(this->VolumeMapper);
++ //vol->SetMapper(this->VolumeMapper);
+ int vmapper_blend_mode = vtkVolumeMapper::COMPOSITE_BLEND;
+ if (blend_mode == vtkKWVolumeWidget::BLEND_MODE_MIP)
+ {
+ vmapper_blend_mode = vtkVolumeMapper::MAXIMUM_INTENSITY_BLEND;
+ }
++#if 0
+ this->VolumeMapper->CreateCanonicalView( this->GetRenderer(),
+ this->Volume, vol, image,
+ vmapper_blend_mode, direction, up);
++#endif
+ vol->SetProperty(NULL);
+ vol->SetMapper(NULL);
+ vol->Delete();
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-09-05 11:44:26.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-09-05 11:45:27.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.
Added: trunk/packages/volview/trunk/debian/patches/fixslcreader.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixslcreader.patch (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/fixslcreader.patch 2011-09-05 09:48:19 UTC (rev 7664)
@@ -0,0 +1,15 @@
+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;
+ }
+
Modified: trunk/packages/volview/trunk/debian/patches/series
===================================================================
--- trunk/packages/volview/trunk/debian/patches/series 2011-09-05 08:46:14 UTC (rev 7663)
+++ trunk/packages/volview/trunk/debian/patches/series 2011-09-05 09:48:19 UTC (rev 7664)
@@ -1,3 +1,5 @@
addtoplevelcmake.patch
updategdcm.patch
fixupvtkedge.patch
+fixslcreader.patch
+fixcompissues.patch
More information about the debian-med-commit
mailing list