/**\class SketchPlugin_SketchEntity
* \ingroup Plugins
- * \brief Sketch Entity for creation of the new feature in PartSet. This is an abstract class to give
+ * \brief Sketch Entity for creation of the new feature in PartSet.
+ * This is an abstract class to give
* an interface to create the entity features such as line, circle, arc and point.
*/
class SketchPlugin_SketchEntity : public SketchPlugin_Feature, public GeomAPI_ICustomPrs
/// Width of the auxiliary line
inline static const double SKETCH_LINE_WIDTH_AUXILIARY()
{
- return 1;
+ return 2;
}
/// Width of the line
{
AttributeSelectionPtr aAttr = data()->selection(EXTERNAL_ID());
if (aAttr)
- return aAttr->context().get() != NULL;
+ return aAttr->context().get() != NULL && !aAttr->isInvalid();
return false;
}
virtual bool customisePresentation(ResultPtr theResult, AISObjectPtr thePrs,
std::shared_ptr<GeomAPI_ICustomPrs> theDefaultPrs)
{
- bool isCustomized = false;
+ /// Store previous color values of the presentation to check it after setting specific entity
+ /// color. Default color is set into presentation to have not modified isCustomized state
+ /// after default customize prs is completed.
+ std::vector<int> aPrevColor;
+ aPrevColor.resize(3);
+ thePrs->getColor(aPrevColor[0], aPrevColor[1], aPrevColor[2]);
+ if (theResult.get()) {
+ std::string aSection, aName, aDefault;
+ theResult->colorConfigInfo(aSection, aName, aDefault);
+ std::vector<int> aColor;
+ aColor = Config_PropManager::color(aSection, aName, aDefault);
+ thePrs->setColor(aColor[0], aColor[1], aColor[2]);
+ }
+
+ bool isCustomized = theDefaultPrs.get() != NULL &&
+ theDefaultPrs->customisePresentation(theResult, thePrs, theDefaultPrs);
int aShapeType = thePrs->getShapeType();
- // a compound is processed like the edge because the arc feature uses the compound for presentable AIS
+ // a compound is processed like the edge because the
+ // arc feature uses the compound for presentable AIS
if (aShapeType != 6/*an edge*/ && aShapeType != 7/*a vertex*/ && aShapeType != 0/*compound*/)
return false;
aColor = Config_PropManager::color("Visualization", "sketch_entity_color",
SKETCH_ENTITY_COLOR);
}
- if (!aColor.empty())
- isCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]) || isCustomized;
+ if (!aColor.empty()) {
+ thePrs->setColor(aColor[0], aColor[1], aColor[2]);
+ for (int i = 0; i < 3 && !isCustomized; i++)
+ isCustomized = aColor[i] != aPrevColor[i];
+ }
if (aShapeType == 6 || aShapeType == 0) { // if this is an edge or a compound
if (isConstruction) {