#include <ModelAPI_ResultConstruction.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
+#include <ModelAPI_Tools.h>
#include <GeomAPI_Circ.h>
#include <GeomAPI_Edge.h>
data()->addAttribute(EXTERNAL_ID(), ModelAPI_AttributeSelection::typeId());
ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), EXTERNAL_ID());
+
+ ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), AUXILIARY_ID());
}
void SketchPlugin_Projection::execute()
return;
FeaturePtr aProjection = ModelAPI_Feature::feature(aRefAttr->object());
- if (!lastResult().get()) {
+ if (!lastResult().get() && aProjection->lastResult().get()) {
ResultConstructionPtr aConstr = document()->createConstruction(data());
aConstr->setShape(aProjection->lastResult()->shape());
aConstr->setIsInHistory(false);
+ aConstr->setDisplayed(false);
setResult(aConstr);
aProjection->selection(EXTERNAL_ID())->setValue(lastResult(), lastResult()->shape());
computeProjection(theID);
myIsComputing = false;
}
- else if (theID == AUXILIARY_ID())
- {
- AttributeRefAttrPtr aRefAttr = data()->refattr(PROJECTED_FEATURE_ID());
- if (!aRefAttr || !aRefAttr->isInitialized())
- return;
- FeaturePtr aProjection = ModelAPI_Feature::feature(aRefAttr->object());
- if (!aProjection)
- return;
- aProjection->boolean(AUXILIARY_ID())->setValue(boolean(AUXILIARY_ID())->value());
- }
}
void SketchPlugin_Projection::computeProjection(const std::string& theID)
(anEdge->isCircle() && aProjection->getKind() != SketchPlugin_Circle::ID()) ||
(anEdge->isArc() && aProjection->getKind() != SketchPlugin_Arc::ID())) {
DocumentPtr aDoc = sketch()->document();
- aDoc->removeFeature(aProjection);
+
+ std::set<FeaturePtr> aFeaturesToBeRemoved;
+ aFeaturesToBeRemoved.insert(aProjection);
+ ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved);
aProjection = FeaturePtr();
aRefAttr->setObject(aProjection);
}
std::shared_ptr<GeomAPI_Pln> aSketchPlane = sketch()->plane();
+ ResultConstructionPtr aResult =
+ std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(lastResult());
+ if (aResult && aResult->shape()) {
+ aResult->setShape(std::shared_ptr<GeomAPI_Edge>());
+ aProjection->selection(EXTERNAL_ID())->setValue(lastResult(), lastResult()->shape());
+ }
+
if (anEdge->isLine()) {
std::shared_ptr<GeomAPI_Pnt> aFirst = aSketchPlane->project(anEdge->firstPoint());
std::shared_ptr<GeomAPI_Pnt> aLast = aSketchPlane->project(anEdge->lastPoint());
aFixed->execute();
}
- if (theID == EXTERNAL_FEATURE_ID())
- selection(EXTERNAL_ID())->setValue(aExtFeature->context(), aExtFeature->context()->shape());
+ if (theID == EXTERNAL_FEATURE_ID()) {
+ selection(EXTERNAL_ID())->setValue(aExtFeature->context(), aExtFeature->value());
+
+ if (aResult) {
+ aResult->setShape(aProjection->lastResult()->shape());
+ setResult(aResult);
+ aProjection->selection(EXTERNAL_ID())->setValue(lastResult(), lastResult()->shape());
+ }
+ }
}