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

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index f3e4129..d9c4e6c 100644
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -1,15 +1,5 @@
 #include "interfMainPanel.h"
 
-/*
-#include "interfNewContourMenu.h"
-#include "interfIOMenu.h"
-#include "interfEditMenu.h"
-#include "interfDeleteMenu.h"
-#include "interfToolsMenu.h"
-#include "interfToolsSpreadPanel.h"
-#include "interfMenuBar.h"
-#include "interfSegmentationMenu.h"
-*/
 
 interfMainPanel* interfMainPanel::interfmainpanel=NULL;
 wxFrame* interfMainPanel::_newframe=NULL;
@@ -18,24 +8,28 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
 : wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN)
 {
 
-	PANEL			= "New Contour";
-	PANEL1			= "I/O";
-	PANEL2			= "Edit";
-	PANEL3			= "Delete";
-	PANEL4			= "Tools";  
-	PANEL5			= "Segmentation";
-	segmentPanel		= NULL;
-	segmentPanelITK		= NULL;
-	configPanel		= NULL;
-	spreadPanel		= NULL;
-	infoWin			= NULL;
-	infoPanel		= NULL;
-	infoPanelMask		= NULL;
-	informationPanel	= NULL;
-	mirrorPanel		= NULL;
-	thresholdPanel		= NULL;
-	currentWindow		= NULL;
-	testPanel = NULL;
+	PANEL					= "New Contour";
+	PANEL1					= "I/O";
+	PANEL2					= "Edit";
+	PANEL3					= "Delete";
+	PANEL4					= "Contour Tools";  
+	PANEL5					= "Segmentation";
+//EED 07/07/2010
+	PANEL6					= "Image Tools";  
+
+	segmentPanel			= NULL;
+	segmentPanelITK			= NULL;
+	configPanel				= NULL;
+	spreadPanel				= NULL;
+	infoWin					= NULL;
+	infoPanel				= NULL;
+	infoPanelMask			= NULL;
+	informationPanel		= NULL;
+	mirrorPanel				= NULL;
+	thresholdPanel			= NULL;
+	colorImageLayerPanel	= NULL;
+	currentWindow			= NULL;
+	testPanel				= NULL;
 
 //CMRU 17-08-09 ------------------------------------------------------------------
 	infoPanelCalibration = NULL;
@@ -46,7 +40,7 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
 	splitterwindow->SetMinimumPaneSize( 10 );
 	sizey = sizey/8;
 
-	wxPanel* toolpanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
+	wxPanel* toolpanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_DOUBLE, wxString(_T("")));
 
 	wxFlexGridSizer* flexsizer = new wxFlexGridSizer(6,2,1,1);	
 	toolpanel->SetSizer(flexsizer, true);
@@ -64,6 +58,10 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
 	b4->SetClientData(&PANEL4);
 	wxButton* b5 = getButton(toolpanel);
 	b5->SetClientData(&PANEL5);
+//EED 07/07/2010
+	wxButton* b6 = getButton(toolpanel);
+	b6->SetClientData(&PANEL6);
+
 
 	wxPanel* mentex  = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
 	wxPanel* mentex1 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
@@ -71,6 +69,8 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
 	wxPanel* mentex3 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
 	wxPanel* mentex4 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
 	wxPanel* mentex5 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
+//EED 07/07/2010
+	wxPanel* mentex6 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
 	
 	menubar  = new interfNewContourMenu  (mentex,  sizex, sizey, evtHandler, datadir);		
 	menubar1 = new interfIOMenu          (mentex1, sizex, sizey, evtHandler, datadir);	
@@ -78,6 +78,7 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
 	menubar3 = new interfDeleteMenu      (mentex3, sizex, sizey, evtHandler, datadir);	
 	menubar4 = new interfToolsMenu       (mentex4, sizex ,sizey, evtHandler, datadir);
 	menubar5 = new interfSegmentationMenu(mentex5, sizex, sizey, evtHandler, datadir);
+	menubar6 = new interfImageToolsMenu(mentex6, sizex, sizey, evtHandler, datadir);
 		
 	statictext  = getText(mentex,  PANEL);	
 	statictext1 = getText(mentex1, PANEL1);	
@@ -85,6 +86,7 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
 	statictext3 = getText(mentex3, PANEL3);	
 	statictext4 = getText(mentex4, PANEL4);	
 	statictext5 = getText(mentex5, PANEL5);	
+	statictext6 = getText(mentex6, PANEL6);	
 	
 	flexsizer->Add(b, wxFIXED_MINSIZE);
 	flexsizer->Add(setMenuTextSizer(mentex, menubar,statictext), wxFIXED_MINSIZE);
@@ -103,17 +105,21 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
 
 	flexsizer->Add(b5, wxFIXED_MINSIZE);
 	flexsizer->Add(setMenuTextSizer(mentex5, menubar5,statictext5), wxFIXED_MINSIZE);
+	flexsizer->Add(b6, wxFIXED_MINSIZE);
+	flexsizer->Add(setMenuTextSizer(mentex6, menubar6,statictext6), wxFIXED_MINSIZE);
 
 	toolpanel->Update();
 	toolpanel->Layout();
 
-	infoPanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T("")));
+	infoPanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_DOUBLE, wxString(_T("")));
 	wxFlexGridSizer* infosizer = new wxFlexGridSizer(1,1,2,2);	
 	infoPanel->SetSizer(infosizer, true);
 	infoPanel->SetAutoLayout( true );	
 
 	splitterwindow->Initialize(toolpanel);
 	splitterwindow->SetSashGravity(1);
+	splitterwindow->SetSashPosition(500);
+	splitterwindow->SetSashSize(5);
 	splitterwindow->SplitHorizontally(toolpanel, infoPanel);	
 
 	Connect(b->GetId(),  wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
@@ -122,6 +128,7 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
 	Connect(b3->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
 	Connect(b4->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
 	Connect(b5->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
+	Connect(b6->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
 
 	this->Layout();
 }
@@ -237,6 +244,9 @@ void interfMainPanel::onActionButtonPressed1( wxCommandEvent& event )
 	}else if(dstring.compare(PANEL5)==0){
 		dmenu = menubar5;
 		text = statictext5;
+	}else if(dstring.compare(PANEL6)==0){
+		dmenu = menubar6;
+		text = statictext6;
 	}
 
 	if(wxStrcmp(b->GetLabel(),_T("+"))==0 ){
@@ -867,12 +877,30 @@ void interfMainPanel::onMirrorChangeWidth(int width)
 	wxContourMainFrame::getInstance()->refLineChangeWidth(width);
 }
 
-
+//EED 07/07/2010
+void interfMainPanel::onColorLayerImagePressed()
+{
+	// Color Image Layer  view control panel
+	if(colorImageLayerPanel == NULL){
+		colorImageLayerPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T("")));
+		wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);	
+		colorImageLayerPanel->SetSizer(flexsizer, true);
+		colorImageLayerPanel->SetAutoLayout( true );	
+		//configPanel->SetEventHandler(this->contourevent);
+		wxPanel *panel = wxContourMainFrame::getInstance()->getThresholdImageViewPanel( 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);
+		flexsizer->Add(panel, wxEXPAND);
+		colorImageLayerPanel->Layout();
+	}
+	showPanel(colorImageLayerPanel);
+	wxContourMainFrame::getInstance()->changeInstant();
+}
 
 //EED01
 void interfMainPanel::onThresholdPressed()
-{
-	
+{	
 	// Threshold view control panel
 	if(thresholdPanel == NULL){
 		thresholdPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T("")));
@@ -880,15 +908,12 @@ void interfMainPanel::onThresholdPressed()
 		thresholdPanel->SetSizer(flexsizer, true);
 		thresholdPanel->SetAutoLayout( true );	
 		//configPanel->SetEventHandler(this->contourevent);
-		wxPanel *panel = wxContourMainFrame::getInstance()->getThresholdImageViewPanel( thresholdPanel );				
+		wxPanel *panel = wxContourMainFrame::getInstance()->getColorLayerImageViewPanel( 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);
-		
 		flexsizer->Add(panel, wxEXPAND);
-		thresholdPanel->Layout();
-		
+		thresholdPanel->Layout();		
 	}
 	showPanel(thresholdPanel);
 	wxContourMainFrame::getInstance()->changeInstant();