X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.cxx;h=969ac05f0a3b145fe04addfcfcd85502e306971e;hb=a654abbc209ed3104e98553cb381ef1c2845937a;hp=d2cbf44baad53e81bf2512ed2d9bdc8b011b9228;hpb=ce5f8eeebd170070f519a200177e74b00180164a;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index d2cbf44..969ac05 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -43,21 +43,21 @@ char wxContourMainFrame::COPY = 'C';
 		_theViewPanel				= NULL;
 //		_modelManager				= NULL;
 		_instantPanel				= NULL;
-		_buttonsBar					= NULL;
-		_gridPanel					= NULL;	
-		_drawToolsPanel				= NULL;
-		_operationsToolsPanel		= NULL;
-		_autoFormsPanel				= NULL; 
-		_standardToolsPanel			= NULL;
-		_editionToolsPanel			= NULL;
-		_listViewPanel				= NULL;
-		_sceneManager				= NULL;
+//		_buttonsBar					= NULL;
+//		_gridPanel					= NULL;	
+//		_drawToolsPanel				= NULL;
+//		_operationsToolsPanel		= NULL;
+		//_autoFormsPanel				= NULL; 
+//		_standardToolsPanel			= NULL;
+//		_editionToolsPanel			= NULL;
+//		_listViewPanel				= NULL;
+//		_sceneManager				= NULL;
 		//_actualInstant				= NULL;
 		_numberOfVariablesStatistics = 6+1;
 
 		// set up default notebook style
-		m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
-		m_notebook_theme = 0;	
+//		m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
+//		m_notebook_theme = 0;	
 		//wxContour_ActionCommandsID a;
 
 	}
@@ -70,15 +70,15 @@ wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const w
 		_theViewPanel				= NULL;
 //		_modelManager				= NULL;
 		_instantPanel				= NULL;
-		_buttonsBar					= NULL;
-		_gridPanel					= NULL;	
-		_drawToolsPanel				= NULL;
-		_operationsToolsPanel		= NULL;
-		_autoFormsPanel				= NULL; 
-		_standardToolsPanel			= NULL;
-		_editionToolsPanel			= NULL;
-		_listViewPanel				= NULL;
-		_sceneManager				= NULL;
+//		_buttonsBar					= NULL;
+//		_gridPanel					= NULL;	
+//		_drawToolsPanel				= NULL;
+//		_operationsToolsPanel		= NULL;
+//		_autoFormsPanel				= NULL; 
+//		_standardToolsPanel			= NULL;
+//		_editionToolsPanel			= NULL;
+//		_listViewPanel				= NULL;
+//		_sceneManager				= NULL;
 		//_actualInstant				= NULL;
 
 		// set up default notebook style
@@ -220,7 +220,7 @@ wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const w
 
 		m_mgr.AddPane(theNoteBook, wxAuiPaneInfo().Name(wxT("notebook_content")).CenterPane().PaneBorder(false));
 		m_mgr.Update();
-		configured &= _buttonsBar!=NULL;
+/*		configured &= _buttonsBar!=NULL;
 		if( _buttonsBar!=NULL )
 		{			
 			m_mgr.AddPane(_buttonsBar, wxAuiPaneInfo().
@@ -228,7 +228,7 @@ wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const w
 					ToolbarPane().Top().
 					LeftDockable(  ).RightDockable( false ).CloseButton(false));
 			m_mgr.Update();
-		}
+		}*/
 		//CreateStatusBar();
 			 
 		SetMinSize(wxSize(300,300));
@@ -252,45 +252,45 @@ wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const w
 		_instantPanel = theInstantChooserPanel;	
 	}
 
-	void wxContourMainFrame :: setButtonsBar(  wxContour_ButtonsBar * theButtonsBar )
-	{
-		_buttonsBar = theButtonsBar;
-	}
+//	void wxContourMainFrame :: setButtonsBar(  wxContour_ButtonsBar * theButtonsBar )
+//	{
+//		_buttonsBar = theButtonsBar;
+//	}
 
-	void wxContourMainFrame :: setGrid(  wxContour_Grid * theGridPanel )
-	{
-		_gridPanel = theGridPanel;
-	}
+//	void wxContourMainFrame :: setGrid(  wxContour_Grid * theGridPanel )
+//	{
+//		_gridPanel = theGridPanel;
+//	}
 
-	void wxContourMainFrame :: setDrawToolsPanel(  wxContour_DrawToolsPanel * theDrawToolsPanel )
-	{
-		_drawToolsPanel = theDrawToolsPanel;
-	}
+//	void wxContourMainFrame :: setDrawToolsPanel(  wxContour_DrawToolsPanel * theDrawToolsPanel )
+//	{
+//		_drawToolsPanel = theDrawToolsPanel;
+//	}
 
-	void wxContourMainFrame :: setOperationsToolsPanel(  wxContour_OperationsToolsPanel * theOperationsToolsPanel )
-	{	
-		_operationsToolsPanel = theOperationsToolsPanel;
-	}
+//	void wxContourMainFrame :: setOperationsToolsPanel(  wxContour_OperationsToolsPanel * theOperationsToolsPanel )
+//	{	
+//		_operationsToolsPanel = theOperationsToolsPanel;
+//	}
 
-	void wxContourMainFrame :: setAutomaticFormsPanel(  wxContour_AutomaticFormsToolsPanel * theAutoFormsPanel )
-	{
-		_autoFormsPanel = theAutoFormsPanel;
-	}
+//	void wxContourMainFrame :: setAutomaticFormsPanel(  wxContour_AutomaticFormsToolsPanel * theAutoFormsPanel )
+//	{
+//		_autoFormsPanel = theAutoFormsPanel;
+//	}
 
-	void wxContourMainFrame :: setStandardToolsPanel(  wxContour_StandardToolsPanel * theStandardToolsPanel )
-	{
-		_standardToolsPanel= theStandardToolsPanel;
-	}
+//	void wxContourMainFrame :: setStandardToolsPanel(  wxContour_StandardToolsPanel * theStandardToolsPanel )
+//	{
+//		_standardToolsPanel= theStandardToolsPanel;
+//	}
 
-	void wxContourMainFrame :: setEditionToolsPanel(  wxContour_EdtionToolsPanel * theEditionToolsPanel )
-	{
-		_editionToolsPanel =  theEditionToolsPanel;
-	}
+//	void wxContourMainFrame :: setEditionToolsPanel(  wxContour_EdtionToolsPanel * theEditionToolsPanel )
+//	{
+//		_editionToolsPanel =  theEditionToolsPanel;
+//	}
 
-	void wxContourMainFrame :: setListViewPanel(  wxContour_ListViewPanel * theListViewPanel )
-	{
-		_listViewPanel = theListViewPanel;
-	}
+//	void wxContourMainFrame :: setListViewPanel(  wxContour_ListViewPanel * theListViewPanel )
+//	{
+//		_listViewPanel = theListViewPanel;
+//	}
 
 
 
@@ -612,6 +612,7 @@ void wxContourMainFrame::updateInstantImageData(){
 	vtkImageData* img = kernelManager->getImageAtInstant(inst);
 	if(img!=NULL){
 		_theViewPanel->changeImage(img);
+		showAxis(false);
 	}else{
 		int z = _instantPanel->getConceptDataOf("Axe Depth")->getActualValue();
 		_theViewPanel->setImageSlice(z);
@@ -732,6 +733,7 @@ void wxContourMainFrame::onSave(){
 	if (dialog.ShowModal() == wxID_OK)
 	{
 		std::string fileNameContourROI = (const char *)(dialog.GetPath().mb_str());
+		kernelManager->setCurrentFileName(fileNameContourROI);
 		saveFileWithContours( fileNameContourROI );
 	}
 }
@@ -1734,3 +1736,12 @@ void wxContourMainFrame::onSnakePressed(){
 	} // if 
 
 }
+
+void wxContourMainFrame::saveFileWithContoursAutomatique(){
+	std::string filename = kernelManager->getCurrentFileName();
+	if(filename.compare("")!=0){
+		saveFileWithContours(filename);
+	}else{
+		onSave();
+	}
+}
\ No newline at end of file