#3347 creaMaracasVisu Bug New Normal - ViewerMPR2D Reset back position when set...

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

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index c8e287fc0216756afa12b68bd1e2f048a967133e..262107d1ba0ee8f63f44fd481b6970533d8d7e64 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
@@ -32,13 +57,11 @@ void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event)
 {
        //printf("CPR: bbwxMaracas_N_ViewersWidget::OnRefreshView -> actualiza X, Y y Z\n");
        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"));
-
        wxMaracas_N_ViewersWidget::OnRefreshView(event);
 }
 
@@ -60,49 +83,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)){
+       vtkImageData* img               = bbGetInputIn();
+       std::vector<int> type   = bbGetInputnTypeView();
+       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);
-
+               _point.push_back( (int)_mwxwidget->GetX() );
+               _point.push_back( (int)_mwxwidget->GetY() );
+               _point.push_back( (int)_mwxwidget->GetZ() );
+               bbSetOutputPoint( _point                                  );
+
+               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,33 +116,43 @@ 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(bbGetInputWindowLevel()!=-1)
-               {
-                       _mwxwidget->setWindowLevel(bbGetInputWindowLevel());
-               }
-
-               if(bbGetInputColorLevel()!=-1)
+               if( (bbGetInputColorLevel()!=-1) && (bbGetInputWindowLevel()!=-1))
                {
                        if(bbGetInputColorLevel() == 0)
                        {
-                               std::cout<<"colorlevel "<<bbGetInputColorLevel()<<std::endl;
-                               _mwxwidget->setColorLevel(0.1);
+                               _mwxwidget->SetColorWindowLevel( bbGetInputWindowLevel() , 0.1 );
                        }else{
-                               _mwxwidget->setColorLevel(bbGetInputColorLevel());
+                               _mwxwidget->SetColorWindowLevel( bbGetInputWindowLevel() , bbGetInputColorLevel() );
                        }
                }
+               _mwxwidget->SetInterpolate( bbGetInputInterpolate() );
+
+/* Borrame
+               if (wvbv1!=NULL) 
+               {
+                       wxCommandEvent newevent(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+                       //EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+                       #if wxMAJOR_VERSION <= 2
+                               wvbv1->GetWxVTKRenderWindowInteractor ()->GetParent()->ProcessEvent( newevent );
+                       #else
+                               wvbv1->GetWxVTKRenderWindowInteractor ()->GetParent()->ProcessWindowEvent( newevent );
+                       #endif                          
+               }
+
+*/
+
+
+
+
        }//  mwxwidget != NULL
 }
 
@@ -164,6 +179,7 @@ void ViewerNV::bbUserSetDefaultValues()
        bbSetInputObs3(NULL);
        bbSetInputObs4(NULL);
        bbSetInputObs5(NULL);
+       bbSetInputInterpolate(true);
 
        std::vector<int> vecNTypeViwer;
        vecNTypeViwer.push_back(5);