Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue #2130: arc is done not as desired
[modules/shaper.git]
/
src
/
Config
/
Config_ModuleReader.cpp
diff --git
a/src/Config/Config_ModuleReader.cpp
b/src/Config/Config_ModuleReader.cpp
index dfd442b7e6012a70d6938d8fb800ffcb7d3de71c..9e8549cdb43bd7d7aea303add9f452ed95bf922c 100644
(file)
--- a/
src/Config/Config_ModuleReader.cpp
+++ b/
src/Config/Config_ModuleReader.cpp
@@
-72,7
+72,8
@@
void Config_ModuleReader::addFeature(const std::string& theFeatureName,
if (myFeaturesInFiles.count(theFeatureName)) {
std::string anErrorMsg = "Can not register feature '%1' in plugin '%2'."
" There is a feature with the same ID.";
if (myFeaturesInFiles.count(theFeatureName)) {
std::string anErrorMsg = "Can not register feature '%1' in plugin '%2'."
" There is a feature with the same ID.";
- Events_InfoMessage("Config_ModuleReader", anErrorMsg).arg(theFeatureName).arg(thePluginConfig).send();
+ Events_InfoMessage("Config_ModuleReader", anErrorMsg)
+ .arg(theFeatureName).arg(thePluginConfig).send();
return;
}
return;
}
@@
-171,7
+172,7
@@
void Config_ModuleReader::loadPlugin(const std::string& thePluginName)
}
}
}
}
-void Config_ModuleReader::loadScript(const std::string& theFileName)
+void Config_ModuleReader::loadScript(const std::string& theFileName
, bool theSendErr
)
{
/* acquire python thread */
PyGILState_STATE gstate = PyGILState_Ensure();
{
/* acquire python thread */
PyGILState_STATE gstate = PyGILState_Ensure();
@@
-194,7
+195,8
@@
void Config_ModuleReader::loadScript(const std::string& theFileName)
Py_XDECREF(pvalue);
Py_XDECREF(ptraceback);
}
Py_XDECREF(pvalue);
Py_XDECREF(ptraceback);
}
- Events_InfoMessage("Config_ModuleReader", anErrorMsg).send();
+ if (theSendErr)
+ Events_InfoMessage("Config_ModuleReader", anErrorMsg).send();
}
/* release python thread */
}
/* release python thread */
@@
-218,11
+220,11
@@
void Config_ModuleReader::loadLibrary(const std::string& theLibName)
DWORD dwLastError = ::GetLastError();
LPSTR messageBuffer = NULL;
size_t size = ::FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
DWORD dwLastError = ::GetLastError();
LPSTR messageBuffer = NULL;
size_t size = ::FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL,
- dwLastError,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ NULL,
+ dwLastError,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPSTR)&messageBuffer, 0, NULL);
anErrorMsg += ": " + std::string(messageBuffer, size);
#else
(LPSTR)&messageBuffer, 0, NULL);
anErrorMsg += ": " + std::string(messageBuffer, size);
#else