X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FExchangePlugin%2FExchangePlugin_ImportFeature.cpp;h=e6f2e8f3e28cdebdf29df214eb86a4a729e590b1;hb=5afcc18216ad228eafcaf632c5008d1aebd3122e;hp=17a02d85e78b378fc753a46d90dea9007a6d3688;hpb=3c68ce2850e804d694b366b77c309a29957e9a4d;p=modules%2Fshaper.git diff --git a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp index 17a02d85e..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 @@ -190,7 +203,7 @@ 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); @@ -216,10 +229,9 @@ void ExchangePlugin_ImportFeature::importXAO(const std::string& theFileName) aSelectionList->setSelectionType(aSelectionType); // limitation: now in XAO fields are related to everything, so, iterate all sub-shapes to fill int aCountSelected = aXaoField->countElements(); - int aResults = document()->size(ModelAPI_ResultBody::group()); - for(int a = 0; a < aResults && aCountSelected; a++) { - ResultBodyPtr aBody = std::dynamic_pointer_cast( - document()->object(ModelAPI_ResultBody::group(), a)); + 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 @@ -266,7 +278,7 @@ void ExchangePlugin_ImportFeature::importXAO(const std::string& theFileName) std::string aValStr = (*aStepIter)->getStringValue(aRow - 1, aCol); switch(aType) { case ModelAPI_AttributeTables::BOOLEAN: - aVal.myBool = aValStr == "True"; + aVal.myBool = aValStr == "true"; break; case ModelAPI_AttributeTables::INTEGER: aVal.myInt = atoi(aValStr.c_str()); @@ -282,16 +294,50 @@ void ExchangePlugin_ImportFeature::importXAO(const std::string& theFileName) } } } + // 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 } //============================================================================ @@ -306,6 +352,7 @@ std::shared_ptr ExchangePlugin_ImportFeature::addFeature( return aNew; } +// LCOV_EXCL_START void ExchangePlugin_ImportFeature::removeFeature( std::shared_ptr theFeature) { @@ -314,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 { @@ -328,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< @@ -345,6 +394,7 @@ int ExchangePlugin_ImportFeature::subFeatureId(const int theIndex) const } return aResultIndex; } +// LCOV_EXCL_STOP bool ExchangePlugin_ImportFeature::isSub(ObjectPtr theObject) const { @@ -365,5 +415,5 @@ void ExchangePlugin_ImportFeature::loadNamingDS( int aTag(1); std::string aNameMS = "Shape"; - theResultBody->loadFirstLevel(theGeomShape, aNameMS, aTag); + theResultBody->loadFirstLevel(theGeomShape, aNameMS); }