-// 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
//
// 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<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <ModelHighAPI_FeatureStore.h>
#define PRECISION 6
#define TOLERANCE (1.e-7)
-ModelHighAPI_FeatureStore::ModelHighAPI_FeatureStore(FeaturePtr theFeature) {
- storeData(theFeature->data(), myAttrs);
- // iterate results to store
- std::list<ResultPtr> allResults;
- ModelAPI_Tools::allResults(theFeature, allResults);
- std::list<ResultPtr>::iterator aRes = allResults.begin();
- for(; aRes != allResults.end(); aRes++) {
- std::map<std::string, std::string> aResDump;
- storeData((*aRes)->data(), aResDump);
- myRes.push_back(aResDump);
+ModelHighAPI_FeatureStore::ModelHighAPI_FeatureStore(ObjectPtr theObject) {
+ storeData(theObject->data(), myAttrs);
+
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObject);
+ if (aFeature) {
+ // iterate results to store
+ std::list<ResultPtr> allResults;
+ ModelAPI_Tools::allResults(aFeature, allResults);
+ std::list<ResultPtr>::iterator aRes = allResults.begin();
+ for(; aRes != allResults.end(); aRes++) {
+ std::map<std::string, std::string> aResDump;
+ storeData((*aRes)->data(), aResDump);
+ myRes.push_back(aResDump);
+ }
}
}
-std::string ModelHighAPI_FeatureStore::compare(FeaturePtr theFeature) {
- std::string anError = compareData(theFeature->data(), myAttrs);
+std::string ModelHighAPI_FeatureStore::compare(ObjectPtr theObject) {
+ std::string anError = compareData(theObject->data(), myAttrs);
if (!anError.empty()) {
- return "Features '" + theFeature->name() + "' differ:" + anError;
- }
- std::list<ResultPtr> allResults;
- ModelAPI_Tools::allResults(theFeature, allResults);
- std::list<ResultPtr>::iterator aRes = allResults.begin();
- std::list<std::map<std::string, std::string> >::iterator aResIter = myRes.begin();
- for(; aRes != allResults.end() && aResIter != myRes.end(); aRes++, aResIter++) {
- anError = compareData((*aRes)->data(), *aResIter);
- if (!anError.empty())
- return "Results of feature '" + theFeature->name() + "' '" + (*aRes)->data()->name() +
- "' differ:" + anError;
+ return "Features '" + theObject->data()->name() + "' differ:" + anError;
}
- if (aRes != allResults.end()) {
- return "Current model has more results '" + (*aRes)->data()->name() + "'";
- }
- if (aResIter != myRes.end()) {
- return "Original model had more results '" + (*aResIter)["__name__"] + "'";
+
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObject);
+ if (aFeature) {
+ std::list<ResultPtr> allResults;
+ ModelAPI_Tools::allResults(aFeature, allResults);
+ std::list<ResultPtr>::iterator aRes = allResults.begin();
+ std::list<std::map<std::string, std::string> >::iterator aResIter = myRes.begin();
+ for(; aRes != allResults.end() && aResIter != myRes.end(); aRes++, aResIter++) {
+ anError = compareData((*aRes)->data(), *aResIter);
+ if (!anError.empty())
+ return "Results of feature '" + aFeature->name() + "' '" + (*aRes)->data()->name() +
+ "' differ:" + anError;
+ }
+ if (aRes != allResults.end()) {
+ return "Current model has more results '" + (*aRes)->data()->name() + "'";
+ }
+ if (aResIter != myRes.end()) {
+ return "Original model had more results '" + (*aResIter)["__name__"] + "'";
+ }
}
return ""; // ok
}
return "__notcase__";
}
std::string aType = theAttr->attributeType();
+
+ // do not check selection of the filter,
+ // because there is neither parametric update nor dump support yet.
+ FiltersFeaturePtr aFilter = std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(aFeatOwner);
+ if (aFilter && (aType == ModelAPI_AttributeSelection::typeId() ||
+ aType == ModelAPI_AttributeSelectionList::typeId()))
+ return "__filter_selection__";
+
std::ostringstream aResult;
if (!theAttr->isInitialized()) {
if (aType == ModelAPI_AttributeBoolean::typeId()) {
}
} else if (aType == ModelAPI_AttributeInteger::typeId()) {
AttributeIntegerPtr anAttr = std::dynamic_pointer_cast<ModelAPI_AttributeInteger>(theAttr);
+ // do not dump a type of ConstraintAngle, because it can be changed due dumping
+ if (anAttr->id() == "AngleType") {
+ return "";
+ }
if (anAttr->text().empty())
aResult<<anAttr->value();
else
aResult<<anAttr->text();
} else if (aType == ModelAPI_AttributeDouble::typeId()) {
AttributeDoublePtr anAttr = std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(theAttr);
+ if (anAttr->id() == "ConstraintValue") {
+ // do not dump a value of constraint if it is ConstraintAngle,
+ // because this value depends on the angle type
+ FeaturePtr anOwner = ModelAPI_Feature::feature(anAttr->owner());
+ if (anOwner && anOwner->getKind() == "SketchConstraintAngle")
+ return "";
+ }
int aPrecision = PRECISION;
// Special case - precision for the arc angle. It is calculated with tolerance 1e-4,
// so the value has only 4 correct digits
aResult<<anAttr->text();
} else if (aType == ModelAPI_AttributeBoolean::typeId()) {
AttributeBooleanPtr anAttr = std::dynamic_pointer_cast<ModelAPI_AttributeBoolean>(theAttr);
+ // do not dump internal flags of ConstraintAngle
+ if (anAttr->id() == "AngleReversedLine1" || anAttr->id() == "AngleReversedLine2") {
+ return "";
+ }
aResult<<anAttr->value();
} else if (aType == ModelAPI_AttributeString::typeId()) {
AttributeStringPtr anAttr = std::dynamic_pointer_cast<ModelAPI_AttributeString>(theAttr);
} else if (aType == ModelAPI_AttributeSelection::typeId()) {
AttributeSelectionPtr anAttr =
std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttr);
- aResult<<anAttr->namingName();
+ if (anAttr->context().get())
+ aResult<<anAttr->namingName();
+ else
+ aResult<<"__notinitialized__";
} else if (aType == ModelAPI_AttributeSelectionList::typeId()) {
AttributeSelectionListPtr anAttr =
std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttr);
std::list<std::string> aResList; // list of resulting strings
for(std::list<ObjectPtr>::iterator aL = aList.begin(); aL != aList.end(); aL++) {
if (aL->get()) {
+ if (isSketchFeatures) {
+ // do not control construction features of an ellipse and other
+ FeaturePtr aFeature = ModelAPI_Feature::feature(*aL);
+ if (aFeature->getKind() == "SketchConstraintCoincidenceInternal")
+ continue; // skip internal constraints
+ }
aResList.push_back((*aL)->data()->name());
} else if (!isSketchFeatures) {
aResList.push_back("__empty__");
} else if (aType == GeomDataAPI_Point2D::typeId()) {
// do not dump flyout point for constraints as it may be changed unexpectedly
if (theAttr->id() == "ConstraintFlyoutValuePnt")
- return "";
+ return "__notinitialized__";
AttributePoint2DPtr anAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(theAttr);
double aValues[2] = {anAttr->x(), anAttr->y()};
dumpArray(aResult, aValues, 2);
aResult<<": "<<aCount<<std::endl;
}
// output the main characteristics
- if (GeomAlgoAPI_ShapeTools::volume(theShape) > 1.e-7) {
+ if (GeomAlgoAPI_ShapeTools::volume(theShape) > 1.e-5) {
aResult<<"Volume: "<<
std::fixed<<setprecision(3)<<GeomAlgoAPI_ShapeTools::volume(theShape)<<std::endl;
}
