X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FExchangePlugin%2FExchangePlugin_ExportFeature.cpp;h=54400c68680dcd2c1f5242bf3d192cabc3b04435;hb=8f8cca340a8eb75d742c2e34c4265dd5b3f56628;hp=4eedccc2604e1078446fe24cbd99dbde9ea37b5a;hpb=879a4d6ef89c8b18a6bb66ba3e87fca445884b37;p=modules%2Fshaper.git diff --git a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp index 4eedccc26..54400c686 100644 --- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp +++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// Copyright (C) 2014-2022 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 @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -41,11 +42,14 @@ #include #include +#include + #include #include #include #include #include +#include #include #include #include @@ -94,13 +98,48 @@ void ExchangePlugin_ExportFeature::initAttributes() ModelAPI_AttributeString::typeId()); data()->addAttribute(ExchangePlugin_ExportFeature::XAO_GEOMETRY_NAME_ID(), ModelAPI_AttributeString::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::XAO_SELECTION_LIST_ID(), + ModelAPI_AttributeSelectionList::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::STL_FILE_PATH_ID(), + ModelAPI_AttributeString::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::STL_OBJECT_SELECTED(), + ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::STL_DEFLECTION_TYPE(), + ModelAPI_AttributeString::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::STL_RELATIVE(), + ModelAPI_AttributeDouble::typeId()); + + double defelection = Config_PropManager::real("Visualization", "body_deflection"); + real(ExchangePlugin_ExportFeature::STL_RELATIVE())->setValue(defelection); + + data()->addAttribute(ExchangePlugin_ExportFeature::STL_ABSOLUTE(), + ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::STL_FILE_TYPE(), + ModelAPI_AttributeString::typeId()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ExchangePlugin_ExportFeature::XAO_FILE_PATH_ID()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), + ExchangePlugin_ExportFeature::STL_FILE_PATH_ID()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ExchangePlugin_ExportFeature::XAO_AUTHOR_ID()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ExchangePlugin_ExportFeature::XAO_GEOMETRY_NAME_ID()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), + ExchangePlugin_ExportFeature::XAO_SELECTION_LIST_ID()); + + // to support previous version of document, move the selection list + // if the type of export operation is XAO + AttributeStringPtr aTypeAttr = string(EXPORT_TYPE_ID()); + if (aTypeAttr->isInitialized() && aTypeAttr->value() == "XAO") { + bool aWasBlocked = data()->blockSendAttributeUpdated(true, false); + AttributeSelectionListPtr aSelList = selectionList(SELECTION_LIST_ID()); + AttributeSelectionListPtr aXAOSelList = selectionList(XAO_SELECTION_LIST_ID()); + if (aSelList->size() > 0 && aXAOSelList->size() == 0) + aSelList->copyTo(aXAOSelList); + aSelList->clear(); + data()->blockSendAttributeUpdated(aWasBlocked, false); + } } void ExchangePlugin_ExportFeature::attributeChanged(const std::string& theID) @@ -109,6 +148,10 @@ void ExchangePlugin_ExportFeature::attributeChanged(const std::string& theID) string(ExchangePlugin_ExportFeature::FILE_PATH_ID())->setValue( string(ExchangePlugin_ExportFeature::XAO_FILE_PATH_ID())->value()); } + else if (theID == STL_FILE_PATH_ID()) { + string(ExchangePlugin_ExportFeature::FILE_PATH_ID())->setValue( + string(ExchangePlugin_ExportFeature::STL_FILE_PATH_ID())->value()); + } } /* @@ -151,19 +194,33 @@ void ExchangePlugin_ExportFeature::exportFile(const std::string& theFileName, if (aFormatName == "XAO") { exportXAO(theFileName); return; + }else if (aFormatName == "STL") { + exportSTL(theFileName); + return; } // make shape for export from selected shapes AttributeSelectionListPtr aSelectionListAttr = this->selectionList(ExchangePlugin_ExportFeature::SELECTION_LIST_ID()); std::list aShapes; + std::list aContexts; for (int i = 0, aSize = aSelectionListAttr->size(); i < aSize; ++i) { AttributeSelectionPtr anAttrSelection = aSelectionListAttr->value(i); + + /// do not export pictures + ResultPtr aBodyContext = + std::dynamic_pointer_cast(anAttrSelection->context()); + if (aBodyContext.get() && aBodyContext->hasTexture()) + continue; + std::shared_ptr aCurShape = anAttrSelection->value(); if (aCurShape.get() == NULL) aCurShape = anAttrSelection->context()->shape(); if (aCurShape.get() != NULL) + { aShapes.push_back(aCurShape); + aContexts.push_back(anAttrSelection->context()); + } } // Store compound if we have more than one shape. @@ -176,14 +233,14 @@ void ExchangePlugin_ExportFeature::exportFile(const std::string& theFileName, if (aFormatName == "BREP") { aResult = BREPExport(theFileName, aFormatName, aShape, anError); } else if (aFormatName == "STEP") { - aResult = STEPExport(theFileName, aFormatName, aShape, anError); + aResult = STEPExport(theFileName, aShapes, aContexts, anError); } else if (aFormatName.substr(0, 4) == "IGES") { aResult = IGESExport(theFileName, aFormatName, aShape, anError); } else { anError = "Unsupported format: " + aFormatName; } - if (!anError.empty()) { + if (!aResult || !anError.empty()) { setError("An error occurred while exporting " + theFileName + ": " + anError); return; } @@ -210,94 +267,48 @@ static std::string valToString(const ModelAPI_AttributeTables::Value& theVal, return aStr.str(); } -/// Returns true if something in selection is presented in the results list -static bool isInResults(AttributeSelectionListPtr theSelection, - const std::list& theResults, - std::set& theCashedResults) +void ExchangePlugin_ExportFeature::exportSTL(const std::string& theFileName) { - // collect all results into a cashed set - if (theCashedResults.empty()) { - std::list aResults; - std::list::const_iterator aRes = theResults.cbegin(); - for(; aRes != theResults.cend(); aRes++) { - if (theCashedResults.count(*aRes)) - continue; - else - theCashedResults.insert(*aRes); - if ((*aRes)->groupName() == ModelAPI_ResultBody::group()) { - ResultBodyPtr aResBody = std::dynamic_pointer_cast(*aRes); - std::list aResults; - ModelAPI_Tools::allSubs(aResBody, aResults, false); - for(std::list::iterator aR = aResults.begin(); aR != aResults.end(); aR++) { - theCashedResults.insert(std::dynamic_pointer_cast(*aR)); - } - } else if ((*aRes)->groupName() == ModelAPI_ResultPart::group()) { // all results of the part - ResultPartPtr aResPart = std::dynamic_pointer_cast(*aRes); - DocumentPtr aPartDoc = aResPart->partDoc(); - if (!aPartDoc.get() || !aPartDoc->isOpened()) { // document is not accessible - return false; - } - int aBodyCount = aPartDoc->size(ModelAPI_ResultBody::group()); - for (int aBodyIndex = 0; aBodyIndex < aBodyCount; ++aBodyIndex) { - ResultBodyPtr aResBody = - std::dynamic_pointer_cast( - aPartDoc->object(ModelAPI_ResultBody::group(), aBodyIndex)); - if (aResBody.get()) { - theCashedResults.insert(aResBody); - std::list aResults; - ModelAPI_Tools::allSubs(aResBody, aResults, false); - for(std::list::iterator aR = aResults.begin(); aR != aResults.end(); aR++) { - theCashedResults.insert(std::dynamic_pointer_cast(*aR)); - } - } - } - } - } + // Get shape. + AttributeSelectionPtr aSelection = selection(STL_OBJECT_SELECTED()); + GeomShapePtr aShape = aSelection->value(); + if (!aShape.get()) { + aShape = aSelection->context()->shape(); } - // if context is in results, return true - for(int a = 0; a < theSelection->size(); a++) { - AttributeSelectionPtr anAttr = theSelection->value(a); - ResultPtr aContext = anAttr->context(); - // check is it group selected for groups BOP - if (aContext.get() && aContext->groupName() == ModelAPI_ResultGroup::group()) { - // it is impossible by used results check which result is used in this group result, - // so check the results shapes is it in results of this document or not - FeaturePtr aSelFeature = - std::dynamic_pointer_cast(theSelection->owner()); - if (!aSelFeature.get() || aSelFeature->results().empty()) - continue; - GeomShapePtr aGroupResShape = aSelFeature->firstResult()->shape(); - - std::set::iterator allResultsIter = theCashedResults.begin(); - for(; allResultsIter != theCashedResults.end(); allResultsIter++) { - GeomShapePtr aResultShape = (*allResultsIter)->shape(); - - GeomAPI_Shape::ShapeType aType = - GeomAPI_Shape::shapeTypeByStr(theSelection->selectionType()); - GeomAPI_ShapeExplorer aGroupResExp(aGroupResShape, aType); - for(; aGroupResExp.more(); aGroupResExp.next()) { - if (aResultShape->isSubShape(aGroupResExp.current(), false)) - return true; // at least one shape of the group is in the used results - } - } - } - ResultBodyPtr aSelected = std::dynamic_pointer_cast(anAttr->context()); - if (!aSelected.get()) { // try to get selected feature and all its results - FeaturePtr aContextFeature = anAttr->contextFeature(); - if (aContextFeature.get() && !aContextFeature->results().empty()) { - const std::list& allResluts = aContextFeature->results(); - std::list::const_iterator aResIter = allResluts.cbegin(); - for(; aResIter != allResluts.cend(); aResIter++) { - if (aResIter->get() && theCashedResults.count(*aResIter)) - return true; - } - } - } else if (aSelected.get() && theCashedResults.count(aSelected)) - return true; + + // Get relative value and percent flag. + double aValue; + bool anIsRelative = false; + bool anIsASCII = false; + + if (string(STL_DEFLECTION_TYPE())->value() == STL_DEFLECTION_TYPE_RELATIVE()) { + aValue = real(STL_RELATIVE())->value(); + anIsRelative = true; + } else { + aValue = real(STL_ABSOLUTE())->value(); + } + + if (string(STL_FILE_TYPE())->value() == STL_FILE_TYPE_ASCII()) { + anIsASCII = true; + } + // Perform the export + std::string anError; + bool aResult = false; + + aResult = STLExport(theFileName, + aShape, + aValue, + anIsRelative, + anIsASCII, + anError); + + if (!aResult || !anError.empty()) { + setError("An error occurred while exporting " + theFileName + ": " + anError); + return; } - return false; } + void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) { try { @@ -316,14 +327,20 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) std::list aDocuments; /// documents of Parts selected and used in export std::map aDocTrsf; /// translation of the part - AttributeSelectionListPtr aSelection = selectionList(SELECTION_LIST_ID()); + bool anExCludedIsImage = false; + AttributeSelectionListPtr aSelection = selectionList(XAO_SELECTION_LIST_ID()); bool aIsSelection = aSelection->isInitialized() && aSelection->size() > 0; if (aIsSelection) { // a mode for export to geom result by result - for(int a = 0; a < aSelection->size(); a++) { + for (int a = 0; a < aSelection->size(); a++) { AttributeSelectionPtr anAttr = aSelection->value(a); ResultPtr aBodyContext = std::dynamic_pointer_cast(anAttr->context()); if (aBodyContext.get() && !aBodyContext->isDisabled() && aBodyContext->shape().get()) { + /// do not export pictures + if (aBodyContext->hasTexture()){ + anExCludedIsImage = true; + continue; + } aResults.push_back(aBodyContext); GeomShapePtr aShape = anAttr->value(); if (!aShape.get()) @@ -356,7 +373,8 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) } } if (aShapes.empty()) { - setError("No shapes to export"); + if(!anExCludedIsImage) + setError("No shapes to export"); return; } @@ -377,7 +395,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) if (aGeometryName.empty() && aResults.size() == 1) { // get the name from the first result ResultPtr aResultBody = *aResults.begin(); - aGeometryName = aResultBody->data()->name(); + aGeometryName = Locale::Convert::toString(aResultBody->data()->name()); } aXao.getGeometry()->setName(aGeometryName); @@ -401,7 +419,9 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) AttributeSelectionListPtr aSelectionList = aGroupFeature->selectionList("group_list"); - if (!isInResults(aSelectionList, aResults, allResultsCashed))// skip group not used in result + if (!ModelAPI_Tools::isInResults(aSelectionList, + aResults, + allResultsCashed))// skip group not used in result continue; // conversion of dimension @@ -412,7 +432,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) XAO::Dimension aGroupDimension = XAO::XaoUtils::stringToDimension(aDimensionString); XAO::Group* aXaoGroup = aXao.addGroup(aGroupDimension, - aResultGroup->data()->name()); + Locale::Convert::toString(aResultGroup->data()->name())); try { GeomAPI_ShapeExplorer aGroupResExplorer(aResultGroup->shape(), aSelType); @@ -431,7 +451,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) } catch (XAO::XAO_Exception& e) { // LCOV_EXCL_START std::string msg = "An error occurred while exporting group " + - aResultGroup->data()->name(); + Locale::Convert::toString(aResultGroup->data()->name()); msg += ".\n"; msg += e.what(); msg += "\n"; @@ -455,7 +475,8 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) std::string aSelectionType = aSelectionList->selectionType(); bool isWholePart = aSelectionType == "part"; // skip field not used in results - if (!isWholePart && !isInResults(aSelectionList, aResults, allResultsCashed)) + if (!isWholePart && + !ModelAPI_Tools::isInResults(aSelectionList, aResults, allResultsCashed)) continue; // conversion of dimension @@ -468,7 +489,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) XAO::Type aFieldType = XAO::XaoUtils::stringToFieldType(aTypeString); XAO::Field* aXaoField = aXao.addField(aFieldType, aFieldDimension, aTables->columns(), - aResultField->data()->name()); + Locale::Convert::toString(aResultField->data()->name())); try { @@ -494,8 +515,8 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) int anElementID = 0; if (!isWholePart) { // element index actually is the ID of the selection - AttributeSelectionPtr aSelection = aSelectionList->value(aRow - 1); - int aReferenceID = GeomAlgoAPI_CompoundBuilder::id(aShape, aSelection->value()); + AttributeSelectionPtr aSel = aSelectionList->value(aRow - 1); + int aReferenceID = GeomAlgoAPI_CompoundBuilder::id(aShape, aSel->value()); if (aReferenceID == 0) // selected value does not found in the exported shape continue; @@ -529,7 +550,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) } catch (XAO::XAO_Exception& e) { // LCOV_EXCL_START std::string msg = "An error occurred while exporting field " + - aResultField->data()->name(); + Locale::Convert::toString(aResultField->data()->name()); msg += ".\n"; msg += e.what(); msg += "\n"; @@ -575,9 +596,9 @@ bool ExchangePlugin_ExportFeature::isMacro() const } } - if (aFormat == "XAO") { // on export to GEOm the selection attribute is filled - this is + if (aFormat == "XAO") { // on export to GEOM the selection attribute is filled - this is // an exceptional case where export to XAO feature must be kept - AttributeSelectionListPtr aList = aThis->selectionList(SELECTION_LIST_ID()); + AttributeSelectionListPtr aList = aThis->selectionList(XAO_SELECTION_LIST_ID()); return !aList->isInitialized() || aList->size() == 0; } return true;