X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourCrownWidget.cxx;h=4ed87a8046dbdb7f7f0c15f610cbefac8592e301;hb=c1b7d6e874f1bfcac251e852ae37229c12c61656;hp=f05103cc0681dac70fba0bfd603ce72c6e04cd4a;hpb=ca78db7b1c30ba0bbb64db3cf28cc92643d49d8e;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx index f05103c..4ed87a8 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx @@ -4,7 +4,8 @@ #include #include - +#include "wxVtk2DBaseView.h" +#include "vtkLookupTable.h" //---------------------------------------------------------------------- wxMaracasCoutourTool::wxMaracasCoutourTool(wxWindow *parent, wxVtkBaseView *wxvtkbaseview, vtkImageData* imagedata) @@ -133,7 +134,7 @@ _manContourControl_1->SetModelView( _mContourModel_1 , _mViewContour_1 ); - this->wxvtkbaseview->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _manContourControl_1 ); + ((vtkInteractorStyleBaseView*)this->wxvtkbaseview->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manContourControl_1 ); _manContourControl_1->CreateNewManualContour(); _manContourControl_1->SetActive(false); _mViewContour_1->RefreshContour(); @@ -157,7 +158,7 @@ _manContourControl_2->SetModelView( _mContourModel_2 , _mViewContour_2 ); - this->wxvtkbaseview->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _manContourControl_2 ); + ((vtkInteractorStyleBaseView*)this->wxvtkbaseview->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manContourControl_2 ); _manContourControl_2->CreateNewManualContour(); _manContourControl_2->SetActive(false); _mViewContour_2->RefreshContour(); @@ -567,8 +568,7 @@ void wxMaracasCoutourTool::EreaseLastContour(wxCommandEvent& event) { while(!feof(fd)) { - fscanf(fd,""); // ?? JPRx - //fscanf(fd," %s %d",&firstline,&size); // JPRx +// //fscanf(fd," %s %d",&firstline,&size); // JPRx fscanf(fd," %s %d",firstline,&size); _SizesC.push_back(size); @@ -599,7 +599,7 @@ void wxMaracasCoutourTool::EreaseLastContour(wxCommandEvent& event) if(fd!=NULL) { int cont = 0; - for(i=0; i<_SizesC.size(); i++) + for(i=0; i<(int)(_SizesC.size()); i++) { fprintf(fd,"\nNumberOfPoints %d", _SizesC[i] ); for(j=0; j<_SizesC[i]; j++) @@ -670,7 +670,7 @@ void wxMaracasCoutourTool::EreaseLastCP(wxCommandEvent& event) if(fd!=NULL) { int cont = 0; - for(i=0; i<_SizesC.size(); i++) + for(i=0; i<(int)(_SizesC.size()); i++) { fprintf(fd,"\nNumberOfControlPoints %d", _SizesC[i] ); for(j=0; j<_SizesC[i]; j++)