X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.cxx;h=8941bde86d9e44287e06a66071e3e4e6164291c1;hb=3ede91ddd835ef6f6eaf9e72956be7c6ebd69ad4;hp=e86dc1b19c70df15bb30634ebcb340ab44402ede;hpb=ac446509c75b87e4e5e0d5286dfc1876038d60ad;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index e86dc1b..8941bde 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -912,11 +912,8 @@ void wxContourMainFrame ::loadContours( FILE *pFile, bool staticContour )
 }
 
 void wxContourMainFrame::onLoad()
-{
-	char tmp[255];
-	char tmpD[255];
+{	
 	std::string fileNameContourROI = GetFileLocation();
-
 //CMRU 03-09-09-----------------------------------------------------------------------------------------------
 	if(GetFileLocation().empty())
 	{
@@ -928,6 +925,13 @@ void wxContourMainFrame::onLoad()
 		}
 	}
 
+	onLoadContours(fileNameContourROI);
+}
+
+void wxContourMainFrame::onLoadContours(std::string fileNameContourROI){
+	char tmp[255];
+	char tmpD[255];
+
 	FILE *pFile =fopen(fileNameContourROI.c_str(),"r+");
 
 
@@ -985,6 +989,23 @@ void wxContourMainFrame::onLoad()
 	}
 	_theViewPanel->getSceneManager()->removeSceneContours();
 	changeInstant();
+
+}
+
+void wxContourMainFrame::onImport(){
+	std::string filename, filenamecontours;
+	wxFileDialog dialog(NULL, _T("Choose a XML Osirix File"), _T(""), _T(""), _T("*.xml"), wxOPEN );
+
+	if (dialog.ShowModal() == wxID_OK)
+	{
+		filename = dialog.GetPath().mb_str();		
+		filenamecontours = kernelManager->parseOsirixFile(filename);
+
+		if(filenamecontours.compare("") != 0){
+			onLoadContours(filenamecontours);
+		}
+
+	}
 }
 
 //AD: 29-05-09