ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-12 19:37:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

Message d'erreur en l'absence de fichier

Browse Source
This commit is contained in:
Gérald NICOLAS 2021-02-09 17:05:33 +01:00
parent 52a01fdffe
commit 4c3cd911ff
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/SMESH/MG_ADAPT.cxx
View File

@ -30,6 +30,9 @@
#include "MEDFileField.hxx" #include "MEDFileField.hxx"
#include "MEDCouplingFieldDouble.hxx" #include "MEDCouplingFieldDouble.hxx"
#include <SALOME_NamingService.hxx>
#include <Utils_SALOME_Exception.hxx>
#include <utilities.h> #include <utilities.h>
#include <iostream> #include <iostream>
#include <unistd.h> #include <unistd.h>
@ -219,9 +222,25 @@ MgAdaptHypothesisData* MgAdapt::getData() const
} }
void MgAdapt::setMedFileIn(std::string fileName) void MgAdapt::setMedFileIn(std::string fileName)
{ {
medFileIn = fileName; if ( isFileExist(fileName) )
if (medFileOut == "") // default MED file Out {
medFileOut = remove_extension( fileName )+ ".adapt.med"; medFileIn = fileName;
if (medFileOut == "") // default MED file Out
medFileOut = remove_extension( fileName )+ ".adapt.med";
}
else
{
std::cout << "\nThe file " + fileName + " does not exist.\n" << std::endl;
// SALOME::ExceptionStruct es;
// es.type = SALOME::BAD_PARAM;
// std::string text = "\nThe file " + fileName + " does not exist.\n" ;
// std::cout << text << std::endl;
// es.text = "The mesh file does not exist.";
// es.text = CORBA::string_dup(text.c_str());
// throw SALOME::SALOME_Exception(es);
throw SALOME_Exception(("The file " + fileName + " does not exist." ).c_str() );
}
} }
std::string MgAdapt::getMedFileIn() std::string MgAdapt::getMedFileIn()
@ -233,7 +252,6 @@ void MgAdapt::setMedFileOut(std::string fileOut)
{ {
medFileOut = fileOut; medFileOut = fileOut;
} }
std::string MgAdapt::getMedFileOut() std::string MgAdapt::getMedFileOut()
{ {
return medFileOut; return medFileOut;
@ -363,7 +381,15 @@ bool MgAdapt::getRemoveOnSuccess()
} }
void MgAdapt::setSizeMapFile(std::string mapFile) void MgAdapt::setSizeMapFile(std::string mapFile)
{ {
sizeMapFile = mapFile; if ( mapFile == "" || isFileExist(mapFile) )
{
sizeMapFile = mapFile;
}
else
{
std::cout << "\nThe file " + mapFile + " does not exist.\n" << std::endl;
throw SALOME_Exception(("The file " + mapFile + " does not exist." ).c_str() );
}
} }
std::string MgAdapt::getSizeMapFile() std::string MgAdapt::getSizeMapFile()
{ {
@ -428,7 +454,6 @@ bool MgAdapt::getPrintLogInFile()
return printLogInFile; return printLogInFile;
} }
bool MgAdapt::setAll() bool MgAdapt::setAll()
{ {
@ -1315,8 +1340,13 @@ med_idt MgAdapt::openMedFile(const std::string aFile)
med_idt medIdt = MEDfileOpen(aFile.c_str(),MED_ACC_RDONLY); med_idt medIdt = MEDfileOpen(aFile.c_str(),MED_ACC_RDONLY);
if (medIdt <0) if (medIdt <0)
{ {
//~addMessage( ToComment(" error: Can't open ") << aFile, /*fatal=*/true ); SALOME::ExceptionStruct es;
; es.type = SALOME::BAD_PARAM;
std::string text = "The med file " + aFile + " cannot be opened." ;
// es.text = "The mesh file does not exist.";
es.text = CORBA::string_dup(text.c_str());
throw SALOME::SALOME_Exception(es);
return 0;
} }
return medIdt; return medIdt;
} }

4
src/SMESH_I/MG_ADAPT_i.cxx
View File

@ -18,14 +18,12 @@
// //
#include "MG_ADAPT_i.hxx" #include "MG_ADAPT_i.hxx"
//~#include "ADAPT_Gen_i.hxx"
#include "string.h" #include "string.h"
#include "SMESH_Gen_i.hxx" #include "SMESH_Gen_i.hxx"
#include <SMESH_Gen.hxx> #include <SMESH_Gen.hxx>
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include CORBA_CLIENT_HEADER(SALOMEDS) #include CORBA_CLIENT_HEADER(SALOMEDS)
//~#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
//~#include CORBA_CLIENT_HEADER(SMESH_Gen)
//============================================================================= //=============================================================================