[med-svn] r7672 - in trunk/packages/volview/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon Sep 5 15:57:46 UTC 2011
Author: malat-guest
Date: 2011-09-05 15:57:46 +0000 (Mon, 05 Sep 2011)
New Revision: 7672
Added:
trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch
Removed:
trunk/packages/volview/trunk/debian/patches/fixcompissues.patch
Modified:
trunk/packages/volview/trunk/debian/control
trunk/packages/volview/trunk/debian/patches/fixmath.patch
trunk/packages/volview/trunk/debian/patches/removemarkov.patch
trunk/packages/volview/trunk/debian/patches/series
Log:
Fix radian/degree new API
Modified: trunk/packages/volview/trunk/debian/control
===================================================================
--- trunk/packages/volview/trunk/debian/control 2011-09-05 15:44:33 UTC (rev 7671)
+++ trunk/packages/volview/trunk/debian/control 2011-09-05 15:57:46 UTC (rev 7672)
@@ -7,7 +7,7 @@
Build-Depends: debhelper (>= 8), cmake (>= 2.8.2),
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, libtar.h
+ libavformat-dev, libvtkedge-dev (>= 0.2.0), libcurl4-nss-dev, libtar-dev
Standards-Version: 3.9.2
Homepage: http://www.kitware.com/products/volview.html
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/volview/trunk/?rev=0&sc=0
Deleted: trunk/packages/volview/trunk/debian/patches/fixcompissues.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixcompissues.patch 2011-09-05 15:44:33 UTC (rev 7671)
+++ trunk/packages/volview/trunk/debian/patches/fixcompissues.patch 2011-09-05 15:57:46 UTC (rev 7672)
@@ -1,53 +0,0 @@
-Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:34:03.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:34:27.000000000 +0000
-@@ -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"
-@@ -117,7 +118,7 @@
-
- this->Volume = vtkVolume::New();
-
-- this->VolumeMapper = vtkKWEVolumeMapper::New();
-+ this->VolumeMapper = vtkSmartVolumeMapper::New();
-
- this->Volume->SetMapper(this->VolumeMapper);
- this->Volume->SetProperty(this->VolumeProperty);
-Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-09-05 15:34:03.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-09-05 15:34:27.000000000 +0000
-@@ -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.
Modified: trunk/packages/volview/trunk/debian/patches/fixmath.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixmath.patch 2011-09-05 15:44:33 UTC (rev 7671)
+++ trunk/packages/volview/trunk/debian/patches/fixmath.patch 2011-09-05 15:57:46 UTC (rev 7672)
@@ -56,7 +56,7 @@
return;
}
- double theta = vtkMath::DoubleRadiansToDegrees() * acos( dotproduct );
-+ double theta = 0; //vtkMath::DoubleRadiansToDegrees() * acos( dotproduct );
++ double theta = vtkMath::DegreesFromRadians( acos( dotproduct ) );
// Manipulate the transform to reflect the rotation
this->Transform->Identity();
@@ -85,8 +85,8 @@
- newAngle *= vtkMath::RadiansToDegrees();
- oldAngle *= vtkMath::RadiansToDegrees();
-+ //newAngle *= vtkMath::RadiansToDegrees();
-+ //oldAngle *= vtkMath::RadiansToDegrees();
++ newAngle = vtkMath::DegreesFromRadians( newAngle );
++ oldAngle = vtkMath::DegreesFromRadians( oldAngle );
widget->RollPlane(newAngle - oldAngle);
}
@@ -96,8 +96,8 @@
- rxf *= vtkMath::RadiansToDegrees();
- ryf *= vtkMath::RadiansToDegrees();
-+ //rxf *= vtkMath::RadiansToDegrees();
-+ //ryf *= vtkMath::RadiansToDegrees();
++ rxf *= vtkMath::DegreesFromRadians( rxf );
++ ryf *= vtkMath::DegreesFromRadians( ryf );
widget->TiltPlane(rxf, ryf);
this->InvokeEvent(vtkKWEvent::ResliceChangingEvent, NULL);
@@ -152,7 +152,7 @@
}
double cos_theta = vtkMath::Dot(oldz, z);
- double theta = acos( cos_theta )*vtkMath::DoubleRadiansToDegrees();
-+ double theta = 0; //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);
Added: trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch 2011-09-05 15:57:46 UTC (rev 7672)
@@ -0,0 +1,79 @@
+vtkKWEVolumeMapper has been renamed vtkSmartVolumeMapper in VTK 5.8.0
+(after VTK 5.4 transition)
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:49:50.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:49:52.000000000 +0000
+@@ -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
+ )
+ {
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-09-05 15:48:26.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-09-05 15:49:52.000000000 +0000
+@@ -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.
Modified: trunk/packages/volview/trunk/debian/patches/removemarkov.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/removemarkov.patch 2011-09-05 15:44:33 UTC (rev 7671)
+++ trunk/packages/volview/trunk/debian/patches/removemarkov.patch 2011-09-05 15:57:46 UTC (rev 7672)
@@ -5,8 +5,8 @@
Index: volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 13:02:19.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 13:04:13.000000000 +0000
+--- 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
@@ -16,10 +16,6 @@
vvITKSigmoid
#vvITKShapeDetectionModule
#vvITKSurfaceSpline
-Index: volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 15:38:53.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 15:39:29.000000000 +0000
@@ -83,7 +83,7 @@
vvITKWatershedRGBModule
#vvITKRigidMIMetricPlotter
Modified: trunk/packages/volview/trunk/debian/patches/series
===================================================================
--- trunk/packages/volview/trunk/debian/patches/series 2011-09-05 15:44:33 UTC (rev 7671)
+++ trunk/packages/volview/trunk/debian/patches/series 2011-09-05 15:57:46 UTC (rev 7672)
@@ -2,6 +2,6 @@
updategdcm.patch
fixupvtkedge.patch
fixslcreader.patch
-fixcompissues.patch
fixmath.patch
removemarkov.patch
+kwevm_smartvm.patch
More information about the debian-med-commit
mailing list