X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfMainPanel.cxx;h=1dc37456e1670b69399872282a7f6337b10ea1a4;hb=498505024562b776b91e25ca30f6e9c6bbd1f963;hp=d9c4e6ce2855f026c17a94189ba385b8b32df9bb;hpb=b13d5fc346334fa875520c47c219a7092e80d09d;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index d9c4e6c..1dc3745 100644
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -118,9 +118,9 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
 
 	splitterwindow->Initialize(toolpanel);
 	splitterwindow->SetSashGravity(1);
-	splitterwindow->SetSashPosition(500);
+//EED	splitterwindow->SetSashPosition(600);
 	splitterwindow->SetSashSize(5);
-	splitterwindow->SplitHorizontally(toolpanel, infoPanel);	
+	splitterwindow->SplitHorizontally(toolpanel, infoPanel,8*73);	
 
 	Connect(b->GetId(),  wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
 	Connect(b1->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
@@ -259,7 +259,7 @@ void interfMainPanel::onActionButtonPressed1( wxCommandEvent& event )
 		b->SetLabel(_T("+"));
 	}	
 	
-	sizechange *= dmenu->GetSize().GetHeight();
+	sizechange *= (dmenu->GetSize().GetHeight()-10);
 	splitterwindow->SetSashPosition(splitterwindow->GetSashPosition()+sizechange);
 	
 	this->Layout();
@@ -887,7 +887,7 @@ void interfMainPanel::onColorLayerImagePressed()
 		colorImageLayerPanel->SetSizer(flexsizer, true);
 		colorImageLayerPanel->SetAutoLayout( true );	
 		//configPanel->SetEventHandler(this->contourevent);
-		wxPanel *panel = wxContourMainFrame::getInstance()->getThresholdImageViewPanel( colorImageLayerPanel );				
+		wxPanel *panel = wxContourMainFrame::getInstance()->getColorLayerImageViewPanel( colorImageLayerPanel );				
 		wxStaticText* stattext = new wxStaticText(colorImageLayerPanel, -1, wxString(_T("   Color Image Layer     ")), wxDefaultPosition,
 												  wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
 		flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
@@ -908,7 +908,7 @@ void interfMainPanel::onThresholdPressed()
 		thresholdPanel->SetSizer(flexsizer, true);
 		thresholdPanel->SetAutoLayout( true );	
 		//configPanel->SetEventHandler(this->contourevent);
-		wxPanel *panel = wxContourMainFrame::getInstance()->getColorLayerImageViewPanel( thresholdPanel );				
+		wxPanel *panel = wxContourMainFrame::getInstance()->getThresholdImageViewPanel( thresholdPanel );				
 		wxStaticText* stattext = new wxStaticText(thresholdPanel, -1, wxString(_T("   Threshold segmentation    ")), wxDefaultPosition,
 												  wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
 		flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);