From e0db3524deab4b66c1a59949fc1a0c60047328f3 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Sat, 21 Aug 2010 15:19:11 +0000 Subject: [PATCH] *** empty log message *** --- bbtk/bbs/appli/exampleShowNPoints.bbs | 12 +- bbtk/src/bbmaracasvisuShowNPoints.cxx | 18 +-- bbtk/src/bbmaracasvisuViewerNV.cxx | 106 +++++++++--------- bbtk/src/bbmaracasvisuViewerNV.h | 2 +- .../widgets/wxMaracas_ViewerWidget.cxx | 27 +++-- 5 files changed, 84 insertions(+), 81 deletions(-) diff --git a/bbtk/bbs/appli/exampleShowNPoints.bbs b/bbtk/bbs/appli/exampleShowNPoints.bbs index cf6a07c..e0f81d0 100644 --- a/bbtk/bbs/appli/exampleShowNPoints.bbs +++ b/bbtk/bbs/appli/exampleShowNPoints.bbs @@ -18,23 +18,23 @@ load creaMaracasVisu # Use new box (choose the way you want to select images) # ----------------------------------------------------- -load creaImageIO -new ImagesReader chooser + +#load creaImageIO +#new ImageReader chooser # Concatenate all the supposed-to-be consistent 2D images into a single vtkImageData # WARNING : File names alphabetical order is suposed to be meaningful ... -new ConcatImages reader - connect chooser.Out reader.In +#new ConcatImages reader +# connect chooser.Out reader.In # Here loads hola.mhd # ------------------------- -/* + include vtk/boxes/bbLoadHola new LoadHola reader -*/ # uncomment next lines to have a file selector # --------------------------------------------- diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx index dd99af8..1b1845a 100644 --- a/bbtk/src/bbmaracasvisuShowNPoints.cxx +++ b/bbtk/src/bbmaracasvisuShowNPoints.cxx @@ -63,9 +63,9 @@ namespace bbcreaMaracasVisu sizer1->Add(btnDeleteAllPoints); sizer1->Add(txtNrPoints); sizer1->Add(txOpacity); - sizer1->Add(sdrOpacity); + sizer1->Add(sdrOpacity,1,wxGROW ); sizer1->Add(txRadio); - sizer1->Add(sdrRadio); + sizer1->Add(sdrRadio,1,wxGROW ); sizer1->Add(btnSavePoints); sizer1->Add(btnLoadPoints); @@ -128,7 +128,7 @@ void WidgetShowNPoints::SetOpacity(double opacity) { this->mopacity=opacity; //NTU: For Slider - sdrOpacity->SetValue(this->mopacity*100.0); + sdrOpacity->SetValue(this->mopacity/100.0); } //------------------------------------------------------------------------ @@ -454,7 +454,8 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ShowNPoints,bbtk::WxBlackBox); void ShowNPoints::Process() { - if (mwxwidget!=NULL){ + if (mwxwidget!=NULL) + { mwxwidget->SetRenderer( bbGetInputRenderer() ); mwxwidget->SetPoint( bbGetInputIn() ); mwxwidget->SetImage( bbGetInputImage() ); @@ -472,14 +473,7 @@ void ShowNPoints::Process() void ShowNPoints::CreateWidget(wxWindow* parent) { mwxwidget = new WidgetShowNPoints( parent, this); - mwxwidget->SetPoint( bbGetInputIn() ); - - if (bbGetInputImage()==NULL) - { - printf("Missing Image (ShowNPoints) \n"); - } - - bbSetOutputWidget( mwxwidget ); + bbSetOutputWidget( mwxwidget ); } void ShowNPoints::bbUserSetDefaultValues() diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx index c1f8149..e404aaf 100644 --- a/bbtk/src/bbmaracasvisuViewerNV.cxx +++ b/bbtk/src/bbmaracasvisuViewerNV.cxx @@ -60,7 +60,6 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox); //------------------------------------------------------------- void ViewerNV::Process() { - vtkImageData* img = bbGetInputIn(); /* double spc[3]; @@ -75,12 +74,8 @@ void ViewerNV::Process() */ std::vector type = bbGetInputnTypeView(); -// std::cout<<"img "<SetType(&type); mwxwidget->UpdateLayout(img); @@ -89,7 +84,11 @@ void ViewerNV::Process() //mwxwidget->UpdateLayout(img); } - mwxwidget->ConfigureVTK(); + if (firsttime==true) // EED 21 aout 2010 + { + firsttime=false; + mwxwidget->ConfigureVTK(); + } mwxwidget->RefreshView(); currenttype = type; @@ -119,20 +118,26 @@ void ViewerNV::Process() if (wvbv3!=NULL) { bbSetOutputRenderer3( wvbv3->GetRenderer() ); } if (wvbv4!=NULL) { bbSetOutputRenderer4( wvbv4->GetRenderer() ); } - if (wvbv1!=NULL) { bbSetOutputInteractor1( wvbv1->GetWxVTKRenderWindowInteractor() ); + if (wvbv1!=NULL) + { + bbSetOutputInteractor1( wvbv1->GetWxVTKRenderWindowInteractor() ); updateObservers(); } - if(bbGetInputColorFunction()!=NULL){ + if(bbGetInputColorFunction()!=NULL) + { mwxwidget->setColorTransferFunction(bbGetInputColorFunction()); } - if(bbGetInputWindowLevel()!=-1){ - mwxwidget->setWindowLevel(bbGetInputWindowLevel()); + if(bbGetInputWindowLevel()!=-1) + { + mwxwidget->setWindowLevel(bbGetInputWindowLevel()); } - if(bbGetInputColorLevel()!=-1){ - if(bbGetInputColorLevel() == 0){ + if(bbGetInputColorLevel()!=-1) + { + if(bbGetInputColorLevel() == 0) + { std::cout<<"colorlevel "<setColorLevel(0.1); }else{ @@ -159,46 +164,47 @@ void ViewerNV::CreateWidget(wxWindow* parent) //------------------------------------------------------------- void ViewerNV::bbUserSetDefaultValues() { - mwxwidget = NULL; - bbSetInputIn(NULL); - - bbSetInputObs1(NULL); - bbSetInputObs2(NULL); - bbSetInputObs3(NULL); - bbSetInputObs4(NULL); - bbSetInputObs5(NULL); - - std::vector vecNTypeViwer; - vecNTypeViwer.push_back(5); - vecNTypeViwer.push_back(0); - vecNTypeViwer.push_back(1); - vecNTypeViwer.push_back(3); - bbSetInputnTypeView(vecNTypeViwer); - - bbSetOutputwxVtkBaseView1( NULL ); - bbSetOutputwxVtkBaseView2( NULL ); - bbSetOutputwxVtkBaseView3( NULL ); - bbSetOutputwxVtkBaseView4( NULL ); - bbSetOutputRenderer1( NULL ); - bbSetOutputRenderer2( NULL ); - bbSetOutputRenderer3( NULL ); - bbSetOutputRenderer4( NULL ); - bbSetInputColorFunction(NULL); - bbSetInputWindowLevel(-1); - bbSetInputColorLevel(-1); + firsttime=true; + mwxwidget = NULL; + bbSetInputIn(NULL); + + bbSetInputObs1(NULL); + bbSetInputObs2(NULL); + bbSetInputObs3(NULL); + bbSetInputObs4(NULL); + bbSetInputObs5(NULL); + + std::vector vecNTypeViwer; + vecNTypeViwer.push_back(5); + vecNTypeViwer.push_back(0); + vecNTypeViwer.push_back(1); + vecNTypeViwer.push_back(3); + bbSetInputnTypeView(vecNTypeViwer); + + bbSetOutputwxVtkBaseView1( NULL ); + bbSetOutputwxVtkBaseView2( NULL ); + bbSetOutputwxVtkBaseView3( NULL ); + bbSetOutputwxVtkBaseView4( NULL ); + bbSetOutputRenderer1( NULL ); + bbSetOutputRenderer2( NULL ); + bbSetOutputRenderer3( NULL ); + bbSetOutputRenderer4( NULL ); + bbSetInputColorFunction(NULL); + bbSetInputWindowLevel(-1); + bbSetInputColorLevel(-1); } - //----------------------------------------------------------------- - void ViewerNV::bbUserInitializeProcessing() - { - } +//----------------------------------------------------------------- +void ViewerNV::bbUserInitializeProcessing() +{ +} - //----------------------------------------------------------------- - void ViewerNV::bbUserFinalizeProcessing() - { - } +//----------------------------------------------------------------- +void ViewerNV::bbUserFinalizeProcessing() +{ +} - //----------------------------------------------------------------- +//----------------------------------------------------------------- diff --git a/bbtk/src/bbmaracasvisuViewerNV.h b/bbtk/src/bbmaracasvisuViewerNV.h index 8dc7ace..e654f01 100644 --- a/bbtk/src/bbmaracasvisuViewerNV.h +++ b/bbtk/src/bbmaracasvisuViewerNV.h @@ -68,7 +68,7 @@ class /*BBTK_EXPORT*/ ViewerNV std::vector point; private: - bool enter; + bool firsttime; vtkImageData* currentimg; std::vector currenttype; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx index bf749e6..58fc9ec 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracas_ViewerWidget.cxx,v $ Language: C++ - Date: $Date: 2010/04/29 16:05:34 $ - Version: $Revision: 1.28 $ + Date: $Date: 2010/08/21 15:19:14 $ + Version: $Revision: 1.29 $ Copyright: (c) 2002, 2003 License: @@ -297,23 +297,26 @@ if ( mwidgetMesure !=NULL ) { mwidgetMesure->SetMesureScale( 1 ); } if ( mwxsphereview !=NULL ) { mwxsphereview->Configure(); } - if (mwxvtk3Dbaseview_Clipping3D !=NULL) { - mwxvtk3Dbaseview_Clipping3D->Configure(); - + if (mwxvtk3Dbaseview_Clipping3D !=NULL) + { + mwxvtk3Dbaseview_Clipping3D->Configure(); } - if (vtkmpr3Ddataviewer !=NULL) { - vtkmpr3Ddataviewer->Configure(); - + if (vtkmpr3Ddataviewer !=NULL) + { + vtkmpr3Ddataviewer->Configure(); } - if (mwxvtkmpr3Dview !=NULL) { - + + if (mwxvtkmpr3Dview !=NULL) + { mwxvtkmpr3Dview->Configure(); mwxvtkmpr3Dview->ResetCamera(ext,org,spc); - } - if (mwxvtkclipping3Dview !=NULL) { mwxvtkclipping3Dview->Configure(); } + if (mwxvtkclipping3Dview !=NULL) + { + mwxvtkclipping3Dview->Configure(); + } //if(vtkmpr3Ddataviewer!=NULL){vtkmpr3Ddataviewer->Configure();} // RefreshView(); -- 2.45.2