X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuViewerNV.cxx;h=13444aa1e9d9220c17ba661b39e9127639c5c5cf;hb=4db61566d2cc017bccbbca36f713aa24faecc9f6;hp=b89d78be6a84464285f083c041527090f2cb8cbd;hpb=8e7ab74a199d1f05b01dccfb75da7f2c4754ddc5;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index b89d78b..13444aa 100644
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -1,50 +1,120 @@
 #include "bbmaracasvisuViewerNV.h"
-#include "bbmaracasvisuPackage.h"
-namespace bbmaracasvisu
+#include "bbcreaMaracasVisuPackage.h"
+namespace bbcreaMaracasVisu
 {
 
-BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,ViewerNV)
+
+BEGIN_EVENT_TABLE( bbwxMaracas_N_ViewersWidget, wxPanel )
+	EVT_MENU( 12121, bbwxMaracas_N_ViewersWidget::OnRefreshView )
+	EVT_MENU( 12122, bbwxMaracas_N_ViewersWidget::OnDClickLeft  )
+END_EVENT_TABLE( );
+
+
+//-------------------------------------------------------------
+//-------------------------------------------------------------
+//-------------------------------------------------------------
+
+bbwxMaracas_N_ViewersWidget::bbwxMaracas_N_ViewersWidget(ViewerNV* box,
+														 wxWindow *parent, 
+														 vtkImageData* imagedata, 
+														 std::vector<int> *nTypeView)
+:wxMaracas_N_ViewersWidget(parent,imagedata,nTypeView)
+{
+	mbbViewerNV=box;
+}
+
+//-------------------------------------------------------------
+bbwxMaracas_N_ViewersWidget::~bbwxMaracas_N_ViewersWidget()
+{
+}
+	    
+//-------------------------------------------------------------
+void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event)
+{
+	wxMaracas_N_ViewersWidget::OnRefreshView(event);
+	mbbViewerNV->bbSignalOutputModification(std::string("Point"));    
+
+}
+
+//-------------------------------------------------------------
+void bbwxMaracas_N_ViewersWidget::OnDClickLeft(wxCommandEvent & event)
+{
+	wxMaracas_N_ViewersWidget::OnDClickLeft(event);
+	mbbViewerNV->bbSignalOutputModification(std::string("Point"));    
+}
+
+//-------------------------------------------------------------
+//-------------------------------------------------------------
+//-------------------------------------------------------------
+
+
+
+
+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);
+		}
+		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 wxMaracas_N_ViewersWidget( bbGetWxParent() , bbGetInputIn() , &(bbGetInputnTypeView())	); // taking address of temporary JPRx
+	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;
@@ -66,16 +136,39 @@ 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 < type.size() && ret; i++){
+			if(type[i]!=currenttype[i]){
+				ret = false;
+			}
+		}
+	}else{
+		ret=false;
+	}
+	return ret;
+
+
 }
 
 }
-// EO namespace bbmaracasvisu
+// EO namespace bbcreaMaracasVisu