X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FExchangeAPI%2FExchangeAPI_Import.cpp;h=ab60deed59bec458a66484951138ff8e0dfa215f;hb=70257ff5e4972aa3cd030101b6589b8a208a4a36;hp=76e818ebb511a51c4eff4ee8978879407d1ae05c;hpb=540e8b84d9123ec7b3f0603b38df6ed8f8e86516;p=modules%2Fshaper.git diff --git a/src/ExchangeAPI/ExchangeAPI_Import.cpp b/src/ExchangeAPI/ExchangeAPI_Import.cpp index 76e818ebb..ab60deed5 100644 --- a/src/ExchangeAPI/ExchangeAPI_Import.cpp +++ b/src/ExchangeAPI/ExchangeAPI_Import.cpp @@ -1,15 +1,30 @@ -// Name : ExchangeAPI_Import.cpp -// Purpose: +// Copyright (C) 2014-2017 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 +// License as published by the Free Software Foundation; either +// 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.com // -// History: -// 07/06/16 - Sergey POKHODENKO - Creation of the file -//-------------------------------------------------------------------------------------- #include "ExchangeAPI_Import.h" //-------------------------------------------------------------------------------------- #include #include //-------------------------------------------------------------------------------------- +#include + ExchangeAPI_Import::ExchangeAPI_Import( const std::shared_ptr & theFeature) : ModelHighAPI_Interface(theFeature) @@ -45,16 +60,28 @@ void ExchangeAPI_Import::dump(ModelHighAPI_Dumper& theDumper) const FeaturePtr aBase = feature(); std::string aPartName = theDumper.name(aBase->document()); - theDumper << aBase << " = model.addImport(" << aPartName << ", " - << aBase->string(ExchangePlugin_ImportFeature::FILE_PATH_ID()) << ")" << std::endl; + std::string aFilePath = aBase->string(ExchangePlugin_ImportFeature::FILE_PATH_ID())->value(); + std::string aFrom = "\\"; + std::string aTo = "\\\\"; + for(std::size_t aPos = aFilePath.find(aFrom); + aPos != std::string::npos; + aPos = aFilePath.find(aFrom, aPos)) { + aFilePath.replace(aPos, aFrom.size(), aTo); + aPos += aTo.size(); + } + + theDumper << aBase << " = model.addImport(" << aPartName << ", \"" + << aFilePath << "\")" << std::endl; // to make import have results theDumper << "model.do()" << std::endl; - CompositeFeaturePtr aCompositeFeature = std::dynamic_pointer_cast(aBase); + CompositeFeaturePtr aCompositeFeature = + std::dynamic_pointer_cast(aBase); if(aCompositeFeature.get()) { int aNbOfSubs = aCompositeFeature->numberOfSubs(); for(int anIndex = 0; anIndex < aNbOfSubs; ++anIndex) { - std::string aSubFeatureGet = theDumper.name(aBase) + ".subFeature(" + std::to_string((long long)anIndex) + ")"; + std::string aSubFeatureGet = + theDumper.name(aBase) + ".subFeature(" + std::to_string((long long)anIndex) + ")"; theDumper.dumpSubFeatureNameAndColor(aSubFeatureGet, aCompositeFeature->subFeature(anIndex)); } } @@ -65,7 +92,6 @@ ImportPtr addImport( const std::shared_ptr & thePart, const std::string & theFilePath) { - // TODO(spo): check that thePart is not empty std::shared_ptr aFeature = thePart->addFeature(ExchangeAPI_Import::ID()); return ImportPtr(new ExchangeAPI_Import(aFeature, theFilePath)); }