X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FExchangePlugin%2FExchangePlugin_ImportFeature.cpp;h=e6f2e8f3e28cdebdf29df214eb86a4a729e590b1;hb=5afcc18216ad228eafcaf632c5008d1aebd3122e;hp=d5eaf23603fbf028461b5a8a289d1b9f2995b5cf;hpb=a5560f9b9c5cc8e8f48522b5992539518733a6d3;p=modules%2Fshaper.git diff --git a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp index d5eaf2360..e6f2e8f3e 100644 --- a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp +++ b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ExchangePlugin_ImportFeature.cpp -// Created: Aug 28, 2014 -// Authors: Sergey BELASH, Sergey POKHODENKO +// Copyright (C) 2014-2019 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 +// #include @@ -19,10 +32,14 @@ #include #include +#include #include #include #include +#include +#include +#include #include #include #include @@ -35,6 +52,8 @@ #include #include +#include +#include #include @@ -52,8 +71,11 @@ ExchangePlugin_ImportFeature::~ExchangePlugin_ImportFeature() */ void ExchangePlugin_ImportFeature::initAttributes() { - data()->addAttribute(ExchangePlugin_ImportFeature::FILE_PATH_ID(), ModelAPI_AttributeString::typeId()); - AttributePtr aFeaturesAttribute = data()->addAttribute(ExchangePlugin_ImportFeature::FEATURES_ID(), ModelAPI_AttributeRefList::typeId()); + data()->addAttribute(ExchangePlugin_ImportFeature::FILE_PATH_ID(), + ModelAPI_AttributeString::typeId()); + AttributePtr aFeaturesAttribute = + data()->addAttribute(ExchangePlugin_ImportFeature::FEATURES_ID(), + ModelAPI_AttributeRefList::typeId()); aFeaturesAttribute->setIsArgument(false); ModelAPI_Session::get()->validators()->registerNotObligatory( @@ -144,11 +166,11 @@ void ExchangePlugin_ImportFeature::importXAO(const std::string& theFileName) ResultBodyPtr aResultBody = createResultBody(aGeomShape); setResult(aResultBody); - // Process groups + // Process groups/fields std::shared_ptr aRefListOfGroups = std::dynamic_pointer_cast(data()->attribute(FEATURES_ID())); - // Remove previous groups stored in RefList + // Remove previous groups/fields stored in RefList std::list anGroupList = aRefListOfGroups->list(); std::list::iterator anGroupIt = anGroupList.begin(); for (; anGroupIt != anGroupList.end(); ++anGroupIt) { @@ -171,9 +193,9 @@ void ExchangePlugin_ImportFeature::importXAO(const std::string& theFileName) AttributeSelectionListPtr aSelectionList = aGroupFeature->selectionList("group_list"); // conversion of dimension - XAO::Dimension aGroupDimension = aXaoGroup->getDimension(); std::string aDimensionString = XAO::XaoUtils::dimensionToString(aXaoGroup->getDimension()); - std::string aSelectionType = ExchangePlugin_Tools::xaoDimension2selectionType(aDimensionString); + std::string aSelectionType = + ExchangePlugin_Tools::xaoDimension2selectionType(aDimensionString); aSelectionList->setSelectionType(aSelectionType); for (int anElementIndex = 0; anElementIndex < aXaoGroup->count(); ++anElementIndex) { @@ -181,18 +203,141 @@ void ExchangePlugin_ImportFeature::importXAO(const std::string& theFileName) // complex conversion of element index to reference id int anElementID = aXaoGroup->get(anElementIndex); std::string aReferenceString = - aXaoGeometry->getElementReference(aXaoGroup->getDimension(), anElementID); + aXaoGeometry->getElementReference(aXaoGroup->getDimension(), anElementID); int aReferenceID = XAO::XaoUtils::stringToInt(aReferenceString); aSelectionList->value(anElementIndex)->setId(aReferenceID); } } + // Create new fields + for (int aFieldIndex = 0; aFieldIndex < aXao.countFields(); ++aFieldIndex) { + XAO::Field* aXaoField = aXao.getField(aFieldIndex); + + std::shared_ptr aFieldFeature = addFeature("Field"); + + // group name + if (!aXaoField->getName().empty()) + aFieldFeature->data()->setName(aXaoField->getName()); + + // fill selection + AttributeSelectionListPtr aSelectionList = aFieldFeature->selectionList("selected"); + + // conversion of dimension + std::string aDimensionString = XAO::XaoUtils::dimensionToString(aXaoField->getDimension()); + std::string aSelectionType = + ExchangePlugin_Tools::xaoDimension2selectionType(aDimensionString); + aSelectionList->setSelectionType(aSelectionType); + // limitation: now in XAO fields are related to everything, so, iterate all sub-shapes to fill + int aCountSelected = aXaoField->countElements(); + std::list::const_iterator aResIter = results().begin(); + for(; aResIter != results().end() && aCountSelected; aResIter++) { + ResultBodyPtr aBody = std::dynamic_pointer_cast(*aResIter); + if (!aBody.get()) + continue; + // check that only results that were created before this field are used + FeaturePtr aResultFeature = document()->feature(aBody); + if (!aResultFeature.get()) + continue; + GeomShapePtr aShape = aBody->shape(); + if (!aShape.get() || aShape->isNull()) + continue; + GeomAPI_ShapeExplorer anExp(aShape, GeomAPI_Shape::shapeTypeByStr(aSelectionType)); + for(; anExp.more(); anExp.next()) { + aSelectionList->append(aBody, anExp.current()); + aCountSelected--; + if (aCountSelected == 0) + break; + } + } + + // conversion of type + XAO::Type aFieldType = aXaoField->getType(); + std::string aTypeString = XAO::XaoUtils::fieldTypeToString(aFieldType); + ModelAPI_AttributeTables::ValueType aType = + ExchangePlugin_Tools::xaoType2valuesType(aTypeString); + // set components names + AttributeStringArrayPtr aComponents = aFieldFeature->stringArray("components_names"); + aComponents->setSize(aXaoField->countComponents()); + for(int aComp = 0; aComp < aXaoField->countComponents(); aComp++) { + aComponents->setValue(aComp, aXaoField->getComponentName(aComp)); + } + + AttributeIntArrayPtr aStamps = aFieldFeature->intArray("stamps"); + aStamps->setSize(aXaoField->countSteps()); + std::shared_ptr aTables = aFieldFeature->tables("values"); + aTables->setSize( + aXaoField->countElements() + 1, aXaoField->countComponents(), aXaoField->countSteps()); + aTables->setType(aType); + // iterate steps + XAO::stepIterator aStepIter = aXaoField->begin(); + for(int aStepIndex = 0; aStepIter != aXaoField->end(); aStepIter++, aStepIndex++) { + aStamps->setValue(aStepIndex, (*aStepIter)->getStamp()); + for(int aRow = 1; aRow <= aXaoField->countElements(); aRow++) { + for(int aCol = 0; aCol < aXaoField->countComponents(); aCol++) { + ModelAPI_AttributeTables::Value aVal; + std::string aValStr = (*aStepIter)->getStringValue(aRow - 1, aCol); + switch(aType) { + case ModelAPI_AttributeTables::BOOLEAN: + aVal.myBool = aValStr == "true"; + break; + case ModelAPI_AttributeTables::INTEGER: + aVal.myInt = atoi(aValStr.c_str()); + break; + case ModelAPI_AttributeTables::DOUBLE: + aVal.myDouble = atof(aValStr.c_str()); + break; + case ModelAPI_AttributeTables::STRING: + aVal.myStr = aValStr; + break; + } + aTables->setValue(aVal, aRow, aCol, aStepIndex); + } + } + } + // remove everything with zero-values: zeroes are treated as defaults + std::set aRowsToRemove; + for(int aRow = 1; aRow < aTables->rows(); aRow++) { + bool isZero = true; + for(int aCol = 0; aCol < aTables->columns() && isZero; aCol++) { + for(int aStepIndex = 0; aStepIndex != aTables->tables() && isZero; aStepIndex++) { + if (aTables->valueStr(aRow, aCol, aStepIndex) != aTables->valueStr(0, aCol, aStepIndex)) + isZero = false; + } + } + if (isZero) + aRowsToRemove.insert(aRow - 1); // -1 to make prepared for remove from SelectionList + } + if (!aRowsToRemove.empty()) { // move usefull rows on bottom to the up of the tables + // number of rows passed during going through: the current rows will + // be moved up for this value + int aRemovedPassed = 0; + for(int aRow = 1; aRow < aTables->rows(); aRow++) { + if (aRowsToRemove.find(aRow - 1) != aRowsToRemove.end()) { + aRemovedPassed++; + } else if (aRemovedPassed != 0) { // copy the line up + for(int aCol = 0; aCol < aTables->columns(); aCol++) { + for(int aTable = 0; aTable != aTables->tables(); aTable++) { + aTables->setValue( + aTables->value(aRow, aCol, aTable), aRow - aRemovedPassed, aCol, aTable); + } + } + } + } + aTables->setSize(aTables->rows() - aRemovedPassed, aTables->columns(), aTables->tables()); + aSelectionList->remove(aRowsToRemove); // remove also selected elements + } + } + // Top avoid problems in Object Browser update: issue #1647. + ModelAPI_EventCreator::get()->sendReordered( + std::dynamic_pointer_cast(aRefListOfGroups->owner())); +// LCOV_EXCL_START } catch (XAO::XAO_Exception& e) { std::string anError = e.what(); setError("An error occurred while importing " + theFileName + ": " + anError); return; } +// LCOV_EXCL_STOP } //============================================================================ @@ -207,6 +352,7 @@ std::shared_ptr ExchangePlugin_ImportFeature::addFeature( return aNew; } +// LCOV_EXCL_START void ExchangePlugin_ImportFeature::removeFeature( std::shared_ptr theFeature) { @@ -215,6 +361,7 @@ void ExchangePlugin_ImportFeature::removeFeature( AttributeRefListPtr aList = reflist(FEATURES_ID()); aList->remove(theFeature); } +// LCOV_EXCL_STOP int ExchangePlugin_ImportFeature::numberOfSubs(bool forTree) const { @@ -229,6 +376,7 @@ std::shared_ptr ExchangePlugin_ImportFeature::subFeature( return aRes; } +// LCOV_EXCL_START int ExchangePlugin_ImportFeature::subFeatureId(const int theIndex) const { std::shared_ptr aRefList = std::dynamic_pointer_cast< @@ -246,6 +394,7 @@ int ExchangePlugin_ImportFeature::subFeatureId(const int theIndex) const } return aResultIndex; } +// LCOV_EXCL_STOP bool ExchangePlugin_ImportFeature::isSub(ObjectPtr theObject) const { @@ -266,5 +415,5 @@ void ExchangePlugin_ImportFeature::loadNamingDS( int aTag(1); std::string aNameMS = "Shape"; - theResultBody->loadFirstLevel(theGeomShape, aNameMS, aTag); + theResultBody->loadFirstLevel(theGeomShape, aNameMS); }