Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable homard tool on Windows.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_HypothesesUtils.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
index d752566db38822e9826dd8f432b324323de4b1e9..7fee3a55ba2aab8b3388b9678a833f6b2a2a2bfd 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
+++ b/
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-34,7
+34,8
@@
#include "SMESHGUI_VTKUtils.h"
#include "SMESHGUI_XmlHandler.h"
#include "SMESHGUI_VTKUtils.h"
#include "SMESHGUI_XmlHandler.h"
-#include "SMESH_Actor.h"
+#include <SMESH_Actor.h>
+#include <SMESH_TryCatch.hxx>
// SALOME GUI includes
#include <SUIT_Desktop.h>
// SALOME GUI includes
#include <SUIT_Desktop.h>
@@
-67,6
+68,7
@@
#define LoadLib( name ) LoadLibrary( name )
#define GetProc GetProcAddress
#define UnLoadLib( handle ) FreeLibrary( handle );
#define LoadLib( name ) LoadLibrary( name )
#define GetProc GetProcAddress
#define UnLoadLib( handle ) FreeLibrary( handle );
+ #define env_sep ";"
#else // WIN32
#define LibHandle void*
#ifdef DYNLOAD_LOCAL
#else // WIN32
#define LibHandle void*
#ifdef DYNLOAD_LOCAL
@@
-76,6
+78,7
@@
#endif // DYNLOAD_LOCAL
#define GetProc dlsym
#define UnLoadLib( handle ) dlclose( handle );
#endif // DYNLOAD_LOCAL
#define GetProc dlsym
#define UnLoadLib( handle ) dlclose( handle );
+ #define env_sep ":"
#endif // WIN32
#ifdef _DEBUG_
#endif // WIN32
#ifdef _DEBUG_
@@
-197,7
+200,7
@@
namespace SMESH
if (cenv)
HypsXml.sprintf("%s", cenv);
if (cenv)
HypsXml.sprintf("%s", cenv);
- QStringList HypsXmlList = HypsXml.split(
":"
, QString::SkipEmptyParts);
+ QStringList HypsXmlList = HypsXml.split(
env_sep
, QString::SkipEmptyParts);
if (HypsXmlList.count() == 0) {
SUIT_MessageBox::critical(SMESHGUI::desktop(),
QObject::tr("SMESH_WRN_WARNING"),
if (HypsXmlList.count() == 0) {
SUIT_MessageBox::critical(SMESHGUI::desktop(),
QObject::tr("SMESH_WRN_WARNING"),
@@
-590,7
+593,7
@@
namespace SMESH
SMESH::SMESH_Hypothesis_ptr CreateHypothesis(const QString& aHypType,
const QString& aHypName,
SMESH::SMESH_Hypothesis_ptr CreateHypothesis(const QString& aHypType,
const QString& aHypName,
- const bool
isAlgo
)
+ const bool
/*isAlgo*/
)
{
if(MYDEBUG) MESSAGE("Create " << aHypType.toLatin1().data() <<
" with name " << aHypName.toLatin1().data());
{
if(MYDEBUG) MESSAGE("Create " << aHypType.toLatin1().data() <<
" with name " << aHypName.toLatin1().data());
@@
-626,10
+629,13
@@
namespace SMESH
HypothesisData* aHypData = GetHypothesisData(aHypType);
QString aServLib = aHypData->ServerLibName;
HypothesisData* aHypData = GetHypothesisData(aHypType);
QString aServLib = aHypData->ServerLibName;
+ SMESH_TRY;
return SMESHGUI::GetSMESHGen()->IsApplicable( aHypType.toLatin1().data(),
aServLib.toUtf8().data(),
theGeomObject,
toCheckAll);
return SMESHGUI::GetSMESHGen()->IsApplicable( aHypType.toLatin1().data(),
aServLib.toUtf8().data(),
theGeomObject,
toCheckAll);
+ SMESH_CATCH( SMESH::printErrorInDebugMode );
+ return false;
}
}