Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for the issue #1928
[modules/shaper.git]
/
src
/
SketchPlugin
/
SketchPlugin_ConstraintSplit.cpp
diff --git
a/src/SketchPlugin/SketchPlugin_ConstraintSplit.cpp
b/src/SketchPlugin/SketchPlugin_ConstraintSplit.cpp
index b83431b196a5b911a6dfdca73a9323ac1c40a385..ccf819ab626e340bb18825946e1a40a6387a9e3d 100755
(executable)
--- a/
src/SketchPlugin/SketchPlugin_ConstraintSplit.cpp
+++ b/
src/SketchPlugin/SketchPlugin_ConstraintSplit.cpp
@@
-48,8
+48,6
@@
#include <iostream>
#endif
#include <iostream>
#endif
-#define CIRCLE_FEATURE_DELETE_WITHOUT_REFERENCES
-
static const double PI = 3.141592653589793238463;
SketchPlugin_ConstraintSplit::SketchPlugin_ConstraintSplit()
static const double PI = 3.141592653589793238463;
SketchPlugin_ConstraintSplit::SketchPlugin_ConstraintSplit()
@@
-95,9
+93,6
@@
void SketchPlugin_ConstraintSplit::execute()
FeaturePtr aBaseFeature = ModelAPI_Feature::feature(aBaseObjectAttr->value());
ResultPtr aBaseFeatureResult = getFeatureResult(aBaseFeature);
std::set<FeaturePtr> aFeaturesToDelete, aFeaturesToUpdate;
FeaturePtr aBaseFeature = ModelAPI_Feature::feature(aBaseObjectAttr->value());
ResultPtr aBaseFeatureResult = getFeatureResult(aBaseFeature);
std::set<FeaturePtr> aFeaturesToDelete, aFeaturesToUpdate;
- #ifdef CIRCLE_FEATURE_DELETE_WITHOUT_REFERENCES
- FeaturePtr aCircleFeatureToDelete;
- #endif
std::map<FeaturePtr, IdToPointPair> aTangentFeatures;
std::map<FeaturePtr, IdToPointPair> aCoincidenceToFeature;
std::map<FeaturePtr, IdToPointPair> aTangentFeatures;
std::map<FeaturePtr, IdToPointPair> aCoincidenceToFeature;
@@
-223,11
+218,7
@@
void SketchPlugin_ConstraintSplit::execute()
updateRefFeatureConstraints(getFeatureResult(aBaseFeature), aRefsToFeature);
AttributePtr aCenterAttr = aCircleFeature->attribute(SketchPlugin_Circle::CENTER_ID());
updateRefFeatureConstraints(getFeatureResult(aBaseFeature), aRefsToFeature);
AttributePtr aCenterAttr = aCircleFeature->attribute(SketchPlugin_Circle::CENTER_ID());
-#ifdef CIRCLE_FEATURE_DELETE_WITHOUT_REFERENCES
- aCircleFeatureToDelete = aCircleFeature;
-#else
aFeaturesToDelete.insert(aCircleFeature);
aFeaturesToDelete.insert(aCircleFeature);
-#endif
// as circle is removed, temporary fill this attribute*/
aBaseObjectAttr->setObject(ResultPtr());
}
// as circle is removed, temporary fill this attribute*/
aBaseObjectAttr->setObject(ResultPtr());
}
@@
-306,11
+297,6
@@
void SketchPlugin_ConstraintSplit::execute()
}
#endif
ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToDelete);
}
#endif
ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToDelete);
-#ifdef CIRCLE_FEATURE_DELETE_WITHOUT_REFERENCES
- std::set<FeaturePtr> aCircleFeatures;
- aCircleFeatures.insert(aCircleFeatureToDelete);
- ModelAPI_Tools::removeFeatures(aCircleFeatures, false);
-#endif
#ifdef DEBUG_SPLIT
std::cout << "update features after split:" << std::endl;
#ifdef DEBUG_SPLIT
std::cout << "update features after split:" << std::endl;
@@
-1318,7
+1304,7
@@
std::set<std::shared_ptr<ModelAPI_Attribute> > SketchPlugin_ConstraintSplit::get
return anAttributes;
}
return anAttributes;
}
-
+#ifdef _DEBUG
std::string SketchPlugin_ConstraintSplit::getFeatureInfo(
const std::shared_ptr<ModelAPI_Feature>& theFeature,
const bool isUseAttributesInfo)
std::string SketchPlugin_ConstraintSplit::getFeatureInfo(
const std::shared_ptr<ModelAPI_Feature>& theFeature,
const bool isUseAttributesInfo)
@@
-1379,4
+1365,4
@@
std::string SketchPlugin_ConstraintSplit::getFeatureInfo(
}
return anInfo;
}
}
return anInfo;
}
-
+#endif