.

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracas_N_ViewersWidget.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
index d791fd378dcf97b3149349b6cf986e22744b5458..4ad8c77b282f5c3c39b0d85dda5d6b0c900c0e74 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_N_ViewersWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 13:54:35 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2009/06/05 06:07:39 $
+  Version:   $Revision: 1.10 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -45,13 +45,13 @@
        wxMaracas_N_ViewersWidget::wxMaracas_N_ViewersWidget(wxWindow *parent, vtkImageData* imagedata, std::vector<int> *nTypeView)
                : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
        {
-               wxwindow1       = NULL;
-               wxwindow2       = NULL;
-               wxwindow3       = NULL;
-               wxwindow4       = NULL;
-
-               _currentwxw = NULL;
-
+               wxwindow1               = NULL;
+               wxwindow2               = NULL;
+               wxwindow3               = NULL;
+               wxwindow4               = NULL;
+               _currentwxw             = NULL;
+               mvtkmprbasedata = NULL;
+               
                wxSizer *sizer  = new wxBoxSizer(wxVERTICAL);
                this->SetSizer(sizer);
                this->SetAutoLayout(true);
@@ -68,7 +68,11 @@
          
        wxMaracas_N_ViewersWidget::~wxMaracas_N_ViewersWidget()
        {
-               
+               if (mvtkmprbasedata!=NULL)
+               {
+                       delete mvtkmprbasedata;
+               }
+
        }
        //------------------------------------------------------------------------------------------------------------
        // Methods
@@ -104,7 +108,7 @@
        }
 
        void wxMaracas_N_ViewersWidget::RefreshView()
-       {
+       {               
                if (wxwindow1!=NULL) {wxwindow1->RefreshView(); }
                if (wxwindow2!=NULL) {wxwindow2->RefreshView(); }
                if (wxwindow3!=NULL) {wxwindow3->RefreshView(); }
@@ -144,15 +148,26 @@
        }
    
        //-------------------------------------------------------------------------
- void wxMaracas_N_ViewersWidget::Refresh(bool eraseBackground, const wxRect* rect )
- {
-        wxPanel::Refresh(false);
- }
+       void wxMaracas_N_ViewersWidget::Refresh(bool eraseBackground, const wxRect* rect )
+       {
+               wxPanel::Refresh(false);
+       }
 
- void wxMaracas_N_ViewersWidget::UpdateLayout(vtkImageData* imagedata){
+       //-------------------------------------------------------------------------
+       void wxMaracas_N_ViewersWidget::UpdateLayout(vtkImageData* imagedata)
+       {
 
                wxWindow                                *wxwindow       = NULL;
-               wxSizer *sizer  = this->GetSizer();     
+               wxSizer *sizer                                          = this->GetSizer();     
+               
+               if (mvtkmprbasedata!=NULL)
+               {
+                       delete mvtkmprbasedata;
+               }
+               
+               marImageData    *marimagedata   = new marImageData( imagedata );                        
+               mvtkmprbasedata                                 = new vtkMPRBaseData(); 
+               mvtkmprbasedata->SetMarImageData(marimagedata);
                
                if(_currentwxw != NULL){
                        _currentwxw->Show(false);
@@ -164,16 +179,15 @@
                //std::cout<<"size "<<nTypeView->size()<<std::endl;
                if (nTypeView->size()==1)
                {
-                       wxwindow1 = new wxMaracas_ViewerWidget(this, imagedata, (*nTypeView)[0]);
+                       wxwindow1 = new wxMaracas_ViewerWidget(this, imagedata, (*nTypeView)[0],mvtkmprbasedata);
 
                        wxwindow1->ConfigureVTK();
                        wxwindow = wxwindow1;
                }else   if (nTypeView->size()==2)       {
-
-                       
                        wxSplitterWindow        *spliter        = new wxSplitterWindow( this , -1);
-                       wxwindow1 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[0]);
-                       wxwindow2 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[1]);
+                       spliter->SetMinimumPaneSize(1);
+                       wxwindow1 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[0],mvtkmprbasedata);
+                       wxwindow2 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[1],mvtkmprbasedata);
                        wxwindow1->ConfigureVTK();
                        wxwindow2->ConfigureVTK();
                        spliter -> SplitVertically( wxwindow1 , wxwindow2  );
@@ -182,9 +196,11 @@
                {
                        wxSplitterWindow        *spliter        = new wxSplitterWindow( this , -1);
                        wxSplitterWindow        *spliterA       = new wxSplitterWindow( spliter , -1);
-                       wxwindow1 = new wxMaracas_ViewerWidget(spliter , imagedata, (*nTypeView)[0]);
-                       wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1]);
-                       wxwindow3 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[2]);
+                       spliter->SetMinimumPaneSize(1);
+                       spliterA->SetMinimumPaneSize(1);
+                       wxwindow1 = new wxMaracas_ViewerWidget(spliter , imagedata, (*nTypeView)[0],mvtkmprbasedata);
+                       wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1],mvtkmprbasedata);
+                       wxwindow3 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[2],mvtkmprbasedata);
                        wxwindow1->ConfigureVTK();
                        wxwindow2->ConfigureVTK();
                        wxwindow3->ConfigureVTK();
@@ -195,10 +211,13 @@
                        wxSplitterWindow        *spliter        = new wxSplitterWindow( this , -1);
                        wxSplitterWindow        *spliterA       = new wxSplitterWindow( spliter , -1);
                        wxSplitterWindow        *spliterB       = new wxSplitterWindow( spliter , -1);
-                       wxwindow1 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[0]);
-                       wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1]);
-                       wxwindow3 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[2]);
-                       wxwindow4 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[3]);
+                       spliter->SetMinimumPaneSize(1);
+                       spliterA->SetMinimumPaneSize(1);
+                       spliterB->SetMinimumPaneSize(1);
+                       wxwindow1 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[0],mvtkmprbasedata);
+                       wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1],mvtkmprbasedata);
+                       wxwindow3 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[2],mvtkmprbasedata);
+                       wxwindow4 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[3],mvtkmprbasedata);
                        wxwindow1->ConfigureVTK();
                        wxwindow2->ConfigureVTK();
                        wxwindow3->ConfigureVTK();
@@ -219,9 +238,15 @@
                this->Refresh();
  }
 
+
+//-----------------------------------------------------------------------------------
  void wxMaracas_N_ViewersWidget::SetType(std::vector<int>* type){
         nTypeView = type;
  }
+
+
+
+//-----------------------------------------------------------------------------------
  void wxMaracas_N_ViewersWidget::SetImage( vtkImageData *image )
  {
         if (wxwindow1!=NULL) { 
@@ -235,44 +260,26 @@
 
  }
 
-
+//-----------------------------------------------------------------------------------
 double wxMaracas_N_ViewersWidget :: GetX()
 {
-       return wxwindow1->GetX();
+       return mvtkmprbasedata->GetX();
+//     return wxwindow1->GetX();
 }
 
+//-----------------------------------------------------------------------------------
 double wxMaracas_N_ViewersWidget :: GetY()
 {
-       return wxwindow1->GetY();
+       return mvtkmprbasedata->GetY();
+//     return wxwindow1->GetY();
 }
 
 
+//-----------------------------------------------------------------------------------
 double wxMaracas_N_ViewersWidget :: GetZ()
 {
-       return wxwindow1->GetZ();
+       return mvtkmprbasedata->GetZ();
+//     return wxwindow1->GetZ();
 }
 
 
-/*
-double wxMaracas_N_ViewersWidget :: GetZ(int iWin)
-       {
-               double answerVal = 0.0;
-               if  (iWin==1)
-               {
-                       answerVal = wxwindow1->GetZ();
-               }
-               if  (iWin==2)
-               {
-                       answerVal = wxwindow2->GetZ();
-               }
-               if  (iWin==3)
-               {
-                       answerVal = wxwindow3->GetZ();
-               }
-               if  (iWin==4)
-               {
-                       answerVal = wxwindow4->GetZ();
-               }
-               return answerVal;
-       }
-*/