2343 creaMaracasVisu Bug New Normal Interaction between ColorLayer and manualPaint

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / ThresholdImageView / LayerImageBase.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
index 5beffe7be8723c47013cc97fa9f9df165f63929d..d118348c03d6fe043dd4fa0025c517d4cda47305 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
@@ -1,5 +1,27 @@
-
-
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
 
 /**
  *  \file
@@ -33,10 +55,15 @@ public:
        ColorLayerImageBasevtkInteractor(LayerImageBase* layerImageBase);
        virtual ~ColorLayerImageBasevtkInteractor();
 
-       virtual bool  OnMouseMove();
+       virtual bool OnChar(); 
+       virtual bool OnMouseMove();
+       virtual bool OnRightButtonDown();
+       virtual bool OnRightButtonUp();
 
 private:
-    LayerImageBase* _layerImageBase;
+    bool               _state;
+    bool               _stateKey;
+    LayerImageBase*    _layerImageBase;
 
 protected:
 
@@ -54,6 +81,8 @@ class LayerImageBase
   public:
                LayerImageBase();
                virtual ~LayerImageBase();
+               void SetX(int x);
+               void SetY(int y);
                void SetZ(int z);
                void SetImage(vtkImageData* image);
                void SetwxVtkBaseView(wxVtkBaseView *baseview);
@@ -64,14 +93,18 @@ class LayerImageBase
                void onThresholdChangeOpacity (int opacity);
                void onThresholdRemove();
                wxVtkBaseView *GetwxVtkBaseView();
-        void Refresh();
-        vtkLookupTable *GetvtkLookupTable();
-        vtkImageReslice *GetvtkImageReslice();
+               void Refresh();
+               vtkLookupTable *GetvtkLookupTable();
+               vtkImageReslice *GetvtkImageReslice();
+               virtual int GetX();
+               virtual int GetY();
                virtual int GetZ();
 
   private:
-               int                                     _Z;
-               bool                            _actorPresent;
+               int                     _X;
+               int                     _Y;
+               int                     _Z;
+               bool                    _actorPresent;
                vtkImageData            *_image;
                vtkImageReslice         *_imageReslicer;
                vtkLookupTable          *_thresholdTable;
@@ -81,7 +114,7 @@ class LayerImageBase
 
                virtual void ConfigLookupTable() = 0;
                bool GetActorPresent();
-               int CleanZ(int z);
+               void CleanXYZ(double &x, double &y, double &z);
 
 
   protected: