*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasRenderImageManagementPanel.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp
index 7ebd0c2392c0ea593107400bcc262de42b68dbc8..ca3fa70c2c1456166f9faef151e56a6eafecaa8b 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp
@@ -9,37 +9,7 @@ wxMaracasRenderImageManagementPanel::wxMaracasRenderImageManagementPanel(wxWindo
                                                                                                                                                 wxMaracasSurfaceRenderingManager* _surface2, wxMaracasSurfaceRenderingManager* _surface3, int id)
 : wxDialog(parent, -1, _T("Image Position Parameters"), wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER|wxDEFAULT_DIALOG_STYLE)
 {
-       vol = _vol;
-       surface1 = _surface1;
-       surface2 = _surface2;
-       surface3 = _surface3;
-
-       propID = id;
-
-       transformV = vtkTransform::New();
-       //vtkMatrix4x4 *_matrixV = vtkMatrix4x4::New();
-       //_matrixV->Identity();
-       //transformV->SetMatrix(_matrixV);
-       //transformV->SetInput(vol->getViewData(propID)->getProp3D()->GetUserTransform());
-
-       transformS1 = vtkTransform::New();
-       //vtkMatrix4x4 *_matrixS1 = vtkMatrix4x4::New();
-       //_matrixS1->Identity();
-       //transformS1->SetMatrix(_matrixS1);
-       //transformS1->SetInput(surface1->getViewData(propID)->getProp3D()->GetUserTransform());
-       
-       transformS2 = vtkTransform::New();
-       //vtkMatrix4x4 *_matrixS2 = vtkMatrix4x4::New();
-       //_matrixS2->Identity();
-       //transformS2->SetMatrix(_matrixS2);
-       //transformS2->SetInput(surface2->getViewData(propID)->getProp3D()->GetUserTransform());
-       
-       transformS3 = vtkTransform::New();
-       //vtkMatrix4x4 *_matrixS3 = vtkMatrix4x4::New();
-       //_matrixS3->Identity();
-       //transformS3->SetMatrix(_matrixS3);
-       //transformS3->SetInput(surface3->getViewData(propID)->getProp3D()->GetUserTransform());
-
+       wxtrasform = new wxMaracasRenderImageTransformation(_vol, _surface1, _surface2, _surface3, id);
        createControls();
 }
 
@@ -160,18 +130,17 @@ wxMaracasRenderImageManagementPanel::~wxMaracasRenderImageManagementPanel()
 **/
 void wxMaracasRenderImageManagementPanel::Translate(wxCommandEvent& event)
 {
-       printf("silder translateX = %d \n", sliderTranslateX->GetValue());
-       transformV->Identity();
-       transformS1->Identity();
-       transformS2->Identity();
-       transformS3->Identity();
-
-       transformV->Translate(sliderTranslateX->GetValue(), sliderTranslateY->GetValue(), sliderTranslateZ->GetValue());
-       transformS1->Translate(sliderTranslateX->GetValue(), sliderTranslateY->GetValue(), sliderTranslateZ->GetValue());
-       transformS2->Translate(sliderTranslateX->GetValue(), sliderTranslateY->GetValue(), sliderTranslateZ->GetValue());
-       transformS3->Translate(sliderTranslateX->GetValue(), sliderTranslateY->GetValue(), sliderTranslateZ->GetValue());
-
-       Refresh();
+       printf("wxMaracasRenderImageManagementPanel::Translate translateX = %d \n", sliderTranslateX->GetValue());
+       printf("wxMaracasRenderImageManagementPanel::Translate translatey = %d \n", sliderTranslateY->GetValue());
+       printf("wxMaracasRenderImageManagementPanel::Translate translatez = %d \n", sliderTranslateZ->GetValue());
+       try{
+               wxtrasform->Translate(sliderTranslateX->GetValue(), sliderTranslateY->GetValue(), sliderTranslateZ->GetValue());
+       }
+       catch(char* str){
+               std::cout << "Exception : " << str << '\n';
+               wxMessageDialog* diag = new wxMessageDialog(this, wxString(str,wxConvUTF8 ), wxString(str,wxConvUTF8 ), wxICON_ERROR);
+               diag->ShowModal();
+       }
 }
 
 /**
@@ -179,28 +148,18 @@ void wxMaracasRenderImageManagementPanel::Translate(wxCommandEvent& event)
 **/
 void wxMaracasRenderImageManagementPanel::Rotate(wxCommandEvent& event)
 {
-       printf("silder rotateX = %d \n", sliderRotateX->GetValue());
-
-       transformV->Identity();
-       transformS1->Identity();
-       transformS2->Identity();
-       transformS3->Identity();
+       printf("wxMaracasRenderImageManagementPanel::Rotate rotateX = %d \n", sliderRotateX->GetValue());
+       printf("wxMaracasRenderImageManagementPanel::Rotate rotateY = %d \n", sliderRotateY->GetValue());
+       printf("wxMaracasRenderImageManagementPanel::Rotate rotateZ = %d \n", sliderRotateZ->GetValue());
        
-       transformS1->RotateX( sliderRotateX->GetValue() );
-       transformS2->RotateX( sliderRotateX->GetValue() );
-       transformS3->RotateX( sliderRotateX->GetValue() );
-
-       transformV->RotateY( sliderRotateY->GetValue() );
-       transformS1->RotateY( sliderRotateY->GetValue() );
-       transformS2->RotateY( sliderRotateY->GetValue() );
-       transformS3->RotateY( sliderRotateY->GetValue() );
-
-       transformV->RotateZ( sliderRotateZ->GetValue() );
-       transformS1->RotateZ( sliderRotateZ->GetValue() );
-       transformS2->RotateZ( sliderRotateZ->GetValue() );
-       transformS3->RotateZ( sliderRotateZ->GetValue() );
-
-       Refresh();
+       try{
+               wxtrasform->Rotate( sliderRotateX->GetValue(), sliderRotateY->GetValue(), sliderRotateZ->GetValue() );
+       }
+       catch(char* str){
+               std::cout << "Exception : " << str << '\n';
+               wxMessageDialog* diag = new wxMessageDialog(this, wxString(str,wxConvUTF8 ), wxString(str,wxConvUTF8 ), wxICON_ERROR);
+               diag->ShowModal();
+       }
 }
 
 /**
@@ -208,34 +167,14 @@ void wxMaracasRenderImageManagementPanel::Rotate(wxCommandEvent& event)
 **/
 void wxMaracasRenderImageManagementPanel::Scale(wxCommandEvent& event)
 {
-       transformV->Identity();
-       transformS1->Identity();
-       transformS2->Identity();
-       transformS3->Identity();
-
-       transformV->Scale( sliderTranslateX->GetValue()/50, sliderTranslateY->GetValue()/50, sliderTranslateZ->GetValue()/50 );
-       transformS1->Scale( sliderTranslateX->GetValue(), sliderTranslateY->GetValue(), sliderTranslateZ->GetValue() );
-       transformS2->Scale( sliderTranslateX->GetValue(), sliderTranslateY->GetValue(), sliderTranslateZ->GetValue() );
-       transformS3->Scale( sliderTranslateX->GetValue(), sliderTranslateY->GetValue(), sliderTranslateZ->GetValue() );
+       printf("wxMaracasRenderImageManagementPanel::Rotate rotateX = %d \n", sliderScaleX->GetValue());
+       printf("wxMaracasRenderImageManagementPanel::Rotate rotateY = %d \n", sliderRotateY->GetValue());
+       printf("wxMaracasRenderImageManagementPanel::Rotate rotateZ = %d \n", sliderRotateZ->GetValue());
 
-       Refresh();
-}
-
-void wxMaracasRenderImageManagementPanel::Refresh()
-{
        try{
-               transformV->Update();
-               transformS1->Update();
-               transformS2->Update();
-               transformS3->Update();
-
-               vol->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
-               surface1->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
-               surface2->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
-               surface3->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
+               wxtrasform->Scale( sliderScaleX->GetValue(), sliderScaleY->GetValue(), sliderScaleZ->GetValue() );
        }
-       catch(char* str)
-       {
+       catch(char* str){
                std::cout << "Exception : " << str << '\n';
                wxMessageDialog* diag = new wxMessageDialog(this, wxString(str,wxConvUTF8 ), wxString(str,wxConvUTF8 ), wxICON_ERROR);
                diag->ShowModal();