[med-svn] r7665 - trunk/packages/volview/trunk/debian/patches

Mathieu Malaterre malat-guest at alioth.debian.org
Mon Sep 5 14:11:49 UTC 2011


Author: malat-guest
Date: 2011-09-05 14:11:49 +0000 (Mon, 05 Sep 2011)
New Revision: 7665

Added:
   trunk/packages/volview/trunk/debian/patches/debian-changes-3.4-1
   trunk/packages/volview/trunk/debian/patches/fixmath.patch
Modified:
   trunk/packages/volview/trunk/debian/patches/series
Log:
Save current state

Added: trunk/packages/volview/trunk/debian/patches/debian-changes-3.4-1
===================================================================
--- trunk/packages/volview/trunk/debian/patches/debian-changes-3.4-1	                        (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/debian-changes-3.4-1	2011-09-05 14:11:49 UTC (rev 7665)
@@ -0,0 +1,51 @@
+Description: Upstream changes introduced in version 3.4-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ volview (3.4-1) unstable; urgency=low
+ .
+   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 12:43:57.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 12:43:57.000000000 +0000
+@@ -3657,7 +3657,7 @@
+   if (this->VolumeMapper)
+     {
+     this->AddVolumeMapperProgress(
+-      this->VolumeMapper,
++      (vtkVolumeMapper*)this->VolumeMapper,
+       ks_("Progress|Generating Image"));
+ 
+     this->AddVolumeMapperGradientProgress(
+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
+@@ -69,7 +69,7 @@
+   #vvITKMultimodalityRegistrationRigidJointHistogramPlotter
+   #vvITKLandmarkPreparation
+   #vvITKScalarImageKMeansClassifier
+-  vvITKScalarKmeansMarkovRandomField
++  #vvITKScalarKmeansMarkovRandomField
+   vvITKSigmoid
+   #vvITKShapeDetectionModule
+   #vvITKSurfaceSpline

Added: trunk/packages/volview/trunk/debian/patches/fixmath.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixmath.patch	                        (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/fixmath.patch	2011-09-05 14:11:49 UTC (rev 7665)
@@ -0,0 +1,110 @@
+Index: volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx	2011-09-05 13:15:01.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx	2011-09-05 13:15:08.000000000 +0000
+@@ -1070,7 +1070,7 @@
+     {
+     return;
+     }
+-  double theta = vtkMath::DoubleRadiansToDegrees() * acos( dotproduct );
++  double theta = 0; //vtkMath::DoubleRadiansToDegrees() * acos( dotproduct );
+ 
+   // Manipulate the transform to reflect the rotation
+   this->Transform->Identity();
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2011-09-05 13:29:24.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2011-09-05 13:29:45.000000000 +0000
+@@ -15,7 +15,9 @@
+ ENDIF(COMMAND CMAKE_POLICY)
+ 
+ PROJECT(KWWidgetsPro)
+-
++include_directories(
++  /usr/include/tcl8.5
++)
+ # --------------------------------------------------------------------------
+ # 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
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx	2011-09-05 13:31:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx	2011-09-05 13:31:33.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::RadiansToDegrees();
++  //oldAngle *= vtkMath::RadiansToDegrees();
+ 
+   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::RadiansToDegrees();
++  //ryf *= vtkMath::RadiansToDegrees();
+   
+   widget->TiltPlane(rxf, ryf);
+   this->InvokeEvent(vtkKWEvent::ResliceChangingEvent, NULL);
+Index: volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt	2011-09-05 13:53:41.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt	2011-09-05 13:54:02.000000000 +0000
+@@ -16,7 +16,9 @@
+ 
+ 
+ PROJECT(KWVolView)
+-
++include_directories(
++  /usr/include/tcl8.5
++  )
+ INCLUDE_REGULAR_EXPRESSION("^.*$")
+ 
+ # --------------------------------------------------------------------------
+Index: volview-3.4/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx	2011-09-05 14:10:55.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx	2011-09-05 14:11:17.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 13:31:58.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx	2011-09-05 13:32:05.000000000 +0000
+@@ -584,7 +584,7 @@
+     return;
+     }
+   double cos_theta = vtkMath::Dot(oldz, z);
+-  double theta = acos( cos_theta )*vtkMath::DoubleRadiansToDegrees();
++  double theta = 0; //acos( cos_theta )*vtkMath::DoubleRadiansToDegrees();
+   this->Transform->Identity();
+   this->Transform->Translate(origin[0],origin[1],origin[2]);
+   this->Transform->RotateWXYZ(theta,axis);
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 13:32:49.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 13:33:02.000000000 +0000
+@@ -3740,8 +3740,8 @@
+       if (this->VolumeMapper)
+         {
+         this->VolumeMapper->SetRequestedRenderMode(
+-          *iarg ? vtkKWEVolumeMapper::DefaultRenderMode
+-          : vtkKWEVolumeMapper::RayCastAndTextureRenderMode);
++          *iarg ? vtkSmartVolumeMapper::DefaultRenderMode
++          : vtkSmartVolumeMapper::RayCastAndTextureRenderMode);
+         }
+ 
+     case vtkCommand::VolumeMapperRenderStartEvent:

Modified: trunk/packages/volview/trunk/debian/patches/series
===================================================================
--- trunk/packages/volview/trunk/debian/patches/series	2011-09-05 09:48:19 UTC (rev 7664)
+++ trunk/packages/volview/trunk/debian/patches/series	2011-09-05 14:11:49 UTC (rev 7665)
@@ -3,3 +3,5 @@
 fixupvtkedge.patch
 fixslcreader.patch
 fixcompissues.patch
+debian-changes-3.4-1
+fixmath.patch




More information about the debian-med-commit mailing list