From: donadio <donadio>
Date: Fri, 26 Jun 2009 13:19:17 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~7
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0ba0b810584240340e71b43d24e8426d768df6bc;p=creaContours.git

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

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index 1d4bdfc..7bf581d 100644
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -125,11 +125,11 @@ interfMainPanel::~interfMainPanel(void)
 
 interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, std::string datadir, wxEvtHandler * evtHandler){	
 
-	_newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT);
+	_newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,900),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT);
 	
 																						
 	if(interfmainpanel == NULL){
-		interfmainpanel = new interfMainPanel(_newframe, 350, 850, evtHandler, datadir);
+		interfmainpanel = new interfMainPanel(_newframe, 350, 900, evtHandler, datadir);
 	}
 
 	_newframe->Show(TRUE);
@@ -138,10 +138,10 @@ interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, std::string data
 
 interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, wxEvtHandler * evtHandler){	
 
-	_newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT );
+	_newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,900),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT );
 
 	if(interfmainpanel == NULL){
-		interfmainpanel = new interfMainPanel(_newframe, 350, 850, evtHandler);
+		interfmainpanel = new interfMainPanel(_newframe, 350, 900, evtHandler);
 	}
 
 	_newframe->Show(TRUE);
diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index b6d2133..58c3ec6 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -810,8 +810,6 @@ void wxContourMainFrame ::loadContours( FILE *pFile, bool staticContour )
 {
 	char tmp[255];
 
-	if (staticContour==false)
-	{
 	fscanf(pFile,"%s",tmp); // ImageDimensions
 	fscanf(pFile,"%s",tmp); // X
 	fscanf(pFile,"%s",tmp); // Y
@@ -821,7 +819,6 @@ void wxContourMainFrame ::loadContours( FILE *pFile, bool staticContour )
 	fscanf(pFile,"%s",tmp); // X
 	fscanf(pFile,"%s",tmp); // Y
 	fscanf(pFile,"%s",tmp); // Z
-	}
 	
 	fscanf(pFile,"%s",tmp); // NumberOfContours 
 	fscanf(pFile,"%s",tmp); // ##