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
IPAL53011: Order of sub-mesh in meshing process does't work
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_XmlHandler.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
index 0ca286bc982e33f8c25a22e35c40118b1fdad0e0..6f6060216a7803f054dd449e7984c37d260288f9 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_XmlHandler.cxx
+++ b/
src/SMESHGUI/SMESHGUI_XmlHandler.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-123,9
+123,11
@@
bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
if (atts.value("type") != "")
{
QString aHypAlType = atts.value("type");
if (atts.value("type") != "")
{
QString aHypAlType = atts.value("type");
- QString aLabel = atts.value("label-id");
- QString anIcon = atts.value("icon-id");
- bool isAux = atts.value("auxiliary") == "true";
+ QString aLabel = atts.value("label-id");
+ QString anIcon = atts.value("icon-id");
+ bool isAuxOrNeedHyp = ( qName == "hypothesis" ?
+ atts.value("auxiliary") == "true" :
+ atts.value("need-hyp" ) == "true" );
bool isNeedGeom = true, isSupportSubmeshes = false;
QString aNeedGeom = atts.value("need-geom");
if ( !aNeedGeom.isEmpty() )
bool isNeedGeom = true, isSupportSubmeshes = false;
QString aNeedGeom = atts.value("need-geom");
if ( !aNeedGeom.isEmpty() )
@@
-133,6
+135,11
@@
bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
QString suppSub = atts.value("support-submeshes");
if ( !suppSub.isEmpty() )
isSupportSubmeshes = (suppSub == "true");
QString suppSub = atts.value("support-submeshes");
if ( !suppSub.isEmpty() )
isSupportSubmeshes = (suppSub == "true");
+ QString context = atts.value("context");
+ if ( context.isEmpty() )
+ context = "ANY";
+ else
+ context = context.toUpper();
QString aDimStr = atts.value("dim");
aDimStr = aDimStr.remove( ' ' );
QString aDimStr = atts.value("dim");
aDimStr = aDimStr.remove( ' ' );
@@
-154,15
+161,16
@@
bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
for ( int i = 0; i < NB_ATTRIBUTES; ++i ) {
QString aStr = atts.value( name[i] );
if ( !aStr.isEmpty() ) {
for ( int i = 0; i < NB_ATTRIBUTES; ++i ) {
QString aStr = atts.value( name[i] );
if ( !aStr.isEmpty() ) {
- aStr.remove( ' ' );
- attr[ i ] = aStr.split( ',', QString::SkipEmptyParts );
+ attr[i] = aStr.split( ',', QString::SkipEmptyParts );
+ for ( int j = 0; j < attr[i].count(); ++j )
+ attr[i][j] = attr[i][j].trimmed();
}
}
if ( !aHypAlType.contains( BAD_HYP_FLAG ) ) {
HypothesisData* aHypData =
new HypothesisData (aHypAlType, myPluginName, myServerLib, myClientLib,
}
}
if ( !aHypAlType.contains( BAD_HYP_FLAG ) ) {
HypothesisData* aHypData =
new HypothesisData (aHypAlType, myPluginName, myServerLib, myClientLib,
- aLabel, anIcon,
aDim, isAux
,
+ aLabel, anIcon,
context, aDim, isAuxOrNeedHyp
,
attr[ HYPOS ], attr[ OPT_HYPOS ], attr[ INPUT ], attr[ OUTPUT ],
isNeedGeom, isSupportSubmeshes );
attr[ HYPOS ], attr[ OPT_HYPOS ], attr[ INPUT ], attr[ OUTPUT ],
isNeedGeom, isSupportSubmeshes );