Bug #1679

[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuViewerNV.h

diff --git a/bbtk/src/bbmaracasvisuViewerNV.h b/bbtk/src/bbmaracasvisuViewerNV.h
index e654f011b31e623eb0791ee5c2e5c9a4d5f7af27..8f0d4e33ae5a6efdf992e59bff9930cb92a4ca6f 100644 (file)
--- a/bbtk/src/bbmaracasvisuViewerNV.h
+++ b/bbtk/src/bbmaracasvisuViewerNV.h
@@ -7,9 +7,15 @@
 #include "vtkRenderer.h"
 
 #include "wxVtkBaseView.h"
-#include "widgets/wxMPRWidget.h"
-#include "widgets/wxMaracas_ViewerWidget.h"
-#include "widgets/wxMaracas_N_ViewersWidget.h"
+
+//#include "widgets/wxMPRWidget.h"
+//#include "widgets/wxMaracas_ViewerWidget.h"
+//#include "widgets/wxMaracas_N_ViewersWidget.h"
+
+#include "wxMPRWidget.h"
+#include "wxMaracas_ViewerWidget.h"
+#include "wxMaracas_N_ViewersWidget.h"
+
 #include "vtkImagePlaneWidget.h"
 
 namespace bbcreaMaracasVisu
@@ -20,13 +26,13 @@ namespace bbcreaMaracasVisu
        public:
                bbwxMaracas_N_ViewersWidget(ViewerNV* box,wxWindow *parent, vtkImageData* imagedata=NULL, std::vector<int> *nTypeView=NULL);
                ~bbwxMaracas_N_ViewersWidget();
-           
+
                //if the MPR had generated the refresh event
                void OnRefreshView(wxCommandEvent &event);
                void OnDClickLeft(wxCommandEvent &event);
        private:
                ViewerNV                        *mbbViewerNV;
-       DECLARE_EVENT_TABLE( );     
+       DECLARE_EVENT_TABLE( );
   };
 
 //-------------------------------------------------------------------
@@ -34,7 +40,7 @@ namespace bbcreaMaracasVisu
 //-------------------------------------------------------------------
 
 class /*BBTK_EXPORT*/ ViewerNV
- : 
+ :
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ViewerNV,bbtk::WxBlackBox);
@@ -43,13 +49,13 @@ class /*BBTK_EXPORT*/ ViewerNV
   BBTK_DECLARE_INPUT(nTypeView, std::vector<int> );
   BBTK_DECLARE_INPUT(ColorFunction, vtkColorTransferFunction* );
   BBTK_DECLARE_INPUT(WindowLevel, int );
-  BBTK_DECLARE_INPUT(ColorLevel, int );          
+  BBTK_DECLARE_INPUT(ColorLevel, int );
   BBTK_DECLARE_INPUT(Obs1, vtkInteractorObserver *);
   BBTK_DECLARE_INPUT(Obs2, vtkInteractorObserver *);
   BBTK_DECLARE_INPUT(Obs3, vtkInteractorObserver *);
   BBTK_DECLARE_INPUT(Obs4, vtkInteractorObserver *);
   BBTK_DECLARE_INPUT(Obs5, vtkInteractorObserver *);
-  
+
   BBTK_DECLARE_OUTPUT(wxVtkBaseView1,wxVtkBaseView*);
   BBTK_DECLARE_OUTPUT(wxVtkBaseView2,wxVtkBaseView*);
   BBTK_DECLARE_OUTPUT(wxVtkBaseView3,wxVtkBaseView*);
@@ -66,14 +72,13 @@ class /*BBTK_EXPORT*/ ViewerNV
   BBTK_CREATE_WIDGET(CreateWidget);
   void CreateWidget(wxWindow* parent);
 
-   std::vector<int>                    point;
-private:       
-       bool    firsttime;
-
-       vtkImageData* currentimg;
-       std::vector<int>  currenttype;
-       wxMaracas_N_ViewersWidget       *mwxwidget;
+   std::vector<int>                            _point;
+private:
 
+       vtkImageData                            *_currentimg;
+       std::vector<int>                        _currenttype;
+       wxMaracas_N_ViewersWidget       *_mwxwidget;
+       
        bool compareVectors(std::vector<int> type,std::vector<int> currenttype);
        void updateObservers();
 };
@@ -85,7 +90,7 @@ BBTK_DESCRIPTION("Viewer : N view configuration 2D and 3D");
   BBTK_CATEGORY("viewer");
   BBTK_INPUT(ViewerNV,Title,"Title prepended to the text",std::string,"");
   BBTK_INPUT(ViewerNV,In,"Input image",vtkImageData*,"");
-  BBTK_INPUT(ViewerNV,nTypeView,"vector of viewer types (default 5 0 1 3 ): -1=Z_2DwithOutAxis 0=Z_2D 1=X_2D 2=Y_2D 3=Plane 4=Sphere 5=3D 6=3Dplane 7=3D_empty",std::vector<int>,"");
+  BBTK_INPUT(ViewerNV,nTypeView,"vector of viewer types (default 5 1 2 0): -1=Z_2DwithOutAxis 0=Z_2D 1=X_2D 2=Y_2D 3=Plane 4=Sphere 5=3D 6=3Dplane 7=3D_empty",std::vector<int>,"");
   BBTK_INPUT(ViewerNV,ColorFunction,"Optional: set a different color for the viewers 2D",vtkColorTransferFunction*,"");
   BBTK_INPUT(ViewerNV,WindowLevel,"Optional: set a different Window level by using an other widget",int,"");
   BBTK_INPUT(ViewerNV,ColorLevel,"Optional: set a different Color level by using an other widget",int,"");
@@ -94,7 +99,7 @@ BBTK_DESCRIPTION("Viewer : N view configuration 2D and 3D");
   BBTK_INPUT(ViewerNV,Obs3,"Optional: set a different Color level by using an other widget",vtkInteractorObserver*,"");
   BBTK_INPUT(ViewerNV,Obs4,"Optional: set a different Color level by using an other widget",vtkInteractorObserver*,"");
   BBTK_INPUT(ViewerNV,Obs5,"Optional: set a different Color level by using an other widget",vtkInteractorObserver*,"");
-  
+
   BBTK_OUTPUT(ViewerNV,wxVtkBaseView1,"wxVtkBaseView 1",wxVtkBaseView  *,"");
   BBTK_OUTPUT(ViewerNV,wxVtkBaseView2,"wxVtkBaseView 2",wxVtkBaseView  *,"");
   BBTK_OUTPUT(ViewerNV,wxVtkBaseView3,"wxVtkBaseView 3",wxVtkBaseView  *,"");