X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.cxx;h=793e05d9ebf18b600e7363c163ef7dbeaa1edb89;hb=refs%2Fheads%2Fvtk8itk4wx3-mingw64;hp=9fbe24a9adabcc56f9b42fd489641ed305722629;hpb=00bfeafb3fccce1256ae503a345ebfcaacc6a960;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 9fbe24a..793e05d 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -52,7 +52,7 @@ using namespace std;
 	// Constructors & Destructors
 	//------------------------------------------------------------------------------------------------------------
 
-wxContourMainFrame* wxContourMainFrame:: instance = NULL;
+wxContourMainFrame* wxContourMainFrame::instance=NULL;
 char wxContourMainFrame::COPY = 'C';
 
 	wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,long style)
@@ -94,7 +94,6 @@ char wxContourMainFrame::COPY = 'C';
 		_viewThresholdImage			= NULL;
 		_viewThresholdImagePanel	= NULL;
 		_viewColorLayerImagePanel	= NULL;
-
 		_frameShowResultImages		= NULL;
 	}
 
@@ -162,28 +161,29 @@ void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
 
 	wxContourMainFrame* wxContourMainFrame :: getInstance(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir )
 	{
-		if(instance == NULL){
-			instance = new wxContourMainFrame(parent, id, title, pos, size, images, style,datadir);
+		if(instance == NULL)
+		{
+			instance=new wxContourMainFrame(parent, id, title, pos, size, images, style,datadir);
 		}
 		return instance;
 	}
 
-	std::vector<vtkImageData*> wxContourMainFrame ::getVectImages()
+	std::vector<vtkImageData*> wxContourMainFrame::getVectImages()
 	{
 		return kernelManager->getVectImages();
 	}
 
-	wxContourMainFrame* wxContourMainFrame :: getInstance()
+	wxContourMainFrame* wxContourMainFrame::getInstance()
 	{
 		return instance;
 	}
 
-	void wxContourMainFrame :: resetInstance()
+	void wxContourMainFrame::resetInstance()
 	{
 		instance->Destroy();
 	}
 
-	wxContourMainFrame :: ~wxContourMainFrame()
+	wxContourMainFrame::~wxContourMainFrame()
 	{
 		delete _contourextractdata;
 		deleteAllContours();
@@ -212,7 +212,7 @@ void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
 	// Creational and initialization methods using WxAui
 	//------------------------------------------------------------------------------------------------------------
 	//
-	wxAuiNotebook * wxContourMainFrame :: createNotebook()
+	wxAuiNotebook * wxContourMainFrame::createNotebook()
 	{
 		wxSize client_size = GetClientSize();
 		wxAuiNotebook* noteBook = new wxAuiNotebook(this, -1, wxPoint(client_size.x, client_size.y), wxSize(430,200), m_notebook_style);
@@ -224,7 +224,7 @@ void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
 	//------------------------------------------------------------------------------------------------------------
 	// Creational and initialization methods
 	//------------------------------------------------------------------------------------------------------------
-	bool wxContourMainFrame :: configurePanels( )
+	bool wxContourMainFrame::configurePanels( )
 	{
 		bool configured = _theViewPanel!=NULL;
 
@@ -1174,12 +1174,13 @@ void wxContourMainFrame::readDimSpc(FILE *pFile, bool interactiveOption)
 		{
 			wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(460,360));
 			wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
-			wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL);
+//			wxBoxSizer 		*dialSizer = new wxBoxSizer(wxVERTICAL);
+			wxFlexGridSizer *dialSizer = new wxFlexGridSizer(1);
 
 			wxString lstOptOperation[2];
 			lstOptOperation[0]=_T("By Dimension");
 			lstOptOperation[1]=_T("By Spacing");
-			wxRadioBox * radioOpts = new wxRadioBox(dial, -1, _T("Type of Transformation"), wxDefaultPosition, wxSize(270,45), 2 , lstOptOperation,  2, wxRA_SPECIFY_COLS);
+			wxRadioBox * radioOpts = new wxRadioBox(dial, -1, _T("Type of Transformation"), wxDefaultPosition, wxSize(270,90), 2 , lstOptOperation,  2, wxRA_SPECIFY_COLS);
 
 			dialSizer->Add( new wxStaticText(dial,-1,_T("The image resolution is not compatible with the "))  , 0, wxGROW );
 			dialSizer->Add( new wxStaticText(dial,-1,_T("selected Roi file. Do you want to tranform it?"))  , 0, wxGROW );
@@ -3506,7 +3507,6 @@ void wxContourMainFrame::FlipLstOfContours(std::vector<std::string> lstNameThing
 	sizeLstNameThings	= lstNameThings.size();	
 	for (i=0 ; i<sizeLstNameThings ; i++)
 	{
-		printf("EED wxContourMainFrame::FlipAllContours contour=%d \n", i );
 		manualBaseModel * manualModel = kernelManager->getOutlineByKeyName(lstNameThings[i]);
 		if (flipDirection==0)
 		{
@@ -3534,8 +3534,6 @@ void wxContourMainFrame::FlipLstOfContours(std::vector<std::string> lstNameThing
 
 void wxContourMainFrame::FlipContours(int typeContourFlip, int flipDirection)
 {
-	printf("EED wxContourMainFrame::FlipContours( %d , %d ) \n",typeContourFlip,  flipDirection );
-
 	saveState();
 	
 	if (typeContourFlip==0) // 
@@ -3555,7 +3553,6 @@ void wxContourMainFrame::FlipContours(int typeContourFlip, int flipDirection)
 	RefreshInterface();
 }
 
-
 void wxContourMainFrame::SetXY(int x, int y)
 {
 	_theViewPanel->SetXY(x,y);