*** empty log message ***

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

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 4530cae2927e28fafe2254d93c81cd52d8e0ab4d..ff52573783798e5633a69282472d1c2dda7d6bbc 100644 (file)
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -32,8 +32,7 @@ bbwxMaracas_N_ViewersWidget::~bbwxMaracas_N_ViewersWidget()
 void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event)
 {
        wxMaracas_N_ViewersWidget::OnRefreshView(event);
-       mbbViewerNV->bbSetModifiedStatus();
-       mbbViewerNV->bbSignalOutputModification("Point");    
+       mbbViewerNV->bbSignalOutputModification(std::string("Point"));    
 
 }
 
@@ -41,8 +40,7 @@ void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event)
 void bbwxMaracas_N_ViewersWidget::OnDClickLeft(wxCommandEvent & event)
 {
        wxMaracas_N_ViewersWidget::OnDClickLeft(event);
-       mbbViewerNV->bbSetModifiedStatus();
-       mbbViewerNV->bbSignalOutputModification("Point");    
+       mbbViewerNV->bbSignalOutputModification(std::string("Point"));    
 }
 
 //-------------------------------------------------------------
@@ -56,44 +54,69 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ViewerNV)
 BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox);
 //-------------------------------------------------------------
 void ViewerNV::Process()
-{
-       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( bbGetInputIn() );
-       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 );
-       bbSetOutputwxVtkBaseView4( wvbv4 );
-       if (wvbv1!=NULL) { bbSetOutputRenderer1( wvbv1->GetRenderer() ); }
-       if (wvbv2!=NULL) { bbSetOutputRenderer2( wvbv2->GetRenderer() ); }
-       if (wvbv3!=NULL) { bbSetOutputRenderer3( wvbv3->GetRenderer() ); }
-       if (wvbv4!=NULL) { bbSetOutputRenderer4( wvbv4->GetRenderer() ); }
+{      
+
+       vtkImageData* img = bbGetInputIn();
+       std::vector<int> type = bbGetInputnTypeView();
+       
+       if(img != NULL && mwxwidget != NULL){// && !enter){
+               
+               if(!compareVectors(type, currenttype)){
+                       mwxwidget->SetType(&type);
+                       mwxwidget->UpdateLayout(img);
+               }else if (img != currentimg){           
+                       mwxwidget->SetImage(img);
+                       //mwxwidget->UpdateLayout(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 );
+               bbSetOutputwxVtkBaseView4( wvbv4 );
+               if (wvbv1!=NULL) { bbSetOutputRenderer1( wvbv1->GetRenderer() ); }
+               if (wvbv2!=NULL) { bbSetOutputRenderer2( wvbv2->GetRenderer() ); }
+               if (wvbv3!=NULL) { bbSetOutputRenderer3( wvbv3->GetRenderer() ); }
+               if (wvbv4!=NULL) { bbSetOutputRenderer4( wvbv4->GetRenderer() ); }
+       }       
 }
 
 //-------------------------------------------------------------
-void ViewerNV::CreateWidget()
+void ViewerNV::CreateWidget(wxWindow* parent)
 {
+
     bbtkDebugMessageInc("Core",9,"ViewerNV::CreateWidget()"<<std::endl);
-       mwxwidget = new bbwxMaracas_N_ViewersWidget( this,bbGetWxParent() , bbGetInputIn() , &(bbGetInputnTypeView())   );
+       mwxwidget = new bbwxMaracas_N_ViewersWidget( this, parent );    
        bbtkDebugDecTab("Core",9);
-    bbSetOutputWidget( mwxwidget );
+    bbSetOutputWidget( mwxwidget );    
+
+       
+       //this->bbSignalOutputModification();
+       //Process();
 }
 
 //-------------------------------------------------------------
 void ViewerNV::bbUserConstructor()
 {
+
+               mwxwidget = NULL;
                bbSetInputIn(NULL);
 
                std::vector<int> vecNTypeViwer;
@@ -115,13 +138,36 @@ void ViewerNV::bbUserConstructor()
 }
 
 //-------------------------------------------------------------
-void ViewerNV::bbUserCopyConstructor()
+void ViewerNV::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
+
+               mwxwidget = NULL;
+               
 }
 
 //-------------------------------------------------------------
 void ViewerNV::bbUserDestructor()
 {
+std::cout << "ViewerNV destroy "<<this<<" vs "<<GetThisPointer<void>()<<std::endl;
+
+}
+
+bool ViewerNV::compareVectors(std::vector<int> type,std::vector<int> currenttype){
+
+       bool ret = true;
+
+       if(type.size()==currenttype.size()){
+               for(int i = 0; i < (int)(type.size()) && ret; i++){
+                       if(type[i]!=currenttype[i]){
+                               ret = false;
+                       }
+               }
+       }else{
+               ret=false;
+       }
+       return ret;
+
+
 }
 
 }