From e30982d0867e45de9fd3c412d44478d2b46ed113 Mon Sep 17 00:00:00 2001 From: vsv Date: Fri, 17 Apr 2020 22:00:30 +0300 Subject: [PATCH] Issue #3181: Improve Python dump readability --- src/ModelAPI/Test/Test2491.py | 112 ++++++++---------- src/ModelHighAPI/ModelHighAPI_Dumper.cpp | 8 +- src/ModelHighAPI/ModelHighAPI_Dumper.h | 2 +- .../ModelHighAPI_FeatureStore.cpp | 7 +- src/ModelHighAPI/ModelHighAPI_Tools.cpp | 8 +- src/SketchAPI/SketchAPI_Constraint.cpp | 3 +- 6 files changed, 69 insertions(+), 71 deletions(-) diff --git a/src/ModelAPI/Test/Test2491.py b/src/ModelAPI/Test/Test2491.py index 917333037..002b77793 100644 --- a/src/ModelAPI/Test/Test2491.py +++ b/src/ModelAPI/Test/Test2491.py @@ -31,68 +31,58 @@ SketchLine_2 = Sketch_1.addLine(20, 2.492755359431925e-15, 20, -31) SketchLine_3 = Sketch_1.addLine(-25.74772708486752, -20, -17.21320343559642, -20) SketchLine_4 = Sketch_1.addLine(-13.67766952966368, -21.46446609406726, 2.928932188134523, -38.07106781186547) SketchArc_1 = Sketch_1.addArc(-17.21320343559642, -25, -13.67766952966368, -21.46446609406726, -17.21320343559642, -20, False) -SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchArc_1.startPoint(), SketchLine_4.startPoint()) -SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchArc_1.endPoint(), SketchLine_3.endPoint()) -SketchConstraintTangent_1 = Sketch_1.setTangent(SketchArc_1.results()[1], SketchLine_4.result()) -SketchConstraintTangent_2 = Sketch_1.setTangent(SketchArc_1.results()[1], SketchLine_3.result()) -SketchConstraintHorizontal_1 = Sketch_1.setHorizontal(SketchLine_3.result()) -SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_2.result()) +Sketch_1.setCoincident(SketchArc_1.startPoint(), SketchLine_4.startPoint()) +Sketch_1.setCoincident(SketchArc_1.endPoint(), SketchLine_3.endPoint()) +Sketch_1.setTangent(SketchArc_1.results()[1], SketchLine_4.result()) +Sketch_1.setTangent(SketchArc_1.results()[1], SketchLine_3.result()) +Sketch_1.setHorizontal(SketchLine_3.result()) +Sketch_1.setVertical(SketchLine_2.result()) SketchArc_2 = Sketch_1.addArc(0, 6.520200294596256e-23, -4.760492650097915, 19.42518236023452, 20, 2.492755359431925e-15, True) -SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchArc_2.startPoint()) +Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchArc_2.startPoint()) SketchArc_3 = Sketch_1.addArc(-12, -5, -29.79117622747561, -17.94117647058824, -17.23654191510763, 16.36770059625792, True) -SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchArc_3.endPoint(), SketchLine_1.startPoint()) -SketchConstraintCoincidence_4.setName("SketchConstraintCoincidence_5") -SketchConstraintTangent_3 = Sketch_1.setTangent(SketchArc_3.results()[1], SketchLine_1.result()) -SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchArc_2.endPoint(), SketchLine_2.startPoint()) -SketchConstraintCoincidence_5.setName("SketchConstraintCoincidence_6") +Sketch_1.setCoincident(SketchArc_3.endPoint(), SketchLine_1.startPoint()) +Sketch_1.setTangent(SketchArc_3.results()[1], SketchLine_1.result()) +Sketch_1.setCoincident(SketchArc_2.endPoint(), SketchLine_2.startPoint()) SketchArc_4 = Sketch_1.addArc(-25.74772708486752, -15, -29.79117622747561, -17.94117647058824, -25.74772708486752, -20, False) -SketchConstraintCoincidence_6 = Sketch_1.setCoincident(SketchArc_4.startPoint(), SketchArc_3.startPoint()) -SketchConstraintCoincidence_6.setName("SketchConstraintCoincidence_7") -SketchConstraintCoincidence_7 = Sketch_1.setCoincident(SketchArc_4.endPoint(), SketchLine_3.startPoint()) -SketchConstraintCoincidence_7.setName("SketchConstraintCoincidence_8") -SketchConstraintTangent_4 = Sketch_1.setTangent(SketchArc_4.results()[1], SketchLine_3.result()) -SketchConstraintTangent_5 = Sketch_1.setTangent(SketchArc_4.results()[1], SketchArc_3.results()[1]) +Sketch_1.setCoincident(SketchArc_4.startPoint(), SketchArc_3.startPoint()) +Sketch_1.setCoincident(SketchArc_4.endPoint(), SketchLine_3.startPoint()) +Sketch_1.setTangent(SketchArc_4.results()[1], SketchLine_3.result()) +Sketch_1.setTangent(SketchArc_4.results()[1], SketchArc_3.results()[1]) SketchArc_5 = Sketch_1.addArc(10, -31, 20, -31, 2.928932188134523, -38.07106781186547, True) -SketchConstraintCoincidence_8 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchArc_5.startPoint()) -SketchConstraintCoincidence_8.setName("SketchConstraintCoincidence_9") -SketchConstraintCoincidence_9 = Sketch_1.setCoincident(SketchArc_5.endPoint(), SketchLine_4.endPoint()) -SketchConstraintCoincidence_9.setName("SketchConstraintCoincidence_10") -SketchConstraintTangent_6 = Sketch_1.setTangent(SketchArc_5.results()[1], SketchLine_4.result()) -SketchConstraintTangent_7 = Sketch_1.setTangent(SketchLine_2.result(), SketchArc_5.results()[1]) -SketchConstraintTangent_8 = Sketch_1.setTangent(SketchLine_1.result(), SketchArc_2.results()[1]) -SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_2.result(), 31) -SketchConstraintTangent_9 = Sketch_1.setTangent(SketchArc_2.results()[1], SketchLine_2.result()) -SketchConstraintAngle_1 = Sketch_1.setAngle(SketchLine_3.result(), SketchLine_4.result(), 135) -SketchConstraintRadius_1 = Sketch_1.setRadius(SketchArc_1.results()[1], 5) -SketchConstraintEqual_1 = Sketch_1.setEqual(SketchArc_4.results()[1], SketchArc_1.results()[1]) -SketchConstraintRadius_2 = Sketch_1.setRadius(SketchArc_5.results()[1], 10) -SketchConstraintRadius_3 = Sketch_1.setRadius(SketchArc_2.results()[1], 20) -SketchConstraintRadius_4 = Sketch_1.setRadius(SketchArc_3.results()[1], 22) +Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchArc_5.startPoint()) +Sketch_1.setCoincident(SketchArc_5.endPoint(), SketchLine_4.endPoint()) +Sketch_1.setTangent(SketchArc_5.results()[1], SketchLine_4.result()) +Sketch_1.setTangent(SketchLine_2.result(), SketchArc_5.results()[1]) +Sketch_1.setTangent(SketchLine_1.result(), SketchArc_2.results()[1]) +Sketch_1.setLength(SketchLine_2.result(), 31) +Sketch_1.setTangent(SketchArc_2.results()[1], SketchLine_2.result()) +Sketch_1.setAngle(SketchLine_3.result(), SketchLine_4.result(), 135) +Sketch_1.setRadius(SketchArc_1.results()[1], 5) +Sketch_1.setEqual(SketchArc_4.results()[1], SketchArc_1.results()[1]) +Sketch_1.setRadius(SketchArc_5.results()[1], 10) +Sketch_1.setRadius(SketchArc_2.results()[1], 20) +Sketch_1.setRadius(SketchArc_3.results()[1], 22) SketchCircle_1 = Sketch_1.addCircle(-22, -5, 7.5) SketchLine_5 = Sketch_1.addLine(-22, -5, -12, -5) SketchLine_5.setAuxiliary(True) -SketchConstraintCoincidence_10 = Sketch_1.setCoincident(SketchCircle_1.center(), SketchLine_5.startPoint()) -SketchConstraintCoincidence_10.setName("SketchConstraintCoincidence_11") -SketchConstraintCoincidence_11 = Sketch_1.setCoincident(SketchArc_3.center(), SketchLine_5.endPoint()) -SketchConstraintCoincidence_11.setName("SketchConstraintCoincidence_12") -SketchConstraintHorizontal_2 = Sketch_1.setHorizontal(SketchLine_5.result()) -SketchConstraintRadius_5 = Sketch_1.setRadius(SketchCircle_1.results()[1], 7.5) +Sketch_1.setCoincident(SketchCircle_1.center(), SketchLine_5.startPoint()) +Sketch_1.setCoincident(SketchArc_3.center(), SketchLine_5.endPoint()) +Sketch_1.setHorizontal(SketchLine_5.result()) +Sketch_1.setRadius(SketchCircle_1.results()[1], 7.5) SketchCircle_2 = Sketch_1.addCircle(0, 6.520200294596256e-23, 10) -SketchConstraintCoincidence_12 = Sketch_1.setCoincident(SketchArc_2.center(), SketchCircle_2.center()) -SketchConstraintCoincidence_12.setName("SketchConstraintCoincidence_13") -SketchConstraintRadius_6 = Sketch_1.setRadius(SketchCircle_2.results()[1], 10) -SketchConstraintDistanceVertical_1 = Sketch_1.setVerticalDistance(SketchCircle_2.center(), SketchArc_3.center(), 5) +Sketch_1.setCoincident(SketchArc_2.center(), SketchCircle_2.center()) +Sketch_1.setRadius(SketchCircle_2.results()[1], 10) +Sketch_1.setVerticalDistance(SketchCircle_2.center(), SketchArc_3.center(), 5) SketchCircle_3 = Sketch_1.addCircle(7, -25, 7.5) -SketchConstraintRadius_7 = Sketch_1.setRadius(SketchCircle_3.results()[1], 7.5) -SketchConstraintDistanceHorizontal_1 = Sketch_1.setHorizontalDistance(SketchArc_2.center(), SketchCircle_3.center(), 7) -SketchConstraintDistance_1 = Sketch_1.setDistance(SketchCircle_2.center(), SketchLine_3.result(), 20, True) -SketchConstraintDistanceVertical_2 = Sketch_1.setVerticalDistance(SketchArc_2.center(), SketchCircle_3.center(), 25) -SketchConstraintDistanceHorizontal_2 = Sketch_1.setHorizontalDistance(SketchLine_5.endPoint(), SketchArc_2.center(), 12) -SketchConstraintDistanceHorizontal_3 = Sketch_1.setHorizontalDistance(SketchCircle_1.center(), SketchArc_2.center(), 22) +Sketch_1.setRadius(SketchCircle_3.results()[1], 7.5) +Sketch_1.setHorizontalDistance(SketchArc_2.center(), SketchCircle_3.center(), 7) +Sketch_1.setDistance(SketchCircle_2.center(), SketchLine_3.result(), 20, True) +Sketch_1.setVerticalDistance(SketchArc_2.center(), SketchCircle_3.center(), 25) +Sketch_1.setHorizontalDistance(SketchLine_5.endPoint(), SketchArc_2.center(), 12) +Sketch_1.setHorizontalDistance(SketchCircle_1.center(), SketchArc_2.center(), 22) SketchProjection_1 = Sketch_1.addProjection(model.selection("VERTEX", "PartSet/Origin"), False) SketchPoint_1 = SketchProjection_1.createdFeature() -SketchConstraintCoincidence_13 = Sketch_1.setCoincident(SketchCircle_2.center(), SketchAPI_Point(SketchPoint_1).coordinates()) -SketchConstraintCoincidence_13.setName("SketchConstraintCoincidence_14") +Sketch_1.setCoincident(SketchCircle_2.center(), SketchAPI_Point(SketchPoint_1).coordinates()) model.do() Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchArc_3_2f-SketchArc_4_2f-SketchLine_3f-SketchArc_1_2r-SketchLine_4f-SketchArc_5_2f-SketchLine_2r-SketchArc_2_2f-SketchLine_1r-SketchCircle_1_2r-SketchCircle_2_2r-SketchCircle_3_2r")], model.selection(), 6.5, 0) Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_1_1/Generated_Face&Sketch_1/SketchLine_2")) @@ -100,18 +90,14 @@ SketchLine_6 = Sketch_2.addLine(14.45330132699559, 5.092287733454298, -12.158140 SketchLine_7 = Sketch_2.addLine(-12.15814035598059, 5.092287733454298, -12.15814035598059, 23.78152371848275) SketchLine_8 = Sketch_2.addLine(-12.15814035598059, 23.78152371848275, 14.45330132699559, 23.78152371848275) SketchLine_9 = Sketch_2.addLine(14.45330132699559, 23.78152371848275, 14.45330132699559, 5.092287733454298) -SketchConstraintCoincidence_14 = Sketch_2.setCoincident(SketchLine_9.endPoint(), SketchLine_6.startPoint()) -SketchConstraintCoincidence_14.setName("SketchConstraintCoincidence_15") -SketchConstraintCoincidence_15 = Sketch_2.setCoincident(SketchLine_6.endPoint(), SketchLine_7.startPoint()) -SketchConstraintCoincidence_15.setName("SketchConstraintCoincidence_16") -SketchConstraintCoincidence_16 = Sketch_2.setCoincident(SketchLine_7.endPoint(), SketchLine_8.startPoint()) -SketchConstraintCoincidence_16.setName("SketchConstraintCoincidence_17") -SketchConstraintCoincidence_17 = Sketch_2.setCoincident(SketchLine_8.endPoint(), SketchLine_9.startPoint()) -SketchConstraintCoincidence_17.setName("SketchConstraintCoincidence_18") -SketchConstraintHorizontal_3 = Sketch_2.setHorizontal(SketchLine_6.result()) -SketchConstraintVertical_2 = Sketch_2.setVertical(SketchLine_7.result()) -SketchConstraintHorizontal_4 = Sketch_2.setHorizontal(SketchLine_8.result()) -SketchConstraintVertical_3 = Sketch_2.setVertical(SketchLine_9.result()) +Sketch_2.setCoincident(SketchLine_9.endPoint(), SketchLine_6.startPoint()) +Sketch_2.setCoincident(SketchLine_6.endPoint(), SketchLine_7.startPoint()) +Sketch_2.setCoincident(SketchLine_7.endPoint(), SketchLine_8.startPoint()) +Sketch_2.setCoincident(SketchLine_8.endPoint(), SketchLine_9.startPoint()) +Sketch_2.setHorizontal(SketchLine_6.result()) +Sketch_2.setVertical(SketchLine_7.result()) +Sketch_2.setHorizontal(SketchLine_8.result()) +Sketch_2.setVertical(SketchLine_9.result()) model.do() ExtrusionCut_1 = model.addExtrusionCut(Part_1_doc, [model.selection("FACE", "Sketch_2/Face-SketchLine_9r-SketchLine_8r-SketchLine_7r-SketchLine_6r")], model.selection(), 0, 100, [model.selection("SOLID", "Extrusion_1_1")]) model.do() diff --git a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp index f1a61c254..478e4803a 100644 --- a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp +++ b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp @@ -569,7 +569,8 @@ static int toInt(const std::string& theString) const std::string& ModelHighAPI_Dumper::name(const EntityPtr& theEntity, bool theSaveNotDumped, - bool theUseEntityName) + bool theUseEntityName, + bool theSetIsDumped) { EntityNameMap::const_iterator aFound = myNames.find(theEntity); if (aFound != myNames.end()) @@ -650,6 +651,8 @@ const std::string& ModelHighAPI_Dumper::name(const EntityPtr& theEntity, if (aFeature) saveResultNames(aFeature); + myNames[theEntity].myIsDumped = theSetIsDumped; + return myNames[theEntity].myCurrentName; } @@ -772,7 +775,7 @@ bool ModelHighAPI_Dumper::process(const std::shared_ptrgetKind() << "\n"; *myDumpStorage << name(theEntity); if (!myNames[theEntity].myIsDumped) { diff --git a/src/ModelHighAPI/ModelHighAPI_Dumper.h b/src/ModelHighAPI/ModelHighAPI_Dumper.h index ef81ae212..a7c63ec4e 100644 --- a/src/ModelHighAPI/ModelHighAPI_Dumper.h +++ b/src/ModelHighAPI/ModelHighAPI_Dumper.h @@ -181,7 +181,7 @@ public: /// \return name of the entity MODELHIGHAPI_EXPORT const std::string& name(const EntityPtr& theEntity, bool theSaveNotDumped = true, - bool theUseEntityName = false); + bool theUseEntityName = false, bool theSetIsDumped = false); /// Returns name of parent composite feature for specified entity MODELHIGHAPI_EXPORT diff --git a/src/ModelHighAPI/ModelHighAPI_FeatureStore.cpp b/src/ModelHighAPI/ModelHighAPI_FeatureStore.cpp index 509377003..63ba58607 100644 --- a/src/ModelHighAPI/ModelHighAPI_FeatureStore.cpp +++ b/src/ModelHighAPI/ModelHighAPI_FeatureStore.cpp @@ -287,8 +287,11 @@ std::string ModelHighAPI_FeatureStore::dumpAttr(const AttributePtr& theAttr) { 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 + //if (aFeature->getKind() == "SketchConstraintCoincidenceInternal") + // continue; // skip internal constraints + std::string aStr = aFeature->getKind().substr(0, 16); + if (aStr == "SketchConstraint") + continue; // no need to dump and check constraints } aResList.push_back((*aL)->data()->name()); } else if (!isSketchFeatures) { diff --git a/src/ModelHighAPI/ModelHighAPI_Tools.cpp b/src/ModelHighAPI/ModelHighAPI_Tools.cpp index 882c94f40..936775e47 100644 --- a/src/ModelHighAPI/ModelHighAPI_Tools.cpp +++ b/src/ModelHighAPI/ModelHighAPI_Tools.cpp @@ -428,9 +428,13 @@ std::string storeFeatures(const std::string& theDocName, DocumentPtr theDoc, for(; allIter != allObjects.end(); allIter++) { ObjectPtr anObject = *allIter; FeaturePtr aFeature = std::dynamic_pointer_cast(anObject); - if (aFeature && aFeature->getKind() == "SketchConstraintCoincidenceInternal") - continue; // no need to dump and check internal constraints + //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()); diff --git a/src/SketchAPI/SketchAPI_Constraint.cpp b/src/SketchAPI/SketchAPI_Constraint.cpp index 7ff2457a9..eedc31a97 100644 --- a/src/SketchAPI/SketchAPI_Constraint.cpp +++ b/src/SketchAPI/SketchAPI_Constraint.cpp @@ -194,7 +194,8 @@ void SketchAPI_Constraint::dump(ModelHighAPI_Dumper& theDumper) const return; const std::string& aSketchName = theDumper.parentName(aBase); - theDumper << aBase << " = " << aSketchName << "." << aSetter << "("; + theDumper.name(aBase, false, true, true); + theDumper << aSketchName << "." << aSetter << "("; bool isFirstAttr = true; for (int i = 0; i < CONSTRAINT_ATTR_SIZE; ++i) { -- 2.39.2