From: Eduardo Davila Date: Sat, 13 Nov 2010 10:11:33 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: ManualPaint~1 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cefa77de44f7a3d8d13115555686f59b7f10faae;p=creaMaracasVisu.git *** empty log message *** --- diff --git a/CMakeLists.txt b/CMakeLists.txt index afd1471..504a863 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,12 +46,13 @@ MARK_AS_ADVANCED( SET(CREAMARACASVISU_LIB_PATH ${CMAKE_CREA_LIB_PATH} ) +INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/data/Icons ) + ADD_SUBDIRECTORY(install) #ADD_SUBDIRECTORY(appli) ADD_SUBDIRECTORY(lib) ADD_SUBDIRECTORY(bbtk) -INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/data/Icons ) SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/data) FILE(GLOB CONFIGURE_DATA_FILES *.*) diff --git a/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx b/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx index f917adc..0f74ccf 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/09/29 21:21:03 $ -Version: $Revision: 1.11 $ +Date: $Date: 2010/11/13 10:11:34 $ +Version: $Revision: 1.12 $ Copyright: (c) 2002, 2003 License: @@ -26,10 +26,10 @@ PURPOSE. See the above copyright notice for more information. #include #include -#include -#include -#include -#include +#include "Add.xpm" +#include "Undo.xpm" +#include "Redo.xpm" +#include "OkAll.xpm" @@ -44,7 +44,7 @@ CutModelMainPanel::CutModelMainPanel( wxWindow* parent, std::string path) initialize(path); } -CutModelMainPanel::~CutModelMainPanel( ){ +CutModelMainPanel::~CutModelMainPanel( ){ viewpanels.clear(); delete cutmanager; } @@ -52,7 +52,7 @@ CutModelMainPanel::~CutModelMainPanel( ){ void CutModelMainPanel::initialize(std::string path){ cutmanager = new CutModelManager(path); _panelid = 0; - _wxauimanager = new wxAuiManager(this); + _wxauimanager = new wxAuiManager(this); wxAuiPaneInfo paneinfo; @@ -60,7 +60,7 @@ void CutModelMainPanel::initialize(std::string path){ _notebook = new wxAuiNotebook(this,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxAUI_NB_TOP |wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS); _notebook->AddPage(new ToolBarCutModel(_notebook),_T("Cutter"),true); - //_wxauimanager->AddPane(new ToolBarCutModel(this),paneinfo.ToolbarPane().Top()); + //_wxauimanager->AddPane(new ToolBarCutModel(this),paneinfo.ToolbarPane().Top()); _wxauimanager->AddPane(_notebook,paneinfo.Center()); addPolygonCutterTab(); _notebook->Update(); @@ -113,10 +113,10 @@ void CutModelMainPanel::setRenderer(vtkRenderer* renderer){ void CutModelMainPanel::checkInvariant()throw (CutModelException){ if(cutmanager==NULL){ throw CutModelException("The manager is not initialize"); - } + } } -void CutModelMainPanel::showErrorDialog(std::string str){ +void CutModelMainPanel::showErrorDialog(std::string str){ wxMessageDialog* diag = new wxMessageDialog(this, wxString(str.c_str(),wxConvUTF8 ), wxString(str.c_str(),wxConvUTF8 ), wxICON_ERROR); diag->ShowModal(); } @@ -138,7 +138,7 @@ void CutModelMainPanel::RemoveActor(int id){ } viewpanels.pop_back(); cutmanager->RemoveActor(id); - } + } }catch(CutModelException e){ showErrorDialog(e.getCause()); @@ -154,7 +154,7 @@ void CutModelMainPanel::onCheckChanged(){ } if(_isCheck==false) - { + { _isCheck=true; //Draw Polygon @@ -165,7 +165,7 @@ void CutModelMainPanel::onCheckChanged(){ lblMessagePolygon->SetLabel(_T("Drawing polygon...")); } else - { + { _isCheck=false; //Finish Drawing cout<<"Finish Drawing"<onAddCutModel(id, getModelView(id)); _panelid++; @@ -209,7 +209,7 @@ void CutModelMainPanel::onAddCutModel(){ void CutModelMainPanel::ShowCurrentPanel(int id) { int i; - for(i = 0; i < (int) viewpanels.size();i++){ + for(i = 0; i < (int) viewpanels.size();i++){ if(viewpanels[i]->getId()==id){ _wxauimanager->GetPane(viewpanels[i]).Show(true); cutmanager->RefreshActor(id); @@ -224,10 +224,10 @@ int CutModelMainPanel::addNewViewPanel()throw( CutModelException){ CutModelView* viewpanel = new CutModelView(this,cutmanager->getImageRange()); wxAuiPaneInfo paneinfo0; - _wxauimanager->AddPane(viewpanel, paneinfo0.DefaultPane().DestroyOnClose().Centre()); + _wxauimanager->AddPane(viewpanel, paneinfo0.DefaultPane().DestroyOnClose().Centre()); viewpanel->setId(_panelid); - viewpanels.push_back(viewpanel); + viewpanels.push_back(viewpanel); return viewpanel->getId(); @@ -255,7 +255,7 @@ CutModelView* CutModelMainPanel::getModelView(int id)throw( CutModelException) void CutModelMainPanel::onUndo() { try{ - checkInvariant(); + checkInvariant(); /*int result = */ cutmanager->Undo(); // result unused// JPR }catch(CutModelException e){ @@ -265,7 +265,7 @@ void CutModelMainPanel::onUndo() void CutModelMainPanel::onRedo(){ try{ - checkInvariant(); + checkInvariant(); /*int result = */ cutmanager->Redo(); }catch(CutModelException e){ @@ -275,7 +275,7 @@ void CutModelMainPanel::onRedo(){ void CutModelMainPanel::changeOpacity(int id,int opacity){ try{ - checkInvariant(); + checkInvariant(); cutmanager->changeOpacity(id, opacity); }catch(CutModelException e){ @@ -285,7 +285,7 @@ void CutModelMainPanel::changeOpacity(int id,int opacity){ void CutModelMainPanel::ShowViewBox(int id,bool check){ try{ - checkInvariant(); + checkInvariant(); cutmanager->ShowViewBox(id, check); }catch(CutModelException e){ @@ -300,7 +300,7 @@ void CutModelMainPanel::ShowPopUpMenu(int id){ void CutModelMainPanel::changeColor(int id,double r,double g,double b){ try{ - checkInvariant(); + checkInvariant(); cutmanager->changeColor(id, r, g, b); }catch(CutModelException e){ @@ -331,7 +331,7 @@ void CutModelMainPanel::updateActorDirection(int id){ void CutModelMainPanel::ExecuteCut(int id, double* range, bool isinside){ try{ - checkInvariant(); + checkInvariant(); cutmanager->ExecuteCut(id, range, isinside); }catch(CutModelException e){ @@ -387,7 +387,7 @@ int CutModelMainPanel::GetType(){ void CutModelMainPanel::addPolygonCutterTab(){ wxPanel *panel = new wxPanel(_notebook); panel->SetAutoLayout(true); - wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); + wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); panel->SetSizer(sizer); sizer->AddSpacer(20); @@ -406,7 +406,7 @@ void CutModelMainPanel::addPolygonCutterTab(){ sizer->Add(_radioinsideout, wxALIGN_LEFT); btnExecutePolygonCut = new wxButton(panel,20,_T("Execute Cut"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,_T("") ); - Connect(btnExecutePolygonCut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)(&PolygonCutterEventHandlerCutModel::onExecuteCutPolygon)); + Connect(btnExecutePolygonCut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)(&PolygonCutterEventHandlerCutModel::onExecuteCutPolygon)); sizer->Add(btnExecutePolygonCut, 0, wxALIGN_LEFT); _notebook->AddPage(panel, _T("Polygon Cutter"), false); @@ -435,12 +435,12 @@ ToolBarCutModel::ToolBarCutModel(wxWindow * parent) this->AddTool(20, wxString(_T("Undo")),bitmap20); wxBitmap bitmap30(Redo_xpm); - this->AddTool(30, wxString(_T("Redo")),bitmap30); + this->AddTool(30, wxString(_T("Redo")),bitmap30); this->AddSeparator(); wxBitmap bitmap40(OkAll_xpm); - this->AddTool(40, wxString(_T("Ok All")),bitmap40); + this->AddTool(40, wxString(_T("Ok All")),bitmap40); this->Realize(); @@ -462,7 +462,7 @@ void ToolBarEventHandlerCutModel::onAdd(wxCommandEvent& event){ } void ToolBarEventHandlerCutModel::onUndo(wxCommandEvent& event){ - CutModelMainPanel::getInstance()->onUndo(); + CutModelMainPanel::getInstance()->onUndo(); } void ToolBarEventHandlerCutModel::onRedo(wxCommandEvent& event){