From: Eduardo Davila Date: Mon, 23 Mar 2009 12:55:49 +0000 (+0000) Subject: MACOS configuration X-Git-Tag: EED.02Oct2009~71 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ca358f4baa7cb29eac5628d39f6084b8b13b517a;p=bbtk.git MACOS configuration --- diff --git a/packages/itk/src/bbitkBinaryThresholdImageFilter.h b/packages/itk/src/bbitkBinaryThresholdImageFilter.h index eb26cab..c66255c 100644 --- a/packages/itk/src/bbitkBinaryThresholdImageFilter.h +++ b/packages/itk/src/bbitkBinaryThresholdImageFilter.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkBinaryThresholdImageFilter.h,v $ Language: C++ - Date: $Date: 2008/11/25 11:17:15 $ - Version: $Revision: 1.10 $ + Date: $Date: 2009/03/23 12:55:49 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -144,7 +144,7 @@ namespace bbitk typedef BinaryThresholdImageFilter FilterType; typename FilterType::Pointer f = FilterType::New("Temp"); typedef T* TPointer; - f->bbSetInputIn( this->bbGetInputIn().get < TPointer > ()); + f->bbSetInputIn( this->bbGetInputIn().get < TPointer > () ); f->bbSetInputLowerThreshold ( (typename T::PixelType) this->bbGetInputLowerThreshold() ); f->bbSetInputUpperThreshold ( (typename T::PixelType) diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx index 3aa3a37..ba4cb8c 100644 --- a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx +++ b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkIsoSurfaceExtractor.cxx,v $ Language: C++ - Date: $Date: 2008/11/25 11:17:23 $ - Version: $Revision: 1.10 $ + Date: $Date: 2009/03/23 12:55:52 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -94,6 +94,7 @@ namespace bbvtk void IsoSurfaceExtractor::DoProcess() { +printf("EED IsoSurfaceExtractor::DoProcess() 0\n"); marchingcubes->SetInput( bbGetInputIn() ); marchingcubes->SetValue(0, bbGetInputIsovalue() ); marchingcubes->Update(); @@ -117,7 +118,7 @@ namespace bbvtk { firsttime=false; bbGetInputRenderer()->AddActor( vtkactor ); - } + } } } // EO namespace bbtk diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx index 73b7556..fe71dd7 100644 --- a/packages/wxvtk/src/bbwxvtkViewer3D.cxx +++ b/packages/wxvtk/src/bbwxvtkViewer3D.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxvtkViewer3D.cxx,v $ Language: C++ - Date: $Date: 2008/12/03 13:35:35 $ - Version: $Revision: 1.13 $ + Date: $Date: 2009/03/23 12:55:54 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -134,6 +134,7 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect ) void Viewer3D::bbUserConstructor() { + firsttime=true; bbSetInputIn1(NULL); bbSetInputIn2(NULL); bbSetInputIn3(NULL); @@ -153,8 +154,72 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect ) void Viewer3D::Process() { + printf("EED Viewer3D::Process() 0\n"); + +//EED +// Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget(); +// if (w) w->Update(); + + + Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget(); - if (w) w->Update(); + if ((firsttime==true) && (w!=NULL)){ + firsttime=false; + printf("EED Viewer3D::Process() 1\n"); + + vtkRenderWindowInteractor *interactor = w->GetInteractor(); + if (interactor!=NULL) + { + if (bbGetInputObs1()!=NULL) + { + bbGetInputObs1()->SetInteractor(interactor); + bbGetInputObs1()->EnabledOn(); + } + if (bbGetInputObs2()!=NULL) + { + bbGetInputObs2()->SetInteractor(interactor); + bbGetInputObs2()->EnabledOn(); + } + if (bbGetInputObs3()!=NULL) + { + bbGetInputObs3()->SetInteractor(interactor); + bbGetInputObs3()->EnabledOn(); + } + if (bbGetInputObs4()!=NULL) + { + bbGetInputObs4()->SetInteractor(interactor); + bbGetInputObs4()->EnabledOn(); + } + if (bbGetInputObs5()!=NULL) + { + bbGetInputObs5()->SetInteractor(interactor); + bbGetInputObs5()->EnabledOn(); + } + bbSetOutputInteractor( w->GetInteractor() ); + } // interactor + + vtkRenderer *renderer = w->GetRenderer(); + if (renderer!=NULL) + { + bbSetOutputRenderer( renderer ); + + if (bbGetInputIn1()!=NULL) {renderer->AddActor( bbGetInputIn1() ); } + if (bbGetInputIn2()!=NULL) {renderer->AddActor( bbGetInputIn2() ); } + if (bbGetInputIn3()!=NULL) {renderer->AddActor( bbGetInputIn3() ); } + if (bbGetInputIn4()!=NULL) {renderer->AddActor( bbGetInputIn4() ); } + if (bbGetInputIn5()!=NULL) {renderer->AddActor( bbGetInputIn5() ); } + renderer->ResetCamera(); + double bounds[6]; + renderer->ComputeVisiblePropBounds(bounds); + renderer->ResetCameraClippingRange(bounds); + + } // renderer + + + } // w && firsttime + + if (w!=NULL) w->Update(); + } @@ -165,63 +230,16 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect ) */ void Viewer3D::CreateWidget(wxWindow* parent) { + printf("EED Viewer3D::CreateWidget() 0\n"); + bbtkDebugMessageInc("Core",9,"Viewer3D::CreateWidget()"<Update(); - - - vtkRenderWindowInteractor *interactor = w->GetInteractor(); - if (interactor!=NULL) - { - if (bbGetInputObs1()!=NULL) - { - bbGetInputObs1()->SetInteractor(interactor); - bbGetInputObs1()->EnabledOn(); - } - if (bbGetInputObs2()!=NULL) - { - bbGetInputObs2()->SetInteractor(interactor); - bbGetInputObs2()->EnabledOn(); - } - if (bbGetInputObs3()!=NULL) - { - bbGetInputObs3()->SetInteractor(interactor); - bbGetInputObs3()->EnabledOn(); - } - if (bbGetInputObs4()!=NULL) - { - bbGetInputObs4()->SetInteractor(interactor); - bbGetInputObs4()->EnabledOn(); - } - if (bbGetInputObs5()!=NULL) - { - bbGetInputObs5()->SetInteractor(interactor); - bbGetInputObs5()->EnabledOn(); - } - bbSetOutputInteractor( w->GetInteractor() ); - } - - - vtkRenderer *renderer = w->GetRenderer(); - if (renderer!=NULL) - { - bbSetOutputRenderer( renderer ); + //EED w->Update(); + //... - if (bbGetInputIn1()!=NULL) {renderer->AddActor( bbGetInputIn1() ); } - if (bbGetInputIn2()!=NULL) {renderer->AddActor( bbGetInputIn2() ); } - if (bbGetInputIn3()!=NULL) {renderer->AddActor( bbGetInputIn3() ); } - if (bbGetInputIn4()!=NULL) {renderer->AddActor( bbGetInputIn4() ); } - if (bbGetInputIn5()!=NULL) {renderer->AddActor( bbGetInputIn5() ); } - renderer->ResetCamera(); - double bounds[6]; - renderer->ComputeVisiblePropBounds(bounds); - renderer->ResetCameraClippingRange(bounds); - - } - bbSetOutputWidget(w); bbtkDebugDecTab("Core",9); @@ -232,7 +250,9 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect ) // when window is shown void Viewer3D::OnShowWidget() { - // Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget(); + printf("EED Viewer3D::OnShowWidget() 0\n"); + + // Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget(); // if (w) w->Update(); } diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.h b/packages/wxvtk/src/bbwxvtkViewer3D.h index cb5e5b9..4971915 100644 --- a/packages/wxvtk/src/bbwxvtkViewer3D.h +++ b/packages/wxvtk/src/bbwxvtkViewer3D.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxvtkViewer3D.h,v $ Language: C++ - Date: $Date: 2008/11/24 15:45:54 $ - Version: $Revision: 1.11 $ + Date: $Date: 2009/03/23 12:55:54 $ + Version: $Revision: 1.12 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -100,6 +100,7 @@ namespace bbwxvtk protected: virtual void bbUserConstructor(); + bool firsttime; }; //=================================================================