X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer2D.cxx;h=7c5b5f4a28c9a0081bbe46e1fe740b7769c0f2f4;hb=c9290f68cfff1094e0548fae2beb996476e5a496;hp=929147e12b02085c35ee26a838b39b21adee96ed;hpb=dcd0daa8375b06efaf723f38ee9e074b5f9bb306;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 929147e..7c5b5f4 100644
--- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/03 13:35:35 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2009/05/28 08:55:45 $
+  Version:   $Revision: 1.37 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,8 +21,8 @@
  */
 
 
-#ifdef _USE_WXWIDGETS_
-
+#ifdef USE_WXWIDGETS
+#ifdef USE_VTK
 
 #include "bbwxvtkViewer2D.h"
 #include "bbwxvtkPackage.h"
@@ -34,18 +34,34 @@
 #include <vtkInteractorStyleImage.h>
 #include <vtkCommand.h>
 
-
-
 namespace bbwxvtk
 {
-
-  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wxvtk,Viewer2D);
+  //--------------------------------------------------------------------------
+  class Viewer2DWidget : public wxPanel
+  {
+  public:
+    Viewer2DWidget(Viewer2D* box, wxWindow *parent);
+    ~Viewer2DWidget();
+    void UpdateView();
+    vtkRenderer		*GetRenderer();
+    
+  private:
+    bool                        mFirstTime;
+    Viewer2D                    *mBox;
+    wxvtkImageViewer2		*imageViewer;
+    vtkImageData		*backImageData;
+    vtkImageData		*mDefaultImage;
+    wxVTKRenderWindowInteractor *wxvtkrenderwindowinteractor;
+    bool mUpdateCamera;
+
+    vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2;
+  };
   
-
   Viewer2DWidget::Viewer2DWidget(Viewer2D* box,
 				 wxWindow *parent)
     :  
     wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
+    mFirstTime(true),
     mBox(box)
   {
     wxPanel *panel	= this;
@@ -53,13 +69,13 @@ namespace bbwxvtk
     wxvtkrenderwindowinteractor = new wxVTKRenderWindowInteractor(panel,-1);
     wxvtkrenderwindowinteractor->UseCaptureMouseOn();	
 
-    imageViewer	= vtkImageViewer2::New();
+    imageViewer	= wxvtkImageViewer2::New();
     imageViewer->SetSlice( 1 );
     imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
     
     mDefaultImage = vtkImageData::New();
     int dim[3];
-    dim[0] = dim[1] = 32 ; 
+    dim[0] = dim[1] = 256 ; 
     dim[2] = 2; 
     mDefaultImage->SetDimensions ( dim );
     mDefaultImage->SetSpacing(1,1,1);
@@ -71,23 +87,35 @@ namespace bbwxvtk
     for (int i=0;i<dim[0];i++) 
       for (int j=0;j<dim[1];j++) 
         for (int k=0;k<dim[2];k++) 
-	mDefaultImage->SetScalarComponentFromFloat(i,j,k,0,0);
+	   mDefaultImage->SetScalarComponentFromFloat(i,j,k,0,0);
 
     for (int i=0;i<dim[0];i++) 
-	{
-  	  mDefaultImage->SetScalarComponentFromFloat(dim[0]-i-1,i,0,0,255);
-  	  mDefaultImage->SetScalarComponentFromFloat(i,i,1,0,255);
-	}
+      {
+	/*
+	mDefaultImage->SetScalarComponentFromFloat(i,0,0,0,255);
+	mDefaultImage->SetScalarComponentFromFloat(i,dim[1]-1,0,0,255);
+	mDefaultImage->SetScalarComponentFromFloat(0,i,0,0,255);
+	mDefaultImage->SetScalarComponentFromFloat(dim[0]-1,i,0,0,255);
+	mDefaultImage->SetScalarComponentFromFloat(i,0,1,0,255);
+	mDefaultImage->SetScalarComponentFromFloat(i,dim[1]-1,1,0,255);
+	mDefaultImage->SetScalarComponentFromFloat(0,i,1,0,255);
+	mDefaultImage->SetScalarComponentFromFloat(dim[0]-1,i,1,0,255);
+	*/
+	mDefaultImage->SetScalarComponentFromFloat(i,i,0,0,255);
+	mDefaultImage->SetScalarComponentFromFloat(i,dim[1]-i-1,0,0,255);
+	mDefaultImage->SetScalarComponentFromFloat(i,i,1,0,255);
+	mDefaultImage->SetScalarComponentFromFloat(i,dim[1]-i-1,1,0,255);
+      }
 
     backImageData = mDefaultImage;
     imageViewer->SetInput( backImageData );
     mUpdateCamera = true;
 
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-    sizer-> Add( wxvtkrenderwindowinteractor , 1, wxEXPAND, 0);
-    panel-> SetSizer(sizer);
-    panel-> SetAutoLayout(true);
-    panel-> Layout();
+    sizer->Add( wxvtkrenderwindowinteractor, 1, wxEXPAND, 0);
+    panel->SetSizer(sizer);
+    panel->SetAutoLayout(true);
+    panel->Layout();
 
 
     //  wxvtkrenderwindowinteractor->Refresh();
@@ -120,36 +148,44 @@ namespace bbwxvtk
     delete wxvtkrenderwindowinteractor;
     //    std::cout << "Viewer2DWidget::~Viewer2DWidget() OK" << std::endl;
   }
-  
-  //-------------------------------------------------------------------------
-  
 
+  //-------------------------------------------------------------------------
 
 
   void Viewer2DWidget::UpdateView()
   {
-    //    std::cout << "Viewer2DWidget::UpdateView() "<<mBox->bbGetFullName() << std::endl;
-    //   std::cout << "slice="<<mBox->bbGetInputSlice()<<std::endl;
-
-
+    //    std::cout << "Viewer2DWidget::UpdateView() " << std::endl;
+    //    std::cout << "slice="<<mBox->bbGetInputSlice()<<std::endl;
+    mUpdateCamera = false; //JPR  
     if ( ( mBox->bbGetInputIn() == NULL ) &&
 	 ( backImageData != mDefaultImage ) )
       {
+	// 
+	//	std::cout << "** Viewer2DWidget::UpdateView() : NULL Input (reset)" <<std::endl;
 	backImageData = mDefaultImage;
 	mUpdateCamera = true;
       }
     else if ( ( mBox->bbGetInputIn() != NULL ) && 
-	      //      (true) ) //
-	      (backImageData != mBox->bbGetInputIn()) ) 
-      {
-	backImageData = mBox->bbGetInputIn();
-	backImageData->Update();
-	imageViewer->SetInput( backImageData );
-	mUpdateCamera = true;
+	      (( mBox->bbGetInputStatus("In") != bbtk::UPTODATE  ) ||
+	       ( mFirstTime))
+	      )
+	      //(backImageData != mBox->bbGetInputIn()) ) 
+      {	
+	//	std::cout << "** Viewer2DWidget::UpdateView() : Input changed"	<<std::endl;
+	mFirstTime = false;
+	if (backImageData != mBox->bbGetInputIn()) // Don't update if just Slice changed
+	  {
+	  backImageData = mBox->bbGetInputIn();
+	  backImageData->Update();
+	  imageViewer->SetInput( backImageData );
+	  mUpdateCamera = true;
+	  }
       }
 
     if (mUpdateCamera)
       {
+	//	std::cout << "** Viewer2DWidget::UpdateView() : Update Camera"
+	//		  <<std::endl;
 	int x1,x2,y1,y2,z1,z2;
 	double spx,spy,spz;
 	backImageData->GetSpacing(spx,spy,spz);
@@ -197,9 +233,10 @@ namespace bbwxvtk
     
     int orientation = mBox->bbGetInputOrientation();
     if (orientation<0 || orientation>2) {
-      bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 "<<std::endl);
+       bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 "<<std::endl);
        orientation=2; // Why not?      
     }
+
     // mBox->bbIsShown() is necessary to be sure that the wxWindow is already 
     // created and displayed. 
     // Else when slice != 0 we get an X Window System error with wxGTK
@@ -208,7 +245,6 @@ namespace bbwxvtk
 	(mBox->bbIsShown()))
     {
 		int z = mBox->bbGetInputSlice();
-		//	std::cout << "slice = "<<z<<std::endl;
 		int ext[6];
 		backImageData->GetWholeExtent(ext);
 		/*
@@ -238,15 +274,13 @@ namespace bbwxvtk
 	        bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 (shouldn't arrive here!"<<std::endl);
 	        z = ext[5]; // Why not?
            }
-
+	    wxvtkrenderwindowinteractor->Refresh();
+	    wxvtkrenderwindowinteractor->Render();
 	    bbtkDebugMessage("Output",3,"Viewer2D : slice = "<<z<<std::endl);
 	    imageViewer->SetSliceOrientation (orientation);
-	    wxvtkrenderwindowinteractor->Render();
 	    imageViewer->SetSlice( z );
 
-    } 
-    
-    
+    }   
   }
 
 
@@ -263,55 +297,60 @@ namespace bbwxvtk
   //--------------------------------------------------------------------------
 
 
-
-
+  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wxvtk,Viewer2D);
   BBTK_BLACK_BOX_IMPLEMENTATION(Viewer2D,bbtk::WxBlackBox);
 
-
+	
+	//-----------------------------------------------------------------	
+	void Viewer2D::bbUserSetDefaultValues()
+	{
+		bbSetInputIn(NULL);
+		bbSetInputSlice(0);
+		bbSetOutputWidget(0);
+		bbSetOutputRenderer(0);
+		bbSetInputOrientation(2);
+	}
+	
+	//-----------------------------------------------------------------	
+	void Viewer2D::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void Viewer2D::bbUserFinalizeProcessing()
+	{
+	}
+	
+	//--------------------------------------------------------------------------
   void Viewer2D::Process() 
   { 
+    //    std::cout << "Viewer2D::Process" << std::endl;
+    //    std::cout << "In="<<bbtk::GetIOStatusString(bbGetInputStatus("In")) << std::endl;
+    //    std::cout << "Slice="<<bbtk::GetIOStatusString(bbGetInputStatus("Slice")) << std::endl;
     Viewer2DWidget* w = (Viewer2DWidget*)bbGetOutputWidget(); 
     if (w)
-      {
+      {      
 	w->UpdateView();
-	bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
       }
-    bbSetOutputOut( bbGetInputSlice() );
-    
+    bbSetOutputOut( bbGetInputSlice() );  
   }
   
 
-  void Viewer2D::bbUserConstructor()
-  {
-    bbSetInputIn(NULL);
-    bbSetInputSlice(0);
-    bbSetOutputWidget(0);
-    bbSetInputOrientation(2);
-  }
 
-  /**
-   * \brief  Create wxWidget . 
-   *
-   *
-   */ 
+
+	//--------------------------------------------------------------------------
   void Viewer2D::CreateWidget(wxWindow* parent)
   {
-    Viewer2DWidget* w = new Viewer2DWidget(this,parent);//bbGetWxParent());
+    Viewer2DWidget* w = new Viewer2DWidget(this,parent);
+    w->UpdateView();
     bbSetOutputWidget(w);
+    bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
   }
 
 
-  // This callback is *no more*
-  // necessary to get actual processing of the view 
-  // when window is shown
-  void  Viewer2D::OnShowWidget()
-  {
-    // ((Viewer2DWidget*)bbGetOutputWidget())->Update();
-    // ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
-  }
-  
 
 }//namespace bbtk
 
 #endif
+#endif