X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuViewerNV.cxx;h=1b17eec7de9729c10600818c5b9b863ff014f6c8;hb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;hp=c1f8149ea20b0a1f56f2f1433a6c8d79f6d6a336;hpb=7cdd257ac8ad23e435cfbcd768805ccd40acdad3;p=creaMaracasVisu.git diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx index c1f8149..1b17eec 100644 --- a/bbtk/src/bbmaracasvisuViewerNV.cxx +++ b/bbtk/src/bbmaracasvisuViewerNV.cxx @@ -1,3 +1,28 @@ +/*# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Sant�) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + #include "bbmaracasvisuViewerNV.h" #include "bbcreaMaracasVisuPackage.h" namespace bbcreaMaracasVisu @@ -31,13 +56,13 @@ bbwxMaracas_N_ViewersWidget::~bbwxMaracas_N_ViewersWidget() void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event) { //printf("CPR: bbwxMaracas_N_ViewersWidget::OnRefreshView -> actualiza X, Y y Z\n"); - mbbViewerNV->point.clear(); + mbbViewerNV->_point.clear(); - mbbViewerNV->point.push_back( (int)GetX() ); - mbbViewerNV->point.push_back( (int)GetY() ); - mbbViewerNV->point.push_back( (int)GetZ() ); - mbbViewerNV->bbSetOutputPoint( mbbViewerNV->point ); - mbbViewerNV->bbSignalOutputModification(std::string("Point")); + mbbViewerNV->_point.push_back( (int)GetX() ); + mbbViewerNV->_point.push_back( (int)GetY() ); + mbbViewerNV->_point.push_back( (int)GetZ() ); + mbbViewerNV->bbSetOutputPoint( mbbViewerNV->_point ); + mbbViewerNV->bbSignalOutputModification(std::string("Point")); wxMaracas_N_ViewersWidget::OnRefreshView(event); } @@ -46,7 +71,7 @@ void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event) void bbwxMaracas_N_ViewersWidget::OnDClickLeft(wxCommandEvent & event) { wxMaracas_N_ViewersWidget::OnDClickLeft(event); - mbbViewerNV->bbSignalOutputModification(std::string("Point")); + mbbViewerNV->bbSignalOutputModification(std::string("Point")); } //------------------------------------------------------------- @@ -59,9 +84,8 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ViewerNV) BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox); //------------------------------------------------------------- void ViewerNV::Process() -{ - - vtkImageData* img = bbGetInputIn(); +{ + vtkImageData* img = bbGetInputIn(); /* double spc[3]; img->GetSpacing(spc); @@ -75,38 +99,32 @@ void ViewerNV::Process() */ std::vector type = bbGetInputnTypeView(); -// std::cout<<"img "<SetType(&type); - mwxwidget->UpdateLayout(img); - }else if (img != currentimg){ - mwxwidget->SetImage(img); - //mwxwidget->UpdateLayout(img); + + if(img != NULL && _mwxwidget != NULL){ + if(!compareVectors(type, _currenttype)){ + _mwxwidget->SetType(&type); + _mwxwidget->UpdateLayout(img); + }else if (img != _currentimg){ + _mwxwidget->SetImage(img); } - mwxwidget->ConfigureVTK(); - mwxwidget->RefreshView(); + _mwxwidget->RefreshView(); - currenttype = type; - currentimg = img; + _currenttype = type; + _currentimg = img; - point.clear(); - point.push_back((int)mwxwidget->GetX()); - point.push_back((int)mwxwidget->GetY()); - point.push_back((int)mwxwidget->GetZ()); - bbSetOutputPoint(point); + _point.clear(); + _point.push_back((int)_mwxwidget->GetX()); + _point.push_back((int)_mwxwidget->GetY()); + _point.push_back((int)_mwxwidget->GetZ()); + bbSetOutputPoint(_point); - // WxBlackBox::Process(); + // WxBlackBox::Process(); // mwxwidget->SetImage(img ); - wxVtkBaseView *wvbv1 = mwxwidget->GetwxVtkBaseView(1); - wxVtkBaseView *wvbv2 = mwxwidget->GetwxVtkBaseView(2); - wxVtkBaseView *wvbv3 = mwxwidget->GetwxVtkBaseView(3); - wxVtkBaseView *wvbv4 = mwxwidget->GetwxVtkBaseView(4); + wxVtkBaseView *wvbv1 = _mwxwidget->GetwxVtkBaseView(1); + wxVtkBaseView *wvbv2 = _mwxwidget->GetwxVtkBaseView(2); + wxVtkBaseView *wvbv3 = _mwxwidget->GetwxVtkBaseView(3); + wxVtkBaseView *wvbv4 = _mwxwidget->GetwxVtkBaseView(4); //wxwidget->RefreshView(); @@ -119,24 +137,25 @@ 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){ - mwxwidget->setColorTransferFunction(bbGetInputColorFunction()); + if(bbGetInputColorFunction()!=NULL) + { + _mwxwidget->setColorTransferFunction(bbGetInputColorFunction()); } - if(bbGetInputWindowLevel()!=-1){ - mwxwidget->setWindowLevel(bbGetInputWindowLevel()); - } - if(bbGetInputColorLevel()!=-1){ - if(bbGetInputColorLevel() == 0){ - std::cout<<"colorlevel "<setColorLevel(0.1); + if( (bbGetInputColorLevel()!=-1) && (bbGetInputWindowLevel()!=-1)) + { + if(bbGetInputColorLevel() == 0) + { + _mwxwidget->SetColorWindowLevel( bbGetInputWindowLevel() , 0.1 ); }else{ - mwxwidget->setColorLevel(bbGetInputColorLevel()); + _mwxwidget->SetColorWindowLevel( bbGetInputWindowLevel() , bbGetInputColorLevel() ); } } }// mwxwidget != NULL @@ -145,13 +164,10 @@ void ViewerNV::Process() //------------------------------------------------------------- void ViewerNV::CreateWidget(wxWindow* parent) { - bbtkDebugMessageInc("Core",9,"ViewerNV::CreateWidget()"<bbSignalOutputModification(); //Process(); } @@ -159,49 +175,50 @@ 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); + _currentimg = NULL; + _mwxwidget = NULL; + bbSetInputIn(NULL); + + bbSetInputObs1(NULL); + bbSetInputObs2(NULL); + bbSetInputObs3(NULL); + bbSetInputObs4(NULL); + bbSetInputObs5(NULL); + + std::vector vecNTypeViwer; + vecNTypeViwer.push_back(5); + vecNTypeViwer.push_back(1); + vecNTypeViwer.push_back(2); + vecNTypeViwer.push_back(0); + 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::bbUserFinalizeProcessing() - { - } - - //----------------------------------------------------------------- - - - +//----------------------------------------------------------------- +void ViewerNV::bbUserInitializeProcessing() +{ +} + +//----------------------------------------------------------------- +void ViewerNV::bbUserFinalizeProcessing() +{ +} + +//----------------------------------------------------------------- + + + bool ViewerNV::compareVectors(std::vector type,std::vector currenttype){ bool ret = true; @@ -223,30 +240,30 @@ void ViewerNV::updateObservers(){ interactor = bbGetOutputInteractor1(); if(interactor){ if (bbGetInputObs1()!=NULL){ - bbGetInputObs1()->SetInteractor(interactor); - bbGetInputObs1()->EnabledOn(); + bbGetInputObs1()->SetInteractor(interactor); + bbGetInputObs1()->EnabledOn(); } - if (bbGetInputObs2()!=NULL) + if (bbGetInputObs2()!=NULL) { bbGetInputObs2()->SetInteractor(interactor); - bbGetInputObs2()->EnabledOn(); + bbGetInputObs2()->EnabledOn(); } - if (bbGetInputObs3()!=NULL) + if (bbGetInputObs3()!=NULL) { bbGetInputObs3()->SetInteractor(interactor); - bbGetInputObs3()->EnabledOn(); + bbGetInputObs3()->EnabledOn(); } - if (bbGetInputObs4()!=NULL) + if (bbGetInputObs4()!=NULL) { bbGetInputObs4()->SetInteractor(interactor); - bbGetInputObs4()->EnabledOn(); + bbGetInputObs4()->EnabledOn(); } - if (bbGetInputObs5()!=NULL) + if (bbGetInputObs5()!=NULL) { bbGetInputObs5()->SetInteractor(interactor); - bbGetInputObs5()->EnabledOn(); + bbGetInputObs5()->EnabledOn(); } - } + } } }