*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93946218b3df171cccc0da3665691f2855f114fc..b901a232a963a5f8104ab571101d531d96b5ab06 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,8 @@ SUBDIRS(lib)
 SUBDIRS(bbtk)
 SUBDIRS(install)
 
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/data/Icons )
+
 
 
 

diff --git a/bbtk/src/bbcreaMaracasVisuIRMViewer.cxx b/bbtk/src/bbcreaMaracasVisuIRMViewer.cxx
index 429278c06cb0bd269c1777f953226d0749b0ae0c..20e41fb65f4785998b9dec23c5a4d6611eaad45d 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuIRMViewer.cxx
+++ b/bbtk/src/bbcreaMaracasVisuIRMViewer.cxx
@@ -39,37 +39,10 @@ void IRMViewer::Process()
 void IRMViewer::CreateWidget(wxWindow* parent)
 {
 
-       std::string path = "";
-#if defined(WIN32)
-       char currentPath[_MAX_PATH];
-       HMODULE hand = GetModuleHandle("bbcreaMaracasVisu");
-       GetModuleFileName(hand, currentPath, _MAX_PATH);
-       path = currentPath;
-       path = path.substr(0,path.find_last_of("\\"));
-       
-#else if defined(UNIX)
-       pid_t pid = getpid();
-       char buf[10];
-       sprintf(buf,"%d",pid);
-
-       std::string _link = "/proc/";
-       _link.append( buf );
-       _link.append( "/exe");
-
-       char proc[512];
-       int ch = readlink(_link.c_str(),proc,512);
-       if (ch != -1) {
-               proc[ch] = 0;
-               path = proc;
-               std::string::size_type t = path.find_last_of("/");
-               path = path.substr(0,t);
-       }
-       
 
-#endif
-       std::cout << "Your application's directory is: " << path;
+       //std::cout << "Your application's directory is: " << path;
 
-       wxMaracasIRMView* irmview = wxMaracasIRMView::getInstance(parent,path);
+       wxMaracasIRMView* irmview = wxMaracasIRMView::getInstance(parent);
        //GetDllDirectory(_MAX_PATH, currentPath);
        //std::cout << "Your application's directory is: " << GetDllDirectory(_MAX_PATH, currentPath)<<std::endl;
 

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 13444aa1e9d9220c17ba661b39e9127639c5c5cf..adb946ace3d3d3179c528b2d9f7c236ce1373496 100644 (file)
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -65,7 +65,8 @@ void ViewerNV::Process()
                        mwxwidget->SetType(&type);
                        mwxwidget->UpdateLayout(img);
                }else if (img != currentimg){           
-                       mwxwidget->SetImage(img);
+                       //mwxwidget->SetImage(img);
+                       mwxwidget->UpdateLayout(img);
                }
                currenttype = type;
                currentimg = img;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
index 4242c4f20a8da4e61a0ba503d38b3e445239ae3c..2317a81f2fdcb8d9915e5767afa48084b6211625 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/04/14 14:48:07 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2009/04/15 12:35:01 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -24,6 +24,9 @@
 #include <wx/colordlg.h>
 #include <wx/bmpbuttn.h>
 
+#include "OpenImage.xpm"
+#include "Color.xpm"
+
 wxMaracasIRMView* wxMaracasIRMView::instance=NULL;
 
 wxMaracasIRMView::wxMaracasIRMView( wxWindow* parent,std::string path) 
@@ -204,6 +207,8 @@ wxMaracasIRMViewProp3D::wxMaracasIRMViewProp3D(wxWindow* parent,int propid)
 }
 
 wxMaracasIRMViewProp3D::~wxMaracasIRMViewProp3D(){
+       //this->Show(false);
+       delete _colorchoose;
        wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
 }
 
@@ -218,10 +223,11 @@ void wxMaracasIRMViewProp3D::createControls(){
        Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onCheckBoxChange);   
        checkbox->SetValue(true);       
        
-       std::string iconfile = wxMaracasIRMView::getInstance()->getPath();
-       iconfile+= "/Data/Icons/Color.png";
-       wxBitmap* bitmap = new wxBitmap(wxString(iconfile.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);      
-       _colorchoose = new wxBitmapButton(this, -1, *bitmap,wxDefaultPosition,wxSize(30,30));   
+       //std::string iconfile = wxMaracasIRMView::getInstance()->getPath();
+       //iconfile+= "/Data/Icons/Color.png";
+       //wxBitmap* bitmap = new wxBitmap(wxString(iconfile.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);    
+       wxBitmap bitmap(Color_xpm);
+       _colorchoose = new wxBitmapButton(this, -1, bitmap,wxDefaultPosition,wxSize(30,30));    
        Connect(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onColorChange);            
 
        wxBoxSizer* sizercolor = new wxBoxSizer(wxVERTICAL);
@@ -276,7 +282,8 @@ wxMaracasIRMViewProp3DMHD::wxMaracasIRMViewProp3DMHD(wxWindow* parent, int propi
        
 }
 wxMaracasIRMViewProp3DMHD::~wxMaracasIRMViewProp3DMHD(){
-
+       //this->Show(false);
+       //wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
 }
 void wxMaracasIRMViewProp3DMHD::createControls(int maxisovalue){
 
@@ -309,9 +316,10 @@ ToolBar::ToolBar(wxWindow * parent,std::string iconsdir)
 
        std::string iconfil = iconsdir;
 
-       iconfil+= "/OpenImage.png";
-       wxBitmap* bitmap0 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
-       this->AddTool(0, wxString(_T("test")),*bitmap0);
+       //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);
 
        /*iconfil+= "/Open.png";
        wxBitmap* bitmap2 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
index 8057ae28b196636a0bb0e2f1a3cf9c45e9e0fa4e..73c5f3cc4e6f5d4751e6403632c6f122a16b224d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_N_ViewersWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/01 16:16:59 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/04/15 12:35:01 $
+  Version:   $Revision: 1.6 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -155,6 +155,7 @@
        
                if(currentwxwindow!=NULL){
                        currentwxwindow->Show(false);
+                       delete currentwxwindow;
                        //sizer->Remove(currentwxwindow);                       
                        //delete currentwxwindow;
                }