-// 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 "SketchPlugin_MacroArc.h"
Events_Loop::loop()->send(aMessage);
}
+// LCOV_EXCL_START
std::string SketchPlugin_MacroArc::processEvent(const std::shared_ptr<Events_Message>& theMessage)
{
std::string aFilledAttributeName;
aRefAttr->setAttr(anAttribute);
}
else if (anObject.get()) {
- // if presentation of previous reentrant macro arc is used, the object is invalid,
- // we should use result of previous feature of the message(Arc)
- if (!anObject->data()->isValid()) {
- FeaturePtr aCreatedFeature = aReentrantMessage->createdFeature();
- if (aCreatedFeature.get())
- anObject = aCreatedFeature->lastResult();
- }
- aRefAttr->setObject(anObject);
+ // if attribute is NULL, only object is defined, it should be processed outside
+ // the feature because it might be an external feature, that will be
+ // removed/created again after restart operation
+ // #2468 - Crash when sketching circles successively on a repetition
+ aFilledAttributeName = ARC_TYPE();
}
}
}
}
return aFilledAttributeName;
}
+// LCOV_EXCL_STOP
FeaturePtr SketchPlugin_MacroArc::createArcFeature()
{
return;
GeomAPI_Circ2d aCircleForArc(myCenter, myStart);
+ // avoid degerated arc, when the center and the start points are equal
+ if (!aCircleForArc.implPtr<void*>())
+ return;
bool aWasBlocked = data()->blockSendAttributeUpdated(true);
// check the end point is referred to another feature