X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fkw%2Fsrc%2FvtkKWSlicer.h;h=4f537a1220965b27bb439c80de3b1215db284fa8;hb=e746553dde41260204aae07b809f484544de10b9;hp=431eb6d2e9107ef4acb3e53ca7ffabe123c12b85;hpb=26a8c332dda10ace9e3e088b2ca8544d188c9743;p=bbtk.git

diff --git a/packages/kw/src/vtkKWSlicer.h b/packages/kw/src/vtkKWSlicer.h
index 431eb6d..4f537a1 100644
--- a/packages/kw/src/vtkKWSlicer.h
+++ b/packages/kw/src/vtkKWSlicer.h
@@ -4,7 +4,7 @@
 #define __vtkKWSlicer_h
 
 
-#include "vtkKWFrame.h"
+#include "vtkKWCompositeWidget.h"
 
 class vtkImageData;
 class vtkKWRenderWidget;
@@ -12,17 +12,19 @@ class vtkImageViewer2;
 class vtkKWScale;
 class vtkKWWindowLevelPresetSelector;
 class vtkKWSimpleAnimationWidget;
+class vtkKWMenu;
+class vtkKWSplitFrame;
+class vtkKWCornerAnnotationEditor;
+//namespace bbkw {
 
-namespace bbkw
-{
-
-class vtkKWSlicer : public vtkKWFrame
+class vtkKWSlicer : public vtkKWCompositeWidget
 {
 public:
   static vtkKWSlicer* New();
-  vtkTypeRevisionMacro(vtkKWSlicer,vtkKWFrame);
+  vtkTypeRevisionMacro(vtkKWSlicer,vtkKWCompositeWidget);
 
   void SetImage(vtkImageData*);
+  void UpdateImage();
 
   // Description:
   // Callbacks
@@ -39,6 +41,9 @@ public:
   virtual void WindowLevelPresetUpdateCallback(int id);
   virtual void WindowLevelPresetHasChangedCallback(int id);
 
+  void ProcessCallbackCommandEvents(vtkObject *caller, 
+				    unsigned long event, 
+				    void *calldata);
 protected:
   vtkKWSlicer();
   ~vtkKWSlicer();
@@ -46,12 +51,15 @@ protected:
   // Description:
   // Create the widget.
   virtual void CreateWidget();
-
+  vtkKWSplitFrame                     *Frame;
+  vtkImageData                   *Image;
   vtkImageViewer2                *ImageViewer; 
   vtkKWScale                     *SliceScale;
   vtkKWWindowLevelPresetSelector *WindowLevelPresetSelector;
   vtkKWRenderWidget              *RenderWidget;
   vtkKWSimpleAnimationWidget     *AnimationWidget;
+  vtkKWMenu                      *OrientationMenu;
+  vtkKWCornerAnnotationEditor    *AnnotationEditor;
 
   virtual void UpdateSliceRanges();
 
@@ -60,6 +68,6 @@ private:
   void operator=(const vtkKWSlicer&);  // Not implemented.
 };
 
-}
+//}
 #endif
 #endif