X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelHighAPI%2FModelHighAPI_Tools.cpp;h=936775e47ec5e48f9366e107d97dbf8b4f214c2b;hb=5e2855aa69f9a63236c331efcb57ba433f92e901;hp=5fe41aee56b05ba374e5443a35f8490d494e7908;hpb=7afac44ea23adaad14ffbba46d04aaa05f31b4e6;p=modules%2Fshaper.git diff --git a/src/ModelHighAPI/ModelHighAPI_Tools.cpp b/src/ModelHighAPI/ModelHighAPI_Tools.cpp index 5fe41aee5..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,10 +195,10 @@ void fillAttribute(const std::list & theValue, { theAttribute->clear(); - if(!theValue.empty()) { - std::string aSelectionType; + if(!theValue.empty() && theAttribute->selectionType().empty()) { const ModelHighAPI_Selection& aSelection = theValue.front(); - theAttribute->setSelectionType(aSelection.shapeType()); + GeomAPI_Shape::ShapeType aSelectionType = getShapeType(aSelection); + theAttribute->setSelectionType(strByShapeType(aSelectionType)); } for (auto it = theValue.begin(); it != theValue.end(); ++it) @@ -239,6 +241,37 @@ 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, + const std::shared_ptr & theAttribute) +{ + theX.fillAttribute(theAttribute, theX, theY, theZ); +} + //================================================================================================== GeomAPI_Shape::ShapeType shapeTypeByStr(std::string theShapeTypeStr) { @@ -270,6 +303,41 @@ GeomAPI_Shape::ShapeType shapeTypeByStr(std::string theShapeTypeStr) return aShapeType; } +std::string strByShapeType(GeomAPI_Shape::ShapeType theShapeType) +{ + std::string aShapeTypeStr; + switch (theShapeType) { + case GeomAPI_Shape::COMPOUND: + aShapeTypeStr = "COMPOUND"; + break; + case GeomAPI_Shape::COMPSOLID: + aShapeTypeStr = "COMPSOLID"; + break; + case GeomAPI_Shape::SOLID: + aShapeTypeStr = "SOLID"; + break; + case GeomAPI_Shape::SHELL: + aShapeTypeStr = "SHELL"; + break; + case GeomAPI_Shape::FACE: + aShapeTypeStr = "FACE"; + break; + case GeomAPI_Shape::WIRE: + aShapeTypeStr = "WIRE"; + break; + case GeomAPI_Shape::EDGE: + aShapeTypeStr = "EDGE"; + break; + case GeomAPI_Shape::VERTEX: + aShapeTypeStr = "VERTEX"; + break; + default: + aShapeTypeStr = "SHAPE"; + break; + } + return aShapeTypeStr; +} + //================================================================================================== GeomAPI_Shape::ShapeType getShapeType(const ModelHighAPI_Selection& theSelection) { @@ -294,6 +362,19 @@ GeomAPI_Shape::ShapeType getShapeType(const ModelHighAPI_Selection& theSelection aShapeType = shapeTypeByStr(aType); break; } + case ModelHighAPI_Selection::VT_TypeInnerPointPair: { + TypeInnerPointPair aPair = theSelection.typeInnerPointPair(); + std::string aType = aPair.first; + aType = aType.substr(0, aType.find_first_of('_')); + aShapeType = shapeTypeByStr(aType); + break; + } + case ModelHighAPI_Selection::VT_WeakNamingPair: { + TypeWeakNamingPair aPair = theSelection.typeWeakNamingPair(); + std::string aType = aPair.first; + aShapeType = shapeTypeByStr(aType); + break; + } } return aShapeType; @@ -325,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 @@ -338,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) @@ -346,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()); @@ -363,18 +452,18 @@ 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()) { - std::string anError = storeFeatures((*aRes)->data()->name(), aDoc, theStore, theCompare); + std::string anError = + storeFeatures((*aRes)->data()->name(), aDoc, theStore, theCompare); if (!anError.empty()) return anError; } @@ -401,28 +490,90 @@ std::string storeFeatures(const std::string& theDocName, DocumentPtr theDoc, } //================================================================================================== -bool checkPythonDump() +typedef std::map > Storage; + +static bool dumpToPython(SessionPtr theSession, + const std::string& theFilename, + const checkDumpType theSelectionType, + const std::string& theErrorMsgContext) { - SessionPtr aSession = ModelAPI_Session::get(); + // 2431: set PartSet as a current document + theSession->setActiveDocument(theSession->moduleDocument(), true); // dump all to the python file - aSession->startOperation("Check python dump"); - FeaturePtr aDump = aSession->moduleDocument()->addFeature("Dump"); + theSession->startOperation("Check python dump"); + FeaturePtr aDump = theSession->moduleDocument()->addFeature("Dump"); if (aDump.get()) { - aDump->string("file_path")->setValue("check_dump.py"); // to the current folder - aDump->string("file_format")->setValue("py"); // to the current folder - aDump->execute(); + aDump->string("file_path")->setValue(theFilename); + aDump->string("file_format")->setValue("py"); + 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()) { - std::cout<<"Dump feature error "<error()<error()); + std::cout << "Dump feature error " << aDump->error() << std::endl; + Events_InfoMessage anErrorMsg(theErrorMsgContext, aDump->error()); anErrorMsg.send(); } - aSession->finishOperation(); - if (isProblem) { - return false; // something is wrong during dump + theSession->finishOperation(); + return !isProblem; +} + +static bool checkDump(SessionPtr theSession, + const char* theFilename, + Storage& theStorage, + const std::string& theErrorMsgContext) +{ + + // close all before importation of the script + theSession->closeAll(); + + // execute the dumped + PyGILState_STATE gstate = PyGILState_Ensure(); /* acquire python thread */ + static char aReadMode[] = "r"; + FILE* PyFileObject = _Py_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); + if (!anError.empty()) { + std::cout << anError << std::endl; + Events_InfoMessage anErrorMsg(theErrorMsgContext, anError); + anErrorMsg.send(); + return false; } + return true; +} + +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 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 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( @@ -432,25 +583,21 @@ bool checkPythonDump() anErrorMsg.send(); return false; } - // close all before importation of the script - aSession->closeAll(); - // execute the dumped - PyGILState_STATE gstate = PyGILState_Ensure(); /* acquire python thread */ - PyObject* PyFileObject = PyFile_FromString("./check_dump.py", "r"); - PyRun_SimpleFileEx(PyFile_AsFile(PyFileObject), "./check_dump.py", 1); - PyGILState_Release(gstate); /* release python thread */ - // compare with the stored data - anError = storeFeatures( - aSession->moduleDocument()->kind(), aSession->moduleDocument(), aStore, true); - if (!anError.empty()) { - std::cout<