Changeset 3981 for trunk/packages/vizservers

Timestamp:

Oct 2, 2013, 1:50:08 AM (11 years ago)

Author:

ldelgass

Message:

Updates to image slicer

Location:

trunk/packages/vizservers/vtkvis

Files:

• Image.cpp (modified) (4 diffs)
• Image.h (modified) (3 diffs)

trunk/packages/vizservers/vtkvis/Image.cpp

@@ -9 +9 @@
 #include <vtkImageData.h>
 #include <vtkImageActor.h>
+#include <vtkImageSlice.h>
 #include <vtkImageProperty.h>
 #include <vtkImageMapper3D.h>
+#include <vtkImageResliceMapper.h>
 #include <vtkLookupTable.h>
 
@@ -17 +19 @@
 
 using namespace VtkVis;
+
+#define USE_RESLICE_MAPPER
 
 Image::Image() :
@@ -32 +36 @@
 {
     if (_prop == NULL) {
+#ifdef USE_RESLICE_MAPPER
+        _prop = vtkSmartPointer<vtkImageSlice>::New();
+#else
         _prop = vtkSmartPointer<vtkImageActor>::New();
+#endif
         vtkImageProperty *property = getImageProperty();
         property->SetInterpolationTypeToLinear();
@@ -64 +72 @@
 
     vtkImageActor *actor = getImageActor();
-    actor->SetInputData(imageData);
-    actor->InterpolateOn();
+    vtkImageMapper3D *mapper = getImageMapper();
+    if (mapper == NULL) {
+        TRACE("Creating mapper");
+        vtkSmartPointer<vtkImageResliceMapper> newMapper = vtkSmartPointer<vtkImageResliceMapper>::New();
+        getImageSlice()->SetMapper(newMapper);
+        mapper = getImageMapper();
+        assert(mapper != NULL);
+    }
+    if (actor != NULL) {
+        TRACE("Have actor");
+        actor->SetInputData(imageData);
+        actor->InterpolateOn();
+    } else {
+        TRACE("No actor");
+        mapper->SetInputData(imageData);
+    }
 
-    vtkImageMapper3D *mapper = getImageMapper();
+    mapper->SliceAtFocalPointOn();
+    mapper->SliceFacesCameraOn();
+
+    vtkImageResliceMapper *resliceMapper = getImageResliceMapper();
+    if (resliceMapper) {
+        TRACE("Mapper is a vtkImageResliceMapper");
+        resliceMapper->AutoAdjustImageQualityOff();
+        resliceMapper->ResampleToScreenPixelsOff();
+    } else {
+        TRACE("Mapper is a %s", mapper->GetClassName());
+    }
+
     mapper->Update();
 }

trunk/packages/vizservers/vtkvis/Image.h

@@ -10 +10 @@
 
 #include <vtkSmartPointer.h>
+#include <vtkImageSlice.h>
 #include <vtkImageActor.h>
 #include <vtkImageMapper3D.h>
+#include <vtkImageResliceMapper.h>
+#include <vtkImageSliceMapper.h>
 #include <vtkLookupTable.h>
 #include <vtkPlaneCollection.h>
@@ -141 +144 @@
     vtkImageProperty *getImageProperty()
     {
-        if (getImageActor() != NULL) {
-            return getImageActor()->GetProperty();
+        if (getImageSlice() != NULL) {
+            return getImageSlice()->GetProperty();
         } else {
             return NULL;
@@ -150 +153 @@
     vtkImageMapper3D *getImageMapper()
     {
-        if (getImageActor() != NULL) {
-            return getImageActor()->GetMapper();
+        if (getImageSlice() != NULL) {
+            return getImageSlice()->GetMapper();
+        } else {
+            return NULL;
+        }
+    }
+
+    vtkImageResliceMapper *getImageResliceMapper()
+    {
+        if (getImageSlice() != NULL) {
+            return vtkImageResliceMapper::SafeDownCast(getImageSlice()->GetMapper());
+        } else {
+            return NULL;
+        }
+    }
+
+    vtkImageSliceMapper *getImageSliceMapper()
+    {
+        if (getImageSlice() != NULL) {
+            return vtkImageSliceMapper::SafeDownCast(getImageSlice()->GetMapper());
         } else {
             return NULL;