From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Tue, 14 Apr 2009 14:48:04 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~108
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=540c5242ac6cd8ab330f1642b0fc82e3b49d20db;p=creaMaracasVisu.git

*** empty log message ***
---

diff --git a/bbtk/src/bbmaracasvisuContourVOI.cxx b/bbtk/src/bbmaracasvisuContourVOI.cxx
index c37ceb8..55d6473 100644
--- a/bbtk/src/bbmaracasvisuContourVOI.cxx
+++ b/bbtk/src/bbmaracasvisuContourVOI.cxx
@@ -126,7 +126,7 @@ void ContourVOI::Process()
 
 	wxWidgetVOI* wxwidgetvoi = (wxWidgetVOI*)bbGetOutputWidget();
 
-	if(base !=NULL && img != NULL && _img != img && _base != base){
+	if(base !=NULL && img != NULL && _img != img){
 
 		_img = img;
 		_base = base;
@@ -137,7 +137,7 @@ void ContourVOI::Process()
 	}
 
 	
-	if (wxwidgetvoi!=NULL){
+	if (wxwidgetvoi!=NULL && _img!=NULL && _base != NULL){
 		ContourVOIWidget* contourvoiwidget = wxwidgetvoi->GetContourVOIWidget();
 		
 		int voi[6];
@@ -178,6 +178,9 @@ void ContourVOI::bbUserConstructor()
 	bbSetInputIn(NULL);
 	bbSetOutputWidget(NULL);
 
+	bbSetInputIn(NULL);
+	bbSetInputwxVtkBaseView(NULL);
+
 }
 
 //------------------------------------------------------
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
index c13e157..4242c4f 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/04/14 12:47:30 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/04/14 14:48:07 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -36,7 +36,7 @@ wxMaracasIRMView::wxMaracasIRMView( wxWindow* parent,std::string path)
 	_path = path;
 
 	std::string iconsdir = path;
-	iconsdir+="/Data/Icons";
+	iconsdir+="/data/Icons";
 	wxToolBar* toolbar = new ToolBar(this,iconsdir);
 	wxAuiPaneInfo paneinfo;	
 	wxauimanager->AddPane(toolbar,paneinfo.ToolbarPane().Top());			
@@ -214,34 +214,30 @@ void wxMaracasIRMViewProp3D::createControls(){
 	choices[1] = wxString(_T("Off"));
 	checkbox = new  wxCheckBox(this,-1,wxString(_T("Show Actor")));
 	this->addControl(checkbox);
-	Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onCheckBoxChange);	
-	checkbox->SetValue(true);
 
+	Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onCheckBoxChange);	
+	checkbox->SetValue(true);	
 	
-	wxBoxSizer* sizercolor = new wxBoxSizer(wxVERTICAL);
 	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);	
-	sizercolor->Add(_colorchoose,wxFIXED_MINSIZE);
+	_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);
+	sizercolor->Add(checkbox,wxFIXED_MINSIZE);
+	sizercolor->Add(_colorchoose,wxFIXED_MINSIZE);
 	this->addControl(sizercolor);
-	
 
+	
+	wxStaticText* label = new wxStaticText(this, -1, wxString(_T("Opacity")));		
+	opacity = new wxSlider(this, -1,100,0,100,wxDefaultPosition,wxDefaultSize,wxSL_HORIZONTAL|wxSL_LABELS);	
+	Connect(opacity->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onOpacityRelease);	
 	wxBoxSizer* sizeropacity = new wxBoxSizer(wxVERTICAL);	
-	wxStaticText* label = new wxStaticText(this, -1, wxString(_T("Opacity")));	
 	sizeropacity->Add(label,wxFIXED_MINSIZE);
-	opacity = new wxSlider(this, -1,100,0,100,wxDefaultPosition,wxDefaultSize,wxSL_HORIZONTAL|wxSL_LABELS);
 	sizeropacity->Add(opacity,wxFIXED_MINSIZE);
-	Connect(opacity->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onOpacityRelease);	
-
 	this->addControl(sizeropacity);
 	
-
-	/*isovalue = new wxSlider(this, -1,0,0,100);
-	this->addControl(isovalue);
-	Connect(isovalue->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onIsoValueRelease);	*/
 }
 void wxMaracasIRMViewProp3D::onCheckBoxChange(wxCommandEvent& event){	
 	wxMaracasIRMView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());