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
Update SketchPlugin_Projection feature (issue #1459)
[modules/shaper.git]
/
src
/
Config
/
Config_XMLReader.cpp
diff --git
a/src/Config/Config_XMLReader.cpp
b/src/Config/Config_XMLReader.cpp
index b6bbc0ecc3cb98a2ea4759f3b3957620541404df..11b2c5890eb34708c28062d3038acc30585e477c 100644
(file)
--- a/
src/Config/Config_XMLReader.cpp
+++ b/
src/Config/Config_XMLReader.cpp
@@
-40,12
+40,9
@@
Config_XMLReader::Config_XMLReader(const std::string& theXmlFileName)
* the problem: application may be launched using python executable,
* to use environment variable (at least for the current moment)
*/
* the problem: application may be launched using python executable,
* to use environment variable (at least for the current moment)
*/
- if (prefix.empty()) {
- char* anEnv = getenv("NEW_GEOM_CONFIG_FILE");
- if (anEnv) {
- prefix = std::string(anEnv);
- }
- }
+ if (prefix.empty())
+ prefix = pluginConfigFile();
+
#ifdef WIN32
prefix += "\\";
#else
#ifdef WIN32
prefix += "\\";
#else
@@
-62,6
+59,16
@@
Config_XMLReader::~Config_XMLReader()
xmlFreeDoc(myXmlDoc);
}
xmlFreeDoc(myXmlDoc);
}
+std::string Config_XMLReader::pluginConfigFile()
+{
+ std::string aValue;
+ char* anEnv = getenv("PLUGINS_CONFIG_FILE");
+ if (anEnv) {
+ aValue = std::string(anEnv);
+ }
+ return aValue;
+}
+
void Config_XMLReader::readAll()
{
xmlNodePtr aRoot = findRoot();
void Config_XMLReader::readAll()
{
xmlNodePtr aRoot = findRoot();