*** empty log message ***

diff --git a/bbtk/src/bbcreaMaracasVisuSliceImage.cxx b/bbtk/src/bbcreaMaracasVisuSliceImage.cxx
index 037eadf9a452dad307a09735275f7da6ccba2221..cb13df8d9856ff8c6222e241dd21a513e6f7072e 100644 (file)
--- 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()"<<this<<std::endl;
        if ( bbGetInputIn()!=NULL ){
+
          imageReslice->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 cf03c7c8234723cf75b5e258e73ffef32e93eb8b..45c33dfda17deef7d4a9f499a8d0a93c14959031 100644 (file)
--- 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 34a855893586dbad0cd61c78dd56ff94ed61f6b0..f0d135c07ad67331b497bc839146ef74e9f64251 100644 (file)
--- 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 2d92bc2ffd294e976d88a053c48d86c19c0a89d5..0512c7ecb6590f2cabf5bcd6e69342588bfe37b8 100644 (file)
--- 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;
 
 };