Changeset 3778 for trunk/packages

Timestamp:

Jul 10, 2013 9:41:32 PM (11 years ago)

Author:

ldelgass

Message:

Add image actor support

File:

• trunk/packages/vizservers/vtkvis/GraphicsObject.h (modified) (10 diffs)

trunk/packages/vizservers/vtkvis/GraphicsObject.h

@@ -14 +14 @@
 #include <vtkSmartPointer.h>
 #include <vtkProp.h>
+#include <vtkActor2D.h>
 #include <vtkProp3D.h>
 #include <vtkProp3DCollection.h>
 #include <vtkAssembly.h>
 #include <vtkActor.h>
+#include <vtkImageActor.h>
 #include <vtkVolume.h>
 #include <vtkProperty.h>
+#include <vtkImageProperty.h>
 #include <vtkVolumeProperty.h>
 #include <vtkMath.h>
@@ -114 +117 @@
 
     /**
+     * \brief Cast the vktProp to a vtkActor2D
+     *
+     * \return NULL or a vtkActor2D pointer
+     */
+    inline vtkActor2D *getActor2D()
+    {
+        return vtkActor2D::SafeDownCast(_prop);
+    }
+
+    /**
      * \brief Cast the vktProp to a vtkProp3D
      *
@@ -131 +144 @@
     {
         return vtkActor::SafeDownCast(_prop);
+    }
+
+    /**
+     * \brief Cast the vktProp to a vtkImageActor
+     *
+     * \return NULL or a vtkImageActor pointer
+     */
+    inline vtkImageActor *getImageActor()
+    {
+        return vtkImageActor::SafeDownCast(_prop);
     }
 
@@ -484 +507 @@
                         TRACE("Culling on");
                     }
-                }
-            }
+                } else if (vtkImageActor::SafeDownCast(prop) != NULL) {
+                    vtkImageActor::SafeDownCast(prop)->GetProperty()->SetOpacity(opacity);
+                }
+            }
+        } else if (getImageActor() != NULL) {
+            getImageActor()->GetProperty()->SetOpacity(_opacity);
         }
     }
@@ -504 +531 @@
         if (getActor() != NULL) {
             getActor()->GetProperty()->SetAmbient(ambient);
+        } else if (getImageActor() != NULL) {
+            getImageActor()->GetProperty()->SetAmbient(ambient);
         } else if (getVolume() != NULL) {
             getVolume()->GetProperty()->SetAmbient(ambient);
@@ -513 +542 @@
                 if (vtkActor::SafeDownCast(prop) != NULL) {
                     vtkActor::SafeDownCast(prop)->GetProperty()->SetAmbient(ambient);
+                } else if (vtkImageActor::SafeDownCast(prop) != NULL) {
+                    vtkImageActor::SafeDownCast(prop)->GetProperty()->SetAmbient(ambient);
                 } else if (vtkVolume::SafeDownCast(prop) != NULL) {
                     vtkVolume::SafeDownCast(prop)->GetProperty()->SetAmbient(ambient);
@@ -527 +558 @@
         if (getActor() != NULL) {
             getActor()->GetProperty()->SetDiffuse(diffuse);
+        } else if (getImageActor() != NULL) {
+            getImageActor()->GetProperty()->SetDiffuse(diffuse);
         } else if (getVolume() != NULL) {
             getVolume()->GetProperty()->SetDiffuse(diffuse);
@@ -536 +569 @@
                 if (vtkActor::SafeDownCast(prop) != NULL) {
                     vtkActor::SafeDownCast(prop)->GetProperty()->SetDiffuse(diffuse);
+                } else if (vtkImageActor::SafeDownCast(prop) != NULL) {
+                    vtkImageActor::SafeDownCast(prop)->GetProperty()->SetDiffuse(diffuse);
                 } else if (vtkVolume::SafeDownCast(prop) != NULL) {
                     vtkVolume::SafeDownCast(prop)->GetProperty()->SetDiffuse(diffuse);
@@ -581 +616 @@
             property->SetSpecular(specular);
             property->SetSpecularPower(specPower);
+        } else if (getImageActor() != NULL) {
+            vtkImageProperty *property = getImageActor()->GetProperty();
+            property->SetAmbient(ambient);
+            property->SetDiffuse(diffuse);
         } else if (getVolume() != NULL) {
             vtkVolumeProperty *property = getVolume()->GetProperty();
@@ -598 +637 @@
                     property->SetSpecular(specular);
                     property->SetSpecularPower(specPower);
+                } else if (vtkImageActor::SafeDownCast(prop) != NULL) {
+                    vtkImageProperty *property = vtkImageActor::SafeDownCast(prop)->GetProperty();
+                    property->SetAmbient(ambient);
+                    property->SetDiffuse(diffuse);
                 } else if (vtkVolume::SafeDownCast(prop) != NULL) {
                     vtkVolumeProperty *property = vtkVolume::SafeDownCast(prop)->GetProperty();