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 #2120: Crash when creating an arc passing through the arc connected to both...
[modules/shaper.git]
/
src
/
Config
/
Config_XMLReader.cpp
diff --git
a/src/Config/Config_XMLReader.cpp
b/src/Config/Config_XMLReader.cpp
index 184fcdf61fa1656a7b395cf0d8ed6c0095f1b82c..4cd1149f8db927c8669506b1507e5b22cebbcb33 100644
(file)
--- a/
src/Config/Config_XMLReader.cpp
+++ b/
src/Config/Config_XMLReader.cpp
@@
-11,9
+11,10
@@
#include <Config_Keywords.h>
#include <Config_Common.h>
#include <Config_PropManager.h>
#include <Config_Keywords.h>
#include <Config_Common.h>
#include <Config_PropManager.h>
+#include <Config_ModuleReader.h>
#include <Events_Loop.h>
#include <Events_Loop.h>
-#include <Events_
Error
.h>
+#include <Events_
InfoMessage
.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
@@
-36,7
+37,7
@@
Config_XMLReader::Config_XMLReader(const std::string& theXmlFileName)
: myXmlDoc(NULL)
{
Config_XMLReader::Config_XMLReader(const std::string& theXmlFileName)
: myXmlDoc(NULL)
{
- std::string prefix = "";
+ std::string prefix = "";
Config_Prop* aProp = Config_PropManager::findProp("Plugins", "default_path");
if (aProp)
prefix = aProp->value();
Config_Prop* aProp = Config_PropManager::findProp("Plugins", "default_path");
if (aProp)
prefix = aProp->value();
@@
-51,7
+52,8
@@
Config_XMLReader::Config_XMLReader(const std::string& theXmlFileName)
myDocumentPath = prefix + FSEP + theXmlFileName;
std::ifstream aTestFile(myDocumentPath);
myDocumentPath = prefix + FSEP + theXmlFileName;
std::ifstream aTestFile(myDocumentPath);
- if (!aTestFile) Events_Error::send("Unable to open " + myDocumentPath);
+ if (!aTestFile)
+ Events_InfoMessage("Config_XMLReader", "Unable to open %1").arg(myDocumentPath).send();
aTestFile.close();
}
aTestFile.close();
}
@@
-78,6
+80,9
@@
std::string Config_XMLReader::pluginConfigFile()
void Config_XMLReader::readAll()
{
void Config_XMLReader::readAll()
{
+ // to load external modules dependencies (like GEOm for Connector Feature
+ Config_ModuleReader::loadScript("salome.shaper.initConfig", false);
+
xmlNodePtr aRoot = findRoot();
readRecursively(aRoot);
}
xmlNodePtr aRoot = findRoot();
readRecursively(aRoot);
}
@@
-198,3
+203,8
@@
bool Config_XMLReader::cleanupAttribute(const char* theNodeName, const char* the
}
return result;
}
}
return result;
}
+
+const char* Config_XMLReader::encoding() const
+{
+ return (const char*) myXmlDoc->encoding;
+}
\ No newline at end of file