X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_XmlHandler.cxx;h=74a91980a3f52817ccf324bc84eca9f438bf3856;hb=55f658966bd743c8a7a5c9405f4d09e60657b97c;hp=f3e863ad495e07773a3a115f8a7f453ac71f9e87;hpb=776a610c849651350f344157ec7fbb170ca3e8cc;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx index f3e863ad4..74a91980a 100644 --- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx +++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 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 @@ -201,14 +201,26 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, { if (atts.value("name") != "") { - QString hypos = atts.value("hypos").remove( ' ' ); - QString algos = atts.value("algos").remove( ' ' ); + bool useCommonSize = ( atts.value("use-common-size") == "true" ); + bool isQuadDominated = ( atts.value("quad-dominated") == "true" ); + QString hypos = atts.value("hypos"); + QString algos = atts.value("algos"); + QString altHypos = atts.value("alt-hypos"); + QString altAlgos = atts.value("alt-algos"); + QString intHypos = atts.value("intern-edge-hypos"); + QString intAlgos = atts.value("intern-edge-algos"); bool badSet = hypos.contains( BAD_HYP_FLAG ) || algos.contains( BAD_HYP_FLAG ); if ( !badSet ) - myListOfHypothesesSets.append( new HypothesesSet ( atts.value("name"), - hypos.split( ',', QString::SkipEmptyParts ), - algos.split( ',', QString::SkipEmptyParts ) ) ); + myListOfHypothesesSets.append + ( new HypothesesSet ( atts.value("name"), + useCommonSize, isQuadDominated, + hypos.split ( ',', QString::SkipEmptyParts ), + algos.split ( ',', QString::SkipEmptyParts ), + altHypos.split( ',', QString::SkipEmptyParts ), + altAlgos.split( ',', QString::SkipEmptyParts ), + intHypos.split( ',', QString::SkipEmptyParts ), + intAlgos.split( ',', QString::SkipEmptyParts ))); } } else if ( qName == "python-wrap" ||