X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2FCutModule%2Finterface%2FCutModelMainPanel.cxx;h=f917adc1129203c094a8b35be586354b61d173b0;hb=2d120b4a381dd83c9bb9e3e05a8da23143f90108;hp=a0622b4176268099f622771cdc72a894a57e2964;hpb=c016f2efd20188d031f0bc29c5a2bb1aab959adf;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx b/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx index a0622b4..f917adc 100644 --- a/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx +++ b/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: CutModelMainPanel.cxx,v $ Language: C++ -Date: $Date: 2010/02/24 13:56:06 $ -Version: $Revision: 1.6 $ +Date: $Date: 2010/09/29 21:21:03 $ +Version: $Revision: 1.11 $ Copyright: (c) 2002, 2003 License: @@ -59,7 +59,7 @@ void CutModelMainPanel::initialize(std::string path){ //RaC 5-02-2010 Add tabs _notebook = new wxAuiNotebook(this,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxAUI_NB_TOP |wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS); - _notebook->AddPage(new ToolBarCutModel(_notebook),"Cutter",true); + _notebook->AddPage(new ToolBarCutModel(_notebook),_T("Cutter"),true); //_wxauimanager->AddPane(new ToolBarCutModel(this),paneinfo.ToolbarPane().Top()); _wxauimanager->AddPane(_notebook,paneinfo.Center()); addPolygonCutterTab(); @@ -126,10 +126,11 @@ void CutModelMainPanel::RemoveActor(int id){ checkInvariant(); if(!this->IsBeingDeleted()){ - for(int i = 0; i < viewpanels.size()-1;i++){ + int i,j; + for(i = 0; i < (int)viewpanels.size()-1;i++){ CutModelView* view = viewpanels[i]; if(view->getId()==id){ - for(int j = i; j < viewpanels.size()-1;j++){ + for(j = i; j < (int)viewpanels.size()-1;j++){ viewpanels[j]=viewpanels[j+1]; } i = viewpanels.size(); @@ -161,7 +162,7 @@ void CutModelMainPanel::onCheckChanged(){ btnExecutePolygonCut->Enable(false); _notebook->GetPage(0)->Enable(false); _radioinsideout->Enable(false); - lblMessagePolygon->SetLabel("Drawing polygon..."); + lblMessagePolygon->SetLabel(_T("Drawing polygon...")); } else { @@ -172,7 +173,7 @@ void CutModelMainPanel::onCheckChanged(){ btnExecutePolygonCut->Enable(true); _notebook->GetPage(0)->Enable(true); _radioinsideout->Enable(true); - lblMessagePolygon->SetLabel("Contour saved! Click on Execute Cut"); + lblMessagePolygon->SetLabel(_T("Contour saved! Click on Execute Cut")); } cutmanager->UpdatePolygon(_isCheck); @@ -181,11 +182,11 @@ void CutModelMainPanel::onCheckChanged(){ //RaC -void CutModelMainPanel::onExecuteCutPolygon(){ +void CutModelMainPanel::onExecuteCutPolygon() +{ //Cuts Polygon cutmanager->ExecuteCutPolygon(_radioinsideout->GetSelection()); - lblMessagePolygon->SetLabel("No contour drawed"); - + lblMessagePolygon->SetLabel(_T("No contour drawed")); } @@ -204,8 +205,11 @@ void CutModelMainPanel::onAddCutModel(){ showErrorDialog(e.getCause()); } } -void CutModelMainPanel::ShowCurrentPanel(int id){ - for(int i = 0; i < viewpanels.size();i++){ + +void CutModelMainPanel::ShowCurrentPanel(int id) +{ + int i; + for(i = 0; i < (int) viewpanels.size();i++){ if(viewpanels[i]->getId()==id){ _wxauimanager->GetPane(viewpanels[i]).Show(true); cutmanager->RefreshActor(id); @@ -229,41 +233,44 @@ int CutModelMainPanel::addNewViewPanel()throw( CutModelException){ } -CutModelView* CutModelMainPanel::getModelView(int id)throw( CutModelException){ - +CutModelView* CutModelMainPanel::getModelView(int id)throw( CutModelException) +{ CutModelView* current = NULL; - for(int i = 0; i < viewpanels.size();i++){ - if(viewpanels[i]->getId()==id){ + int i; + for(i = 0; i < (int)viewpanels.size();i++) + { + if(viewpanels[i]->getId()==id) + { current = viewpanels[i]; } } - if(current == NULL){ + if(current == NULL) + { std::string s = "Id not found"; throw CutModelException(s); } return current; } -void CutModelMainPanel::onUndo(){ + +void CutModelMainPanel::onUndo() + { try{ checkInvariant(); - int result = cutmanager->Undo(); + /*int result = */ cutmanager->Undo(); // result unused// JPR }catch(CutModelException e){ showErrorDialog(e.getCause()); } - } void CutModelMainPanel::onRedo(){ - try{ checkInvariant(); - int result = cutmanager->Redo(); + /*int result = */ cutmanager->Redo(); }catch(CutModelException e){ showErrorDialog(e.getCause()); } - } void CutModelMainPanel::changeOpacity(int id,int opacity){ @@ -285,9 +292,11 @@ void CutModelMainPanel::ShowViewBox(int id,bool check){ showErrorDialog(e.getCause()); } } + void CutModelMainPanel::ShowPopUpMenu(int id){ showErrorDialog("test"); } + void CutModelMainPanel::changeColor(int id,double r,double g,double b){ try{ @@ -297,8 +306,8 @@ void CutModelMainPanel::changeColor(int id,double r,double g,double b){ }catch(CutModelException e){ showErrorDialog(e.getCause()); } - } + void CutModelMainPanel::ChangeShape(int id,int selection){ try{ checkInvariant(); @@ -331,11 +340,12 @@ void CutModelMainPanel::ExecuteCut(int id, double* range, bool isinside){ } void CutModelMainPanel::ExecuteAll(){ - for(int i = 0; i < viewpanels.size(); i++){ + int i; + for(i = 0; i < (int)viewpanels.size(); i++){ viewpanels[i]->ExecuteCut(); } - } + vtkImageData* CutModelMainPanel::GetResultImage(){ try{ checkInvariant(); @@ -381,12 +391,12 @@ void CutModelMainPanel::addPolygonCutterTab(){ panel->SetSizer(sizer); sizer->AddSpacer(20); - wxCheckBox *item = new wxCheckBox(panel,10,"Draw Polygon",wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,""); + wxCheckBox *item = new wxCheckBox(panel,10,_T("Draw Polygon"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,_T("") ); item->SetValue(false); Connect(item->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED,(wxObjectEventFunction)(&PolygonCutterEventHandlerCutModel::onCheckChanged)); sizer->Add(item, 0, wxALIGN_LEFT); - lblMessagePolygon = new wxStaticText(panel,30,"No contour drawed",wxDefaultPosition,wxDefaultSize,0,""); + lblMessagePolygon = new wxStaticText(panel,30,_T("No contour drawed"),wxDefaultPosition,wxDefaultSize,0,_T("") ); sizer->Add(lblMessagePolygon, 0, wxALIGN_LEFT); wxString choices0[2]; @@ -395,16 +405,13 @@ void CutModelMainPanel::addPolygonCutterTab(){ _radioinsideout = new wxRadioBox(panel,-1,_T(""), wxDefaultPosition, wxDefaultSize,2,choices0); sizer->Add(_radioinsideout, wxALIGN_LEFT); - btnExecutePolygonCut = new wxButton(panel,20,"Execute Cut",wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,""); + btnExecutePolygonCut = new wxButton(panel,20,_T("Execute Cut"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,_T("") ); Connect(btnExecutePolygonCut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)(&PolygonCutterEventHandlerCutModel::onExecuteCutPolygon)); sizer->Add(btnExecutePolygonCut, 0, wxALIGN_LEFT); - - _notebook->AddPage(panel, "Polygon Cutter", false); - + _notebook->AddPage(panel, _T("Polygon Cutter"), false); } - void PolygonCutterEventHandlerCutModel::onCheckChanged(wxCommandEvent& event){ CutModelMainPanel::getInstance()->onCheckChanged(); } @@ -413,8 +420,6 @@ void PolygonCutterEventHandlerCutModel::onExecuteCutPolygon(wxCommandEvent& even CutModelMainPanel::getInstance()->onExecuteCutPolygon(); } - - /** ** **/ @@ -441,7 +446,6 @@ ToolBarCutModel::ToolBarCutModel(wxWindow * parent) _evthand = new ToolBarEventHandlerCutModel(); this->SetEventHandler(_evthand); - } ToolBarCutModel::~ToolBarCutModel(void){ @@ -469,11 +473,9 @@ void ToolBarEventHandlerCutModel::onExecuteAll(wxCommandEvent& event){ CutModelMainPanel::getInstance()->ExecuteAll(); } - BEGIN_EVENT_TABLE(ToolBarEventHandlerCutModel, wxEvtHandler) EVT_MENU(10, ToolBarEventHandlerCutModel::onAdd) EVT_MENU(20, ToolBarEventHandlerCutModel::onUndo) EVT_MENU(30, ToolBarEventHandlerCutModel::onRedo) EVT_MENU(40, ToolBarEventHandlerCutModel::onExecuteAll) END_EVENT_TABLE() -