X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_XmlHandler.cxx;h=16833ee66da96ed973f53da214d1370e81495473;hp=ee42768b157cc29b29571565520c9c453d4dedfe;hb=7af78cc3d0b95ec53ab6ec83a92b1df4a9fb6b2a;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8 diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx index ee42768b1..16833ee66 100644 --- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx +++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx @@ -1,12 +1,13 @@ -// SMESH SMESHGUI : reading of xml file with list of available hypotheses and algorithms -// Copyright (C) 2003 CEA +// Copyright (C) 2007-2008 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 // // 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. // - // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -16,23 +17,23 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org -// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // +// SMESH SMESHGUI : reading of xml file with list of available hypotheses and algorithms +// File : SMESHGUI_XmlHandler.cxx +// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. +// SMESH includes // -// File : SMESHGUI_XmlHandler.cxx -// Author : Julia DOROVSKIKH -// Module : SMESH -// $Header$ +#include "SMESHGUI_XmlHandler.h" -using namespace std; -#define INCLUDE_MENUITEM_DEF +#include "SMESHGUI.h" +#include "SMESHGUI_Hypotheses.h" -#include "SMESHGUI_XmlHandler.h" +// SALOME GUI includes +#include "SUIT_ResourceMgr.h" -// QT Include -//#include -#include +// SALOME KERNEL includes +#include /*! Constructor @@ -56,7 +57,7 @@ SMESHGUI_XmlHandler::~SMESHGUI_XmlHandler() bool SMESHGUI_XmlHandler::startDocument() { myErrorProt = ""; - return TRUE; + return true; } /*! @@ -81,15 +82,30 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, myPluginName = atts.value("name"); myServerLib = atts.value("server-lib"); myClientLib = atts.value("gui-lib"); +/* It's Need to tranlate lib name for WIN32 or X platform + * (only client lib, because server lib translates in SMESH_Gen_i::createHypothesis + * for normal work of *.py files ) + */ + if( !myClientLib.isEmpty() ) + { +#ifdef WNT + //myServerLib += ".dll"; + myClientLib += ".dll"; +#else + //myServerLib = "lib" + myServerLib + ".so"; + myClientLib = "lib" + myClientLib + ".so"; +#endif + } + QString aResName = atts.value("resources"); if (aResName != "") { - MESSAGE("Loading Resources " << aResName); - QAD_ResourceMgr* resMgr = QAD_Desktop::createResourceManager(); - QString msg; - if (!resMgr->loadResources(aResName, msg)) - MESSAGE(msg); + MESSAGE("Loading Resources " << aResName.toLatin1().data()); + SUIT_ResourceMgr* resMgr = SMESHGUI::resourceMgr(); + QString lang = resMgr->stringValue( resMgr->langSection(), "language", "en" ); + resMgr->loadTranslator( "resources", QString( "%1_msg_%2.qm" ).arg( aResName, lang ) ); + resMgr->loadTranslator( "resources", QString( "%1_images.qm" ).arg( aResName, lang ) ); } } } @@ -106,26 +122,80 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, QString aHypAlType = atts.value("type"); QString aLabel = atts.value("label-id"); QString anIcon = atts.value("icon-id"); - HypothesisData* aHypLibNames = - new HypothesisData (myPluginName, myServerLib, myClientLib, - aLabel, anIcon); + bool isAux = atts.value("auxiliary") == "true"; + bool isNeedGeom = true, isSupportSubmeshes = false; + QString aNeedGeom = atts.value("need-geom"); + if ( !aNeedGeom.isEmpty() ) + isNeedGeom = (aNeedGeom == "true"); + QString suppSub = atts.value("support-submeshes"); + if ( !suppSub.isEmpty() ) + isSupportSubmeshes = (suppSub == "true"); + + QString aDimStr = atts.value("dim"); + aDimStr = aDimStr.remove( ' ' ); + QStringList aDimList = aDimStr.split( ',', QString::SkipEmptyParts ); + QStringList::iterator anIter; + bool isOk; + QList aDim; + for ( anIter = aDimList.begin(); anIter != aDimList.end(); ++anIter ) + { + int aVal = (*anIter).toInt( &isOk ); + if ( isOk ) + aDim.append( aVal ); + } + + // for algo + enum { HYPOS = 0, OPT_HYPOS, INPUT, OUTPUT, NB_ATTRIBUTES }; + const char* name [NB_ATTRIBUTES] = { "hypos", "opt-hypos", "input", "output" }; + QStringList attr [NB_ATTRIBUTES]; + 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 ); + } + } + + HypothesisData* aHypData = + new HypothesisData (aHypAlType, myPluginName, myServerLib, myClientLib, + aLabel, anIcon, aDim, isAux, + attr[ HYPOS ], attr[ OPT_HYPOS ], attr[ INPUT ], attr[ OUTPUT ], + isNeedGeom, isSupportSubmeshes ); if (qName == "algorithm") { - myAlgorithmsMap[(char*)aHypAlType.latin1()] = aHypLibNames; + myAlgorithmsMap[aHypAlType] = aHypData; } else { - myHypothesesMap[(char*)aHypAlType.latin1()] = aHypLibNames; + myHypothesesMap[aHypAlType] = aHypData; + } + } + } + else if (qName == "hypotheses-set-group") // group of sets of hypotheses + { + } + else if (qName == "hypotheses-set") // a set of hypotheses + { + if (atts.value("name") != "") + { + HypothesesSet* aHypoSet = new HypothesesSet ( atts.value("name") ); + myListOfHypothesesSets.append( aHypoSet ); + + for ( int isHypo = 0; isHypo < 2; ++isHypo ) + { + QString aHypos = isHypo ? atts.value("hypos") : atts.value("algos"); + aHypos = aHypos.remove( ' ' ); + aHypoSet->set( !isHypo, aHypos.split( ',', QString::SkipEmptyParts ) ); } } } else { // error - return FALSE; + return false; } - return TRUE; + return true; } @@ -134,7 +204,7 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, */ bool SMESHGUI_XmlHandler::endElement (const QString&, const QString&, const QString&) { - return TRUE; + return true; } @@ -144,10 +214,10 @@ bool SMESHGUI_XmlHandler::endElement (const QString&, const QString&, const QStr bool SMESHGUI_XmlHandler::characters (const QString& ch) { // we are not interested in whitespaces - QString ch_simplified = ch.simplifyWhiteSpace(); + QString ch_simplified = ch.simplified(); if ( ch_simplified.isEmpty() ) - return TRUE; - return TRUE; + return true; + return true; }