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
[bos #29947] [CEA 29944] SIGSEGV using filet
[modules/shaper.git]
/
src
/
Config
/
Config_FeatureReader.cpp
diff --git
a/src/Config/Config_FeatureReader.cpp
b/src/Config/Config_FeatureReader.cpp
index 7254b5577d4b6ef91f7369d3e4d493c001ba3ea8..3d53a63d604873b234866534bb79e555a1206617 100644
(file)
--- a/
src/Config/Config_FeatureReader.cpp
+++ b/
src/Config/Config_FeatureReader.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
19
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
21
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-40,9
+40,11
@@
Config_FeatureReader::Config_FeatureReader(const std::string& theXmlFile,
const std::string& theLibraryName,
Config_FeatureReader::Config_FeatureReader(const std::string& theXmlFile,
const std::string& theLibraryName,
+ const std::string& theDocSection,
const char* theEventGenerated)
: Config_XMLReader(theXmlFile),
myLibraryName(theLibraryName),
const char* theEventGenerated)
: Config_XMLReader(theXmlFile),
myLibraryName(theLibraryName),
+ myLibraryDocSection(theDocSection),
myEventGenerated(theEventGenerated ? theEventGenerated : Config_FeatureMessage::GUI_EVENT()),
myIsProcessWidgets(theEventGenerated != NULL)
{
myEventGenerated(theEventGenerated ? theEventGenerated : Config_FeatureMessage::GUI_EVENT()),
myIsProcessWidgets(theEventGenerated != NULL)
{
@@
-99,7
+101,7
@@
void Config_FeatureReader::processNode(xmlNodePtr theNode)
std::string aCaseNodeID = getProperty(aCaseNode, _ID);
std::string aSwitchNodeID = "";
const xmlChar* aName = aCaseNode->name;
std::string aCaseNodeID = getProperty(aCaseNode, _ID);
std::string aSwitchNodeID = "";
const xmlChar* aName = aCaseNode->name;
- xmlNodePtr aSwitchNode;
+ xmlNodePtr aSwitchNode
= 0
;
if (!xmlStrcmp(aName, (const xmlChar *) WDG_SWITCH_CASE)) {
aSwitchNode = hasParentRecursive(aCaseNode, WDG_SWITCH, NULL);
}
if (!xmlStrcmp(aName, (const xmlChar *) WDG_SWITCH_CASE)) {
aSwitchNode = hasParentRecursive(aCaseNode, WDG_SWITCH, NULL);
}
@@
-176,8
+178,11
@@
void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode,
outFeatureMessage->setInternal(isInternal);
std::string aHelpFile = getProperty(theFeatureNode, HELP_FILE);
outFeatureMessage->setInternal(isInternal);
std::string aHelpFile = getProperty(theFeatureNode, HELP_FILE);
- if (!aHelpFile.empty())
- outFeatureMessage->setHelpFileName(myLibraryName + "/" + aHelpFile);
+ if (!aHelpFile.empty()) {
+ aHelpFile =
+ (myLibraryDocSection.empty() ? myLibraryName : myLibraryDocSection) + "/" + aHelpFile;
+ outFeatureMessage->setHelpFileName(aHelpFile);
+ }
bool isHideFaces = getBooleanAttribute(theFeatureNode, HIDEFACES_PANEL, false);
outFeatureMessage->setHideFacesPanel(isHideFaces);
bool isHideFaces = getBooleanAttribute(theFeatureNode, HIDEFACES_PANEL, false);
outFeatureMessage->setHideFacesPanel(isHideFaces);