From aa6282fe52dfebfc095104a5ddadc8d3bfd42cd4 Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Tue, 16 Jun 2009 13:25:57 +0000 Subject: [PATCH] *** empty log message *** --- bbtk/src/bbcreaMaracasVisuSliceImage.cxx | 3 +++ .../widgets/vtkInfoTextImageInteractor.cxx | 11 +++++++-- .../wxWindows/widgets/wxMaracasIRMView.cxx | 24 ++++++++++--------- .../wxWindows/widgets/wxMaracasIRMView.h | 18 +++++++------- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/bbtk/src/bbcreaMaracasVisuSliceImage.cxx b/bbtk/src/bbcreaMaracasVisuSliceImage.cxx index 037eadf..cb13df8 100644 --- a/bbtk/src/bbcreaMaracasVisuSliceImage.cxx +++ b/bbtk/src/bbcreaMaracasVisuSliceImage.cxx @@ -11,7 +11,10 @@ void SliceImage::Process() { printf("EED 0 SliceImage::Process \n"); vtkImageData *imagedata=NULL; + + std::cout<<"MSJ: test SliceImage::Process()"<SetInput( bbGetInputIn() ); imageReslice->SetInformationInput(bbGetInputIn() ); imageReslice->SetResliceAxesDirectionCosines(1,0,0, 0,1,0 ,0,0,1); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractor.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractor.cxx index cf03c7c..45c33df 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractor.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractor.cxx @@ -45,8 +45,15 @@ bool vtkInfoTextImageInteractor::OnMouseMove() GetVtkInfoTextImage()->PutWindowLevel(); GetVtkInfoTextImage()->PutColorLevel(); - GetVtkInfoTextImage()->PutPosition( (int)xx , (int)yy , (int)zz ); - GetVtkInfoTextImage()->PutPixelIntensity( (int)xx , (int)yy , (int)zz ); + + int tempext[6]; + ((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->GetVtkBaseData()->GetImageData()->GetExtent(tempext); + + if(tempext[0] <= xx && xx <= tempext[1] && tempext[2] <= yy && yy <= tempext[3]){ + + GetVtkInfoTextImage()->PutPosition( (int)xx , (int)yy , (int)zz ); + GetVtkInfoTextImage()->PutPixelIntensity( (int)xx , (int)yy , (int)zz ); + } this->_vtkInteractorStyleBaseView->SetRefresh_waiting(); return true; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx index 34a8558..f0d135c 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracasIRMView.cxx,v $ Language: C++ - Date: $Date: 2009/06/10 17:42:29 $ - Version: $Revision: 1.10 $ + Date: $Date: 2009/06/16 13:25:58 $ + Version: $Revision: 1.11 $ Copyright: (c) 2002, 2003 License: @@ -43,9 +43,9 @@ wxMaracasIRMView::wxMaracasIRMView( wxWindow* parent,std::string path) std::string iconsdir = path; iconsdir+="/data/Icons"; - wxToolBar* toolbar = new ToolBar(this,iconsdir); + this->_toolb = new ToolBar(this,iconsdir); wxAuiPaneInfo paneinfo; - wxauimanager->AddPane(toolbar,paneinfo.ToolbarPane().Top()); + wxauimanager->AddPane(_toolb,paneinfo.ToolbarPane().Top()); wxauimanager->Update(); createFileChooser(); @@ -54,6 +54,7 @@ wxMaracasIRMView::wxMaracasIRMView( wxWindow* parent,std::string path) } wxMaracasIRMView::~wxMaracasIRMView( ){ + delete _toolb; } @@ -227,7 +228,7 @@ ToolBar::ToolBar(wxWindow * parent,std::string iconsdir) //iconfil+= "/OpenImage.png"; //wxBitmap* bitmap0 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG); wxBitmap bitmap0(OpenImage_xpm); - this->AddTool(0, wxString(_T("test")),bitmap0); + this->AddTool(1, wxString(_T("test")),bitmap0); /*iconfil+= "/Open.png"; wxBitmap* bitmap2 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG); @@ -240,27 +241,28 @@ ToolBar::ToolBar(wxWindow * parent,std::string iconsdir) this->Realize(); - this->SetEventHandler(&evthand); + _evthand = new ToolBarEventHandler(); + this->SetEventHandler(_evthand); } ToolBar::~ToolBar(void){ } -ToolBar::ToolBarEventHandler::ToolBarEventHandler() +ToolBarEventHandler::ToolBarEventHandler() : wxEvtHandler(){ } -ToolBar::ToolBarEventHandler::~ToolBarEventHandler(){ +ToolBarEventHandler::~ToolBarEventHandler(){ } -void ToolBar::ToolBarEventHandler::onLoadImageFile(wxCommandEvent& event){ +void ToolBarEventHandler::onLoadImageFile(wxCommandEvent& event){ wxMaracasIRMView::getInstance()->onLoadImageFile(); } -BEGIN_EVENT_TABLE(ToolBar::ToolBarEventHandler, wxEvtHandler) - EVT_MENU(0, ToolBar::ToolBarEventHandler::onLoadImageFile) +BEGIN_EVENT_TABLE(ToolBarEventHandler, wxEvtHandler) + EVT_MENU(1, ToolBarEventHandler::onLoadImageFile) END_EVENT_TABLE() diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.h index 2d92bc2..0512c7e 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracasIRMView.h,v $ Language: C++ - Date: $Date: 2009/06/10 17:42:28 $ - Version: $Revision: 1.5 $ + Date: $Date: 2009/06/16 13:25:58 $ + Version: $Revision: 1.6 $ Copyright: (c) 2002, 2003 License: @@ -77,13 +77,11 @@ private: std::string _path; -}; - + wxToolBar* _toolb; +}; -class ToolBar : public wxToolBar{ - - public:class ToolBarEventHandler : public wxEvtHandler{ +class ToolBarEventHandler : public wxEvtHandler{ public: ToolBarEventHandler(); @@ -96,13 +94,17 @@ class ToolBar : public wxToolBar{ DECLARE_EVENT_TABLE() }; +class ToolBar : public wxToolBar{ + + +public: ToolBar(wxWindow * parent,std::string iconsdir); ~ToolBar(void); private: - ToolBarEventHandler evthand; + ToolBarEventHandler* _evthand; }; -- 2.45.1