X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelHighAPI%2FModelHighAPI_Tools.cpp;h=67824fd334e2164555f31f22f34cb7a77136d9ef;hb=refs%2Fheads%2FV9_11_BR;hp=cf9fcc35a54de9f93d91af1774af26d7a811dacb;hpb=3f387e8a5a8c6a90973d8fe6a0de12f2715604fc;p=modules%2Fshaper.git diff --git a/src/ModelHighAPI/ModelHighAPI_Tools.cpp b/src/ModelHighAPI/ModelHighAPI_Tools.cpp index cf9fcc35a..67824fd33 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-2023 CEA, EDF // // 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,16 @@ #include #include #include +#include +//-------------------------------------------------------------------------------------- +#include +//-------------------------------------------------------------------------------------- +#include //-------------------------------------------------------------------------------------- #include #include #include +#include #include #include #include @@ -165,8 +170,18 @@ void fillAttribute(const std::shared_ptr & theValue, void fillAttribute(const std::list > & theValue, const std::shared_ptr & theAttribute) { - theAttribute->clear(); - for (auto it = theValue.begin(); it != theValue.end(); ++it) + int aSize = theAttribute->size(); + // keep objects at the beginning of the list if they the same + auto it = theValue.begin(); + for (int anIndex = 0; it != theValue.end() && anIndex < aSize; ++it, ++anIndex) + if (theAttribute->object(anIndex) != *it) { + // remove the tail of the list + while (++anIndex <= aSize) + theAttribute->removeLast(); + break; + } + // append the rest of elements + for (; it != theValue.end(); ++it) theAttribute->append(*it); } @@ -194,7 +209,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)); @@ -211,6 +226,13 @@ void fillAttribute(const std::string & theValue, theAttribute->setValue(theValue); } +//-------------------------------------------------------------------------------------- +void fillAttribute(const std::wstring & theValue, + const std::shared_ptr & theAttribute) +{ + theAttribute->setValue(theValue); +} + //-------------------------------------------------------------------------------------- void fillAttribute(const char * theValue, const std::shared_ptr & theAttribute) @@ -240,6 +262,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, @@ -248,14 +293,13 @@ void fillAttribute(const ModelHighAPI_Double & theX, theX.fillAttribute(theAttribute, theX, theY, theZ); } - //================================================================================================== GeomAPI_Shape::ShapeType shapeTypeByStr(std::string theShapeTypeStr) { GeomAPI_Shape::ShapeType aShapeType = GeomAPI_Shape::SHAPE; - std::transform(theShapeTypeStr.begin(), theShapeTypeStr.end(), - theShapeTypeStr.begin(), ::tolower); + std::transform(theShapeTypeStr.begin(), theShapeTypeStr.end(), theShapeTypeStr.begin(), + [](char c) { return static_cast(::tolower(c)); }); if(theShapeTypeStr == "compound") { aShapeType = GeomAPI_Shape::COMPOUND; @@ -324,7 +368,7 @@ GeomAPI_Shape::ShapeType getShapeType(const ModelHighAPI_Selection& theSelection case ModelHighAPI_Selection::VT_ResultSubShapePair: { ResultSubShapePair aPair = theSelection.resultSubShapePair(); GeomShapePtr aShape = aPair.second; - if(!aShape.get()) { + if(!aShape.get() && aPair.first.get()) { aShape = aPair.first->shape(); } if(!aShape.get()) { @@ -346,6 +390,14 @@ 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; + } + default: + break; // do nothing [to avoid compilation warning] } return aShapeType; @@ -355,7 +407,8 @@ GeomAPI_Shape::ShapeType getShapeType(const ModelHighAPI_Selection& theSelection ModelAPI_AttributeTables::ValueType valueTypeByStr(const std::string& theValueTypeStr) { std::string aType = theValueTypeStr; - std::transform(aType.begin(), aType.end(), aType.begin(), ::tolower); + std::transform(aType.begin(), aType.end(), aType.begin(), + [](char c) { return static_cast(::tolower(c)); }); if (aType == "boolean") return ModelAPI_AttributeTables::BOOLEAN; else if (aType == "integer") @@ -377,36 +430,45 @@ std::string strByValueType(const ModelAPI_AttributeTables::ValueType theType) return ""; // bad case } -/// stores the features information, recoursively stores sub-documetns features -std::string storeFeatures(const std::string& theDocName, DocumentPtr theDoc, - std::map >& theStore, +/// stores the features information, recursively stores sub-documents features +std::string storeFeatures(const std::wstring& theDocName, DocumentPtr theDoc, + std::map >& theStore, const bool theCompare) // if false => store { - std::map >::iterator aDocFind; + std::map >::iterator aDocFind; if (theCompare) { aDocFind = theStore.find(theDocName); if (aDocFind == theStore.end()) { - return "Document '" + theDocName + "' not found"; + return "Document '" + Locale::Convert::toString(theDocName) + "' not found"; } } // store the model features information: iterate all features - int anObjectsCount = 0; // stores the number of compared features for this document to compate - std::set aProcessed; // processed features names (that are in the current document) + size_t 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) std::list allObjects = theDoc->allObjects(); 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 + std::map::iterator anObjFind = aDocFind->second.find(anObject->data()->name()); if (anObjFind == aDocFind->second.end()) { - return "Document '" + theDocName + "' feature '" + anObject->data()->name() + "' not found"; + return "Document '" + Locale::Convert::toString(theDocName) + + "' feature '" + Locale::Convert::toString(anObject->data()->name()) + "' not found"; } std::string anError = anObjFind->second.compare(anObject); if (!anError.empty()) { - anError = "Document " + theDocName + " " + anError; + anError = "Document " + Locale::Convert::toString(theDocName) + " " + anError; return anError; } anObjectsCount++; @@ -415,14 +477,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()) { @@ -439,26 +500,27 @@ std::string storeFeatures(const std::string& theDocName, DocumentPtr theDoc, if (theCompare) { if (aDocFind->second.size() != anObjectsCount) { // search for disappeared feature - std::string aLostName; - std::map::iterator aLostIter; + std::wstring aLostName; + std::map::iterator aLostIter; for(aLostIter = aDocFind->second.begin(); aLostIter != aDocFind->second.end(); aLostIter++) { if (aProcessed.find(aLostIter->first) == aProcessed.end()) { aLostName = aLostIter->first; } } - return "For document '" + theDocName + - "' the number of features is decreased, there is no feature '" + aLostName + "'"; + return "For document '" + Locale::Convert::toString(theDocName) + + "' the number of features is decreased, there is no feature '" + + Locale::Convert::toString(aLostName) + "'"; } } return ""; // ok } //================================================================================================== -typedef std::map > Storage; +typedef std::map > Storage; static bool dumpToPython(SessionPtr theSession, - const char* theFilename, - const char* theSelectionType, + const std::string& theFilename, + const checkDumpType theSelectionType, const std::string& theErrorMsgContext) { // 2431: set PartSet as a current document @@ -469,8 +531,11 @@ static bool dumpToPython(SessionPtr theSession, if (aDump.get()) { aDump->string("file_path")->setValue(theFilename); aDump->string("file_format")->setValue("py"); - aDump->string("selection_type")->setValue(theSelectionType); - aDump->execute(); + std::string aTrek = GeomAlgoAPI_Tools::File_Tools::path(theFilename); + aDump->string("dump_dir")->setValue(aTrek); + 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()) { @@ -483,7 +548,7 @@ static bool dumpToPython(SessionPtr theSession, } static bool checkDump(SessionPtr theSession, - char* theFilename, + const char* theFilename, Storage& theStorage, const std::string& theErrorMsgContext) { @@ -494,13 +559,14 @@ static bool checkDump(SessionPtr theSession, // execute the dumped PyGILState_STATE gstate = PyGILState_Ensure(); /* acquire python thread */ static char aReadMode[] = "r"; - FILE* PyFileObject = _Py_fopen(theFilename, aReadMode); + FILE* PyFileObject = fopen(theFilename, aReadMode); PyRun_SimpleFileEx(PyFileObject, theFilename, 1); PyGILState_Release(gstate); /* release python thread */ // compare with the stored data - std::string anError = storeFeatures( - theSession->moduleDocument()->kind(), theSession->moduleDocument(), theStorage, true); + std::string anError = + storeFeatures(Locale::Convert::toWString(theSession->moduleDocument()->kind()), + theSession->moduleDocument(), theStorage, true); if (!anError.empty()) { std::cout << anError << std::endl; Events_InfoMessage anErrorMsg(theErrorMsgContext, anError); @@ -511,48 +577,59 @@ static bool checkDump(SessionPtr theSession, return true; } -bool checkPythonDump(const bool theWeakNameCheck) +bool checkPyDump( +#ifdef _DEBUG + const std::string&, const std::string&, const std::string&, +#else + const std::string& theFilenameNaming, + const std::string& theFilenameGeo, + const std::string& theFilenameWeak, +#endif + const checkDumpType theCheckType) { static const std::string anErrorByNaming("checkPythonDump by naming"); static const std::string anErrorByGeometry("checkPythonDump by geometry"); static const std::string anErrorByWeak("checkPythonDump by weak naming"); - static char aFileForNamingDump[] = "./check_dump_byname.py"; - static char aFileForGeometryDump[] = "./check_dump_bygeom.py"; - static char aFileForWeakDump[] = "./check_dump_weak.py"; +#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(); - if (!theWeakNameCheck) { - // dump with the selection by names - if (!dumpToPython(aSession, aFileForNamingDump, "topological_naming", anErrorByNaming)) - return false; - // dump with the selection by geometry - if (!dumpToPython(aSession, aFileForGeometryDump, "geometric_selection", anErrorByGeometry)) - return false; - } else { - // dump with the selection by weak naming - if (!dumpToPython(aSession, aFileForWeakDump, "weak_naming", anErrorByWeak)) - return false; - } + // 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 - std::map > aStore; - std::string anError = storeFeatures( - aSession->moduleDocument()->kind(), aSession->moduleDocument(), aStore, false); + std::map > aStore; + std::string anError = + storeFeatures(Locale::Convert::toWString(aSession->moduleDocument()->kind()), + aSession->moduleDocument(), aStore, false); if (!anError.empty()) { Events_InfoMessage anErrorMsg(std::string("checkPythonDump"), anError); anErrorMsg.send(); return false; } - bool isOk; - if (!theWeakNameCheck) { + bool isOk = true; + if (theCheckType & CHECK_NAMING) { // check dump with the selection by names - isOk = checkDump(aSession, aFileForNamingDump, aStore, anErrorByNaming); + isOk = checkDump(aSession, aFileForNamingDump.c_str(), aStore, anErrorByNaming); + } + if (theCheckType & CHECK_GEOMETRICAL) { // check dump with the selection by geometry - isOk = isOk && checkDump(aSession, aFileForGeometryDump, aStore, anErrorByGeometry); - } else { - isOk = checkDump(aSession, aFileForWeakDump, aStore, anErrorByWeak); + isOk = isOk && checkDump(aSession, aFileForGeometryDump.c_str(), aStore, anErrorByGeometry); + } + if (theCheckType & CHECK_WEAK) { + isOk = isOk && checkDump(aSession, aFileForWeakDump.c_str(), aStore, anErrorByWeak); } return isOk;