#3009 creaMaracasVisu Feature New Normal - Interpolate option in box ViewerNV

[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuViewerNV.cxx

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 122af45b70ca15bcb027a517b4978d217885965c..fd98d87ccc46eabadd54fd74bc173c32989c82ff 100644 (file)
--- 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
@@ -61,48 +86,31 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox);
 void ViewerNV::Process()
 {
        vtkImageData* img = bbGetInputIn();
-/*
-       double spc[3];
-       img->GetSpacing(spc);
-    printf ("EED ViewerNV::Process A %f %f %f \n", spc[0], spc[1], spc[2] );
-       img->SetSpacing( 1,1,1 );
-       img->Update(  );
-       img->GetSpacing(spc);
-       img->PrintSelf(std::cout,(vtkIndent)2);
-       img->Print(std::cout);
-    printf ("EED ViewerNV::Process B %f %f %f \n", spc[0], spc[1], spc[2] );
-*/
        std::vector<int> type = bbGetInputnTypeView();
-
-
-       if(img != NULL && _mwxwidget != NULL){
-               if(!compareVectors(type, _currenttype)){
+       if(img != NULL && _mwxwidget != NULL)
+       {
+               if(!compareVectors(type, _currenttype))
+               {
                        _mwxwidget->SetType(&type);
                        _mwxwidget->UpdateLayout(img);
                }else if (img != _currentimg){
                        _mwxwidget->SetImage(img);
                }
-
                _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);
-
        //    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);
-
                //wxwidget->RefreshView();
-
                bbSetOutputwxVtkBaseView1( wvbv1 );
                bbSetOutputwxVtkBaseView2( wvbv2 );
                bbSetOutputwxVtkBaseView3( wvbv3 );
@@ -111,19 +119,15 @@ void ViewerNV::Process()
                if (wvbv2!=NULL) { bbSetOutputRenderer2( wvbv2->GetRenderer() ); }
                if (wvbv3!=NULL) { bbSetOutputRenderer3( wvbv3->GetRenderer() ); }
                if (wvbv4!=NULL) { bbSetOutputRenderer4( wvbv4->GetRenderer() ); }
-
                if (wvbv1!=NULL)
                {
                        bbSetOutputInteractor1( wvbv1->GetWxVTKRenderWindowInteractor() );
                        updateObservers();
                }
-
                if(bbGetInputColorFunction()!=NULL)
                {
                        _mwxwidget->setColorTransferFunction(bbGetInputColorFunction());
                }
-
-
                if( (bbGetInputColorLevel()!=-1) && (bbGetInputWindowLevel()!=-1))
                {
                        if(bbGetInputColorLevel() == 0)
@@ -133,6 +137,7 @@ void ViewerNV::Process()
                                _mwxwidget->SetColorWindowLevel( bbGetInputWindowLevel() , bbGetInputColorLevel() );
                        }
                }
+               _mwxwidget->SetInterpolate( bbGetInputInterpolate() );
        }//  mwxwidget != NULL
 }
 
@@ -159,6 +164,7 @@ void ViewerNV::bbUserSetDefaultValues()
        bbSetInputObs3(NULL);
        bbSetInputObs4(NULL);
        bbSetInputObs5(NULL);
+       bbSetInputInterpolate(true);
 
        std::vector<int> vecNTypeViwer;
        vecNTypeViwer.push_back(5);