#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 a1910174557d31e4535b4e197d6561879810996b..262107d1ba0ee8f63f44fd481b6970533d8d7e64 100644 (file)
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -57,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);
 }
 
@@ -85,39 +83,31 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox);
 //-------------------------------------------------------------
 void ViewerNV::Process()
 {
-       vtkImageData* img = bbGetInputIn();
-
-
-       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;
-
                _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 );
@@ -126,19 +116,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)
@@ -148,6 +134,25 @@ void ViewerNV::Process()
                                _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
 }
 
@@ -174,6 +179,7 @@ void ViewerNV::bbUserSetDefaultValues()
        bbSetInputObs3(NULL);
        bbSetInputObs4(NULL);
        bbSetInputObs5(NULL);
+       bbSetInputInterpolate(true);
 
        std::vector<int> vecNTypeViwer;
        vecNTypeViwer.push_back(5);