-// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020 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
#include <GeomDataAPI_Dir.h>
#include <GeomDataAPI_Point.h>
#include <GeomDataAPI_Point2D.h>
+#include <GeomDataAPI_Point2DArray.h>
//--------------------------------------------------------------------------------------
#include <ModelAPI_AttributeBoolean.h>
#include <ModelAPI_AttributeDocRef.h>
#include <ModelAPI_AttributeDouble.h>
+#include <ModelAPI_AttributeDoubleArray.h>
#include <ModelAPI_AttributeIntArray.h>
#include <ModelAPI_AttributeInteger.h>
#include <ModelAPI_AttributeRefAttr.h>
{
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));
theAttribute->setValue(anIndex, it->intValue()); // use only values, no text support in array
}
+//--------------------------------------------------------------------------------------
+void fillAttribute(const std::list<ModelHighAPI_Double> & theValue,
+ const std::shared_ptr<ModelAPI_AttributeDoubleArray> & 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<std::shared_ptr<GeomAPI_Pnt2d> > & theValue,
+ const std::shared_ptr<GeomDataAPI_Point2DArray> & 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,
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<char>(::tolower(c)); });
if(theShapeTypeStr == "compound") {
aShapeType = GeomAPI_Shape::COMPOUND;
aShapeType = shapeTypeByStr(aType);
break;
}
+ default:
+ break; // do nothing [to avoid compilation warning]
}
return aShapeType;
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<char>(::tolower(c)); });
if (aType == "boolean")
return ModelAPI_AttributeTables::BOOLEAN;
else if (aType == "integer")
}
}
// store the model features information: iterate all features
- int anObjectsCount = 0; // stores the number of compared features for this document to compare
+ size_t anObjectsCount = 0; // stores the number of compared features for this document to compare
std::set<std::string> aProcessed; // processed features names (that are in the current document)
// process all objects (features and folders)
std::list<ObjectPtr>::iterator allIter = allObjects.begin();
for(; allIter != allObjects.end(); allIter++) {
ObjectPtr anObject = *allIter;
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
+ if (aFeature && aFeature->getKind() == "SketchConstraintCoincidenceInternal")
+ continue; // no need to dump and check internal constraints
+
if (theCompare) {
std::map<std::string, ModelHighAPI_FeatureStore>::iterator
anObjFind = aDocFind->second.find(anObject->data()->name());
theStore[theDocName][anObject->data()->name()] = ModelHighAPI_FeatureStore(anObject);
}
- FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
if (aFeature) {
// iterate all results of this feature
std::list<ResultPtr> allResults;
typedef std::map<std::string, std::map<std::string, ModelHighAPI_FeatureStore> > 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
if (aDump.get()) {
aDump->string("file_path")->setValue(theFilename);
aDump->string("file_format")->setValue("py");
- aDump->string("selection_type")->setValue(theSelectionType);
- 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()) {
}
static bool checkDump(SessionPtr theSession,
- char* theFilename,
+ const char* theFilename,
Storage& theStorage,
const std::string& theErrorMsgContext)
{
return true;
}
-bool checkPythonDump(const checkDumpType theCheckType)
+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 (theCheckType & CHECK_NAMING) {
- // dump with the selection by names
- if (!dumpToPython(aSession, aFileForNamingDump, "topological_naming", anErrorByNaming))
- return false;
- }
- if (theCheckType & CHECK_GEOMETRICAL) {
- // dump with the selection by geometry
- if (!dumpToPython(aSession, aFileForGeometryDump, "geometric_selection", anErrorByGeometry))
- return false;
- }
- if (theCheckType & CHECK_WEAK) {
- // 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<std::string, std::map<std::string, ModelHighAPI_FeatureStore> > aStore;
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);
+ isOk = isOk && checkDump(aSession, aFileForGeometryDump.c_str(), aStore, anErrorByGeometry);
}
if (theCheckType & CHECK_WEAK) {
- isOk = isOk && checkDump(aSession, aFileForWeakDump, aStore, anErrorByWeak);
+ isOk = isOk && checkDump(aSession, aFileForWeakDump.c_str(), aStore, anErrorByWeak);
}
return isOk;
