From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Wed, 4 Nov 2009 18:03:09 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~42
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaContours.git;a=commitdiff_plain;h=2ddb9de651984bea4376da16a35e2f02a78a76c0

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

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 5ba7580..1fc7f77 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -271,10 +271,14 @@ bool wxTheApplication :: OnInit()
 	int output_dim = NATIVE;
 	int threads = 1;
 
+	std::vector<vtkImageData*> images;
+
 	//creaImageIO::WxGimmickDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),max_image_type,threads);
+
 	creaImageIO::WxGimmickReaderDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),min_image_type,max_image_type,output_dim,threads);
 	w.ShowModal();
 
+
 //JCP
 	//std::string datadir(  crea::wx2std(GetExecutablePath()) );	
 	std::string datadir(  GetExecutablePath() );
@@ -285,7 +289,6 @@ bool wxTheApplication :: OnInit()
 		#endif // MACOSX	
 		
 		
-		std::vector<vtkImageData*> images;
 
 			if(w.GetReturnCode() == wxID_OK)
 			{
@@ -313,6 +316,8 @@ bool wxTheApplication :: OnInit()
 				return -1;
 			}   
 
+
+
 	wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application  -    Evaluation version, 09 Feb 2009 "), wxPoint(400,50), wxSize(800, 600) );
 
 	//frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(_T("")), wxPoint(50,50), wxSize(800, 600), images ); 
diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 41a3804..4491a01 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -2995,9 +2995,10 @@ int wxContourMainFrame::getType ()
 		std::string cloneName = currentSelection [0];
 		manualBaseModel * manualModel = kernelManager->getOutlineByKeyName(cloneName);
 		tipo = manualModel-> GetTypeModel();	
-		return tipo;
 	}
+	return tipo;
 }
+
 double wxContourMainFrame::getContourSizeInPixels()
 {
 	double contourSize = 0; 
diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
index ea1cfea..43af5d9 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
@@ -134,7 +134,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 		int value = _lastConceptUpdated->getActualValue();
 		int min = _lastConceptUpdated->getMinValue();
 		int max = _lastConceptUpdated->getMaxValue();
-		int delta = (int) (pow( 2, _resolutionSlider->GetValue() ));
+		int delta = (int) (pow( 2.0, _resolutionSlider->GetValue() ));
 		int minTmp   = value - delta/2;
 		int maxTmp   = value + delta/2;
 		if (minTmp<min)
@@ -388,7 +388,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 		int value = theConceptToUpdate->getActualValue();
 		int min = theConceptToUpdate->getMinValue();
 		int max = theConceptToUpdate->getMaxValue();
-		int delta = (int) (pow( 2, _resolutionSlider->GetValue() ));
+		int delta = (int) (pow( 2.0, _resolutionSlider->GetValue() ));
 		int minTmp   = value - delta/2;
 		int maxTmp   = value + delta/2;
 		if (minTmp<min)