X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelHighAPI%2FModelHighAPI_Tools.cpp;h=936775e47ec5e48f9366e107d97dbf8b4f214c2b;hb=5e2855aa69f9a63236c331efcb57ba433f92e901;hp=58e9748f120f8b762fd6269f02631f2a54db8530;hpb=6058cc97fb3387c008d153e4ea2b3331d7f195bd;p=modules%2Fshaper.git diff --git a/src/ModelHighAPI/ModelHighAPI_Tools.cpp b/src/ModelHighAPI/ModelHighAPI_Tools.cpp index 58e9748f1..936775e47 100644 --- a/src/ModelHighAPI/ModelHighAPI_Tools.cpp +++ b/src/ModelHighAPI/ModelHighAPI_Tools.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// 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 @@ -12,10 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "ModelHighAPI_Tools.h" @@ -28,10 +27,12 @@ #include #include #include +#include //-------------------------------------------------------------------------------------- #include #include #include +#include #include #include #include @@ -46,6 +47,7 @@ #include #include #include +#include //-------------------------------------------------------------------------------------- #include //-------------------------------------------------------------------------------------- @@ -193,7 +195,7 @@ void fillAttribute(const std::list & theValue, { theAttribute->clear(); - if(!theValue.empty()) { + if(!theValue.empty() && theAttribute->selectionType().empty()) { const ModelHighAPI_Selection& aSelection = theValue.front(); GeomAPI_Shape::ShapeType aSelectionType = getShapeType(aSelection); theAttribute->setSelectionType(strByShapeType(aSelectionType)); @@ -239,6 +241,29 @@ void fillAttribute(const std::list & theValue, theAttribute->setValue(anIndex, it->intValue()); // use only values, no text support in array } +//-------------------------------------------------------------------------------------- +void fillAttribute(const std::list & theValue, + const std::shared_ptr & theAttribute) +{ + theAttribute->setSize(int(theValue.size())); + + int anIndex = 0; + for (auto it = theValue.begin(); it != theValue.end(); ++it, ++anIndex) + theAttribute->setValue(anIndex, it->value()); // use only values, no text support in array +} + +//-------------------------------------------------------------------------------------- +void fillAttribute(const std::list > & theValue, + const std::shared_ptr & theAttribute) +{ + theAttribute->setSize(int(theValue.size())); + + int anIndex = 0; + for (auto it = theValue.begin(); it != theValue.end(); ++it, ++anIndex) + theAttribute->setPnt(anIndex, *it); +} + +//-------------------------------------------------------------------------------------- void fillAttribute(const ModelHighAPI_Double & theX, const ModelHighAPI_Double & theY, const ModelHighAPI_Double & theZ, @@ -247,7 +272,6 @@ void fillAttribute(const ModelHighAPI_Double & theX, theX.fillAttribute(theAttribute, theX, theY, theZ); } - //================================================================================================== GeomAPI_Shape::ShapeType shapeTypeByStr(std::string theShapeTypeStr) { @@ -345,6 +369,12 @@ GeomAPI_Shape::ShapeType getShapeType(const ModelHighAPI_Selection& theSelection aShapeType = shapeTypeByStr(aType); break; } + case ModelHighAPI_Selection::VT_WeakNamingPair: { + TypeWeakNamingPair aPair = theSelection.typeWeakNamingPair(); + std::string aType = aPair.first; + aShapeType = shapeTypeByStr(aType); + break; + } } return aShapeType; @@ -376,7 +406,7 @@ std::string strByValueType(const ModelAPI_AttributeTables::ValueType theType) return ""; // bad case } -/// stores the features information, recoursively stores sub-documetns features +/// stores the features information, recursively stores sub-documents features std::string storeFeatures(const std::string& theDocName, DocumentPtr theDoc, std::map >& theStore, const bool theCompare) // if false => store @@ -389,7 +419,7 @@ std::string storeFeatures(const std::string& theDocName, DocumentPtr theDoc, } } // store the model features information: iterate all features - int anObjectsCount = 0; // stores the number of compared features for this document to compate + int anObjectsCount = 0; // stores the number of compared features for this document to compare std::set aProcessed; // processed features names (that are in the current document) // process all objects (features and folders) @@ -397,6 +427,14 @@ std::string storeFeatures(const std::string& theDocName, DocumentPtr theDoc, std::list::iterator allIter = allObjects.begin(); for(; allIter != allObjects.end(); allIter++) { ObjectPtr anObject = *allIter; + FeaturePtr aFeature = std::dynamic_pointer_cast(anObject); + //if (aFeature && aFeature->getKind() == "SketchConstraintCoincidenceInternal") + + if (aFeature) { + std::string aStr = aFeature->getKind().substr(0, 16); + if (aStr == "SketchConstraint") + continue; // no need to dump and check constraints + } if (theCompare) { std::map::iterator anObjFind = aDocFind->second.find(anObject->data()->name()); @@ -414,14 +452,13 @@ std::string storeFeatures(const std::string& theDocName, DocumentPtr theDoc, theStore[theDocName][anObject->data()->name()] = ModelHighAPI_FeatureStore(anObject); } - FeaturePtr aFeature = std::dynamic_pointer_cast(anObject); if (aFeature) { // iterate all results of this feature std::list allResults; ModelAPI_Tools::allResults(aFeature, allResults); std::list::iterator aRes = allResults.begin(); for(; aRes != allResults.end(); aRes++) { - // recoursively store features of sub-documents + // recursively store features of sub-documents if ((*aRes)->groupName() == ModelAPI_ResultPart::group()) { DocumentPtr aDoc = std::dynamic_pointer_cast(*aRes)->partDoc(); if (aDoc.get()) { @@ -456,8 +493,8 @@ std::string storeFeatures(const std::string& theDocName, DocumentPtr theDoc, typedef std::map > Storage; static bool dumpToPython(SessionPtr theSession, - const char* theFilename, - bool theDumpByGeom, + const std::string& theFilename, + const checkDumpType theSelectionType, const std::string& theErrorMsgContext) { // 2431: set PartSet as a current document @@ -468,8 +505,9 @@ static bool dumpToPython(SessionPtr theSession, if (aDump.get()) { aDump->string("file_path")->setValue(theFilename); aDump->string("file_format")->setValue("py"); - aDump->boolean("geometric_dump")->setValue(theDumpByGeom); - aDump->execute(); + aDump->boolean("topological_naming")->setValue((theSelectionType & CHECK_NAMING) != 0); + aDump->boolean("geometric_selection")->setValue((theSelectionType & CHECK_GEOMETRICAL) != 0); + aDump->boolean("weak_naming")->setValue((theSelectionType & CHECK_WEAK) != 0); } bool isProblem = !aDump.get() || !aDump->error().empty(); // after "finish" dump will be removed if (isProblem && aDump.get()) { @@ -482,7 +520,7 @@ static bool dumpToPython(SessionPtr theSession, } static bool checkDump(SessionPtr theSession, - char* theFilename, + const char* theFilename, Storage& theStorage, const std::string& theErrorMsgContext) { @@ -490,7 +528,6 @@ static bool checkDump(SessionPtr theSession, // close all before importation of the script theSession->closeAll(); - // execute the dumped PyGILState_STATE gstate = PyGILState_Ensure(); /* acquire python thread */ static char aReadMode[] = "r"; @@ -511,20 +548,30 @@ static bool checkDump(SessionPtr theSession, return true; } -bool checkPythonDump() +bool checkPyDump(const std::string& theFilenameNaming, + const std::string& theFilenameGeo, + const std::string& theFilenameWeak, + const checkDumpType theCheckType) { static const std::string anErrorByNaming("checkPythonDump by naming"); static const std::string anErrorByGeometry("checkPythonDump by geometry"); - - static char aFileForNamingDump[] = "./check_dump_byname.py"; - static char aFileForGeometryDump[] = "./check_dump_bygeom.py"; + static const std::string anErrorByWeak("checkPythonDump by weak naming"); + +#ifdef _DEBUG + std::string aFileForNamingDump("./check_dump.py"); + std::string aFileForGeometryDump("./check_dump_geo.py"); + std::string aFileForWeakDump("./check_dump_weak.py"); +#else + std::string aFileForNamingDump = theFilenameNaming; + std::string aFileForGeometryDump = theFilenameGeo; + std::string aFileForWeakDump = theFilenameWeak; +#endif SessionPtr aSession = ModelAPI_Session::get(); - // dump with the selection by names - if (!dumpToPython(aSession, aFileForNamingDump, false, anErrorByNaming)) - return false; - // dump with the selection by geometry - if (!dumpToPython(aSession, aFileForGeometryDump, true, anErrorByGeometry)) + // dump with the specified types + std::string aFileName = theCheckType == CHECK_GEOMETRICAL ? aFileForGeometryDump : + (theCheckType == CHECK_WEAK ? aFileForWeakDump : aFileForNamingDump); + if (!dumpToPython(aSession, aFileName, theCheckType, anErrorByNaming)) return false; // map from document name to feature name to feature data @@ -537,10 +584,18 @@ bool checkPythonDump() return false; } - // check dump with the selection by names - bool isOk = checkDump(aSession, aFileForNamingDump, aStore, anErrorByNaming); - // check dump with the selection by geometry - isOk = isOk && checkDump(aSession, aFileForGeometryDump, aStore, anErrorByGeometry); + bool isOk = true; + if (theCheckType & CHECK_NAMING) { + // check dump with the selection by names + isOk = checkDump(aSession, aFileForNamingDump.c_str(), aStore, anErrorByNaming); + } + if (theCheckType & CHECK_GEOMETRICAL) { + // check dump with the selection by geometry + isOk = isOk && checkDump(aSession, aFileForGeometryDump.c_str(), aStore, anErrorByGeometry); + } + if (theCheckType & CHECK_WEAK) { + isOk = isOk && checkDump(aSession, aFileForWeakDump.c_str(), aStore, anErrorByWeak); + } return isOk; }