X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer2D.cxx;h=26a1f9fbd222d4c7b4b43e48b29399229aadf092;hb=98e18224b83c6955a804d79d4e7083626ea8afcd;hp=cc5fe49ba971661aa14f9ca56a000aee54344b61;hpb=cdded8fbd6963f715bb7ef07dd75fade7b91f2e8;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index cc5fe49..26a1f9f 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/09 15:25:08 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2008/12/15 13:13:49 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,7 +21,8 @@
  */
 
 
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
+#ifdef USE_VTK
 
 
 #include "bbwxvtkViewer2D.h"
@@ -80,7 +81,7 @@ namespace bbwxvtk
     
     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);
@@ -95,10 +96,22 @@ namespace bbwxvtk
 	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 );
@@ -333,15 +346,9 @@ namespace bbwxvtk
   }
 
 
-  // This callback is *no more*
-  // necessary to get actual processing of the view 
-  // when window is shown
-  void  Viewer2D::OnShowWidget()
-  {
-  }
-  
 
 }//namespace bbtk
 
 #endif
+#endif