From 6dcdd6edab64450dce74ecd573bd4ebecba1bc8b Mon Sep 17 00:00:00 2001 From: guigues Date: Wed, 14 Jan 2009 12:40:10 +0000 Subject: [PATCH] Linux build --- .../interfToolsMenu.cxx | 2 +- .../wxContourMainFrame.cxx | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx b/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx index 29dc32b..48c4d9f 100644 --- a/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx +++ b/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx @@ -89,6 +89,6 @@ void interfToolsMenu::onConfigurationPressed(wxCommandEvent& event){ } void interfToolsMenu::onHelpPressed(wxCommandEvent& event){ - wxLaunchDefaultBrowser("http://www.creatis.insa-lyon.fr/creatools/node/25", 0); + wxLaunchDefaultBrowser(_T("http://www.creatis.insa-lyon.fr/creatools/node/25"), 0); } diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index e0947b0..d2cbf44 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -19,6 +19,7 @@ //#include "wxContour_ActionCommandsID.h" //#include "OutlineModelBuilder.h" //#include "wxContourEventHandler.h" +#include //---------------------------------------------------------------------------------------------------------------- // Class implementation @@ -1535,7 +1536,8 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil temp = temp + kernelManager->intToString(z) + "-cont" + kernelManager->intToString(iContourGroup); temp = temp + ".txt"; - wxString filename; + // LG 14/01/09 : using crea + wxString filename = crea::std2wx(temp); /*filename.Printf(_T("%s"),directory.c_str()); filename.append(_T("\\")); filename.append(_T("%s"),namefile.c_str()); @@ -1544,7 +1546,10 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil filename.append(_T("-cont")); filename.append(_T("%d"),iContourGroup); filename.append(_T(".txt"));*/ - filename.Printf(temp.c_str()); + // filename.Printf(temp.c_str()); + + + FILE *pFile=fopen((const char *)filename.mb_str(),"w+"); fprintf(pFile,"value \t x \t y \t z\n" ); int iLstValue,sizeLstValue=pLstValue.size(); @@ -1656,8 +1661,9 @@ void wxContourMainFrame::SaveImageResult(std::string directory,std::string namef std::string temp = directory + "/" + namefile + "-Value.mhd"; - wxString filename; - filename.Printf(_T(temp.c_str())); + wxString filename = crea::std2wx(temp); + // LG + // filename.Printf(_T(temp.c_str())); //filename.Printf(_T("%s\\%s-Value.mhd",directory.c_str(),namefile.c_str(),z); /*filename.Printf(_T("%s"),directory.c_str()); filename.append(_T("\\")); @@ -1675,7 +1681,9 @@ void wxContourMainFrame::SaveImageResult(std::string directory,std::string namef // filename.Printf("%s\\%s-Mask.mhd",directory.c_str(),namefile.c_str(),z); temp = directory + "/" + namefile + "-Mask.mhd"; - filename.Printf(_T(temp.c_str())); + // LG 14/01/09 : using crea + filename = crea::std2wx(temp); + // filename.Printf(_T(temp.c_str())); /*filename.Printf(_T("%s"),directory.c_str()); filename.append(_T("\\")); -- 2.45.1