v1.0.3 Feature 1408

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

diff --git a/bbtk/src/bbmaracasvisuViewerMPR.cxx b/bbtk/src/bbmaracasvisuViewerMPR.cxx
index 2ba4227066bf4a4e34bf455a1eeaa1f25863c8f2..05191c7e91d9c389f4460cfb4deabc95b40b23a0 100644 (file)
--- a/bbtk/src/bbmaracasvisuViewerMPR.cxx
+++ b/bbtk/src/bbmaracasvisuViewerMPR.cxx
@@ -1,7 +1,7 @@
 
 #include "bbmaracasvisuViewerMPR.h"
-#include "bbmaracasvisuPackage.h"
-namespace bbmaracasvisu
+#include "bbcreaMaracasVisuPackage.h"
+namespace bbcreaMaracasVisu
 {
 
 //--------------------------------------------------------------------------
@@ -26,8 +26,12 @@ END_EVENT_TABLE( );
                wxPanel *panel  = this;
                mbbViewerMPR    = box;
 
+               
                wxwidget = new wxMPRWidget2( panel, marimagedata , 1 ); 
-               wxwidget->ConfigureVTK();
+
+               if(marimagedata != NULL){
+                       wxwidget->ConfigureVTK();
+               }
                wxFlexGridSizer *sizer=new wxFlexGridSizer(1);
                sizer   -> Add( wxwidget,0,wxGROW ); 
                sizer   -> AddGrowableCol(1);
@@ -35,6 +39,13 @@ END_EVENT_TABLE( );
                panel   -> SetAutoLayout(true);
                panel   -> Layout();            
   }
+
+  void wxWidgetMPR::setImageData(vtkImageData* img){
+         wxwidget->setImageData(img, 1);
+  }
+  void wxWidgetMPR::ConfigureVTK(){
+               wxwidget->ConfigureVTK();
+       }
 //--------------------------------------------------------------------------
   wxWidgetMPR::~wxWidgetMPR()
   {
@@ -75,16 +86,16 @@ END_EVENT_TABLE( );
   //---------------
   void wxWidgetMPR::OnRefreshView(wxCommandEvent &event)
   {
-
+  printf("EED wxWidgetMPR::OnRefreshView 01\n");
          if((wxwidget!=NULL) && (mbbViewerMPR!=NULL))
          {
+                 printf("EED wxWidgetMPR::OnRefreshView 02\n");
            point.clear();
                point.push_back((int)wxwidget->GetVtkMPRBaseData()->GetX());
                point.push_back((int)wxwidget->GetVtkMPRBaseData()->GetY());
                point.push_back((int)wxwidget->GetVtkMPRBaseData()->GetZ());
                mbbViewerMPR->bbSetOutputPoint( GetPoint() );
-               mbbViewerMPR->bbSetModifiedStatus();
-               mbbViewerMPR->bbSignalOutputModification("Point");    
+               mbbViewerMPR->bbSignalOutputModification(std::string("Point"));    
                wxwidget->RefreshView();
          }
   }
@@ -106,37 +117,60 @@ END_EVENT_TABLE( );
 
 
 
-BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,ViewerMPR)
+BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ViewerMPR)
 BBTK_BLACK_BOX_IMPLEMENTATION(ViewerMPR,bbtk::WxBlackBox);
 void ViewerMPR::Process()
 {
+       if (wxwidget!=NULL){
                wxBusyCursor wait;         
-               bbSetOutputPoint( mwxwidgetmpr->GetPoint() );
-               bbSetOutputRenderer( mwxwidgetmpr->GetRenderer() );  
+               vtkImageData* img = bbGetInputIn();
+               if(img!=NULL && img != _img){
+                       _img = img;
+                       wxwidget->setImageData(_img);
+                       wxwidget->ConfigureVTK();
+                       
+//                     wxwidget->wxPanel::Refresh();
+                       wxwidget->Refresh();
+//                     wxwidget->Show();
+
+               }       
+                       
+               
+               bbSetOutputPoint( wxwidget->GetPoint() );
+               bbSetOutputRenderer( wxwidget->GetRenderer() );  
+       } // wxwidget
 }
 
-void ViewerMPR::CreateWidget()
+void ViewerMPR::CreateWidget(wxWindow* parent)
 {
        bbtkDebugMessageInc("Core",9,"ViewerMPR::CreateWidget() " <<std::endl);
-       marImageData    *marimagedata = new marImageData(bbGetInputIn() );
+       //JCP 10 - 03 - 09 marImageData *marimagedata = new marImageData(bbGetInputIn() );
        bbtkDebugDecTab("Core",9);
-       mwxwidgetmpr = new wxWidgetMPR(this , bbGetWxParent() ,marimagedata);
-       bbSetOutputWidget( mwxwidgetmpr );
+       wxwidget = new wxWidgetMPR(this , parent);//JCP  10 - 03 - 09,marimagedata);
+       bbSetOutputWidget( wxwidget );
 }
 
-void ViewerMPR::bbUserConstructor()
-{
+void ViewerMPR::bbUserSetDefaultValues()
+{              
+               _img = NULL;
+               wxwidget = NULL;
                bbSetInputIn(NULL);
 }
-void ViewerMPR::bbUserCopyConstructor()
-{
 
+       
+       //-----------------------------------------------------------------     
+       void ViewerMPR::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void ViewerMPR::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       
 }
-void ViewerMPR::bbUserDestructor()
-{
-
-}
-}
-// EO namespace bbmaracasvisu
+// EO namespace bbcreaMaracasVisu