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

diff --git a/packages/kw/src/vtkKWSlicer.h b/packages/kw/src/vtkKWSlicer.h
index 431eb6d..2194c95 100644
--- a/packages/kw/src/vtkKWSlicer.h
+++ b/packages/kw/src/vtkKWSlicer.h
@@ -1,10 +1,37 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
 #ifdef USE_KWWIDGETS
 
 #ifndef __vtkKWSlicer_h
 #define __vtkKWSlicer_h
 
 
-#include "vtkKWFrame.h"
+#include "vtkKWCompositeWidget.h"
 
 class vtkImageData;
 class vtkKWRenderWidget;
@@ -12,17 +39,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 +68,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 +78,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 +95,6 @@ private:
   void operator=(const vtkKWSlicer&);  // Not implemented.
 };
 
-}
+//}
 #endif
 #endif