From e6e134a3424f8a7b4d135d14de79631d52f13e91 Mon Sep 17 00:00:00 2001 From: nds Date: Thu, 9 Mar 2017 18:10:35 +0300 Subject: [PATCH] Issue #2027 Sketcher Trim Feature: split shapes by highlighted point is moved from GUI to Trim feature. Correction for Jenkins(function argument). --- src/SketchPlugin/SketchPlugin_Trim.cpp | 5 +++-- src/SketchPlugin/SketchPlugin_Trim.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/SketchPlugin/SketchPlugin_Trim.cpp b/src/SketchPlugin/SketchPlugin_Trim.cpp index 6c778e514..d8663ee54 100644 --- a/src/SketchPlugin/SketchPlugin_Trim.cpp +++ b/src/SketchPlugin/SketchPlugin_Trim.cpp @@ -240,7 +240,8 @@ void SketchPlugin_Trim::execute() const std::list& anObjects = anInfo.second; for (std::list::const_iterator anObjectIt = anObjects.begin(); anObjectIt != anObjects.end(); anObjectIt++) { - createConstraint(SketchPlugin_ConstraintCoincidence::ID(), aPointAttribute, *anObjectIt); + createConstraintToObject(SketchPlugin_ConstraintCoincidence::ID(), aPointAttribute, + *anObjectIt); } } @@ -925,7 +926,7 @@ FeaturePtr SketchPlugin_Trim::createConstraint(const std::string& theConstraintI return aConstraint; } -FeaturePtr SketchPlugin_Trim::createConstraint(const std::string& theConstraintId, +FeaturePtr SketchPlugin_Trim::createConstraintToObject(const std::string& theConstraintId, const AttributePtr& theFirstAttribute, const ObjectPtr& theSecondObject) { diff --git a/src/SketchPlugin/SketchPlugin_Trim.h b/src/SketchPlugin/SketchPlugin_Trim.h index 70bffe0a8..b31503128 100644 --- a/src/SketchPlugin/SketchPlugin_Trim.h +++ b/src/SketchPlugin/SketchPlugin_Trim.h @@ -225,7 +225,7 @@ private: /// \param theConstraintId a constraint index /// \param theFirstAttribute an attribute of further coincidence /// \param theSecondObject an object of further coincidence - std::shared_ptr createConstraint(const std::string& theConstraintId, + std::shared_ptr createConstraintToObject(const std::string& theConstraintId, const std::shared_ptr& theFirstAttribute, const std::shared_ptr& theSecondObject); -- 2.39.2