Issue #1343. Improvement of Extrusion and Revolution operations: sketch creator setSe...

[modules/shaper.git] / src / PartSet / PartSet_WidgetSketchLabel.cpp

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index 55753d22d11639578bbf2fc95250a6f47277bb26..50d0308ec52a2de89cd5ad4a51a4c8ad707b1c3b 100644 (file)
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -187,10 +187,11 @@ void PartSet_WidgetSketchLabel::onShowConstraint(bool theOn)
     emit showConstraintToggled(aState, theOn);
 }
 
-void PartSet_WidgetSketchLabel::blockAttribute(const bool& theToBlock, bool& isFlushesActived,
+void PartSet_WidgetSketchLabel::blockAttribute(const AttributePtr& theAttribute,
+                                               const bool& theToBlock, bool& isFlushesActived,
                                                bool& isAttributeSetInitializedBlocked)
 {
-  ModuleBase_WidgetValidated::blockAttribute(theToBlock, isFlushesActived,
+  ModuleBase_WidgetValidated::blockAttribute(theAttribute, theToBlock, isFlushesActived,
                                              isAttributeSetInitializedBlocked);
   // We do not restore the previous state of isAttributeSetInitializedBlocked for each of
   // attributes. It it is necessary, these states should be append to the method attributes
@@ -318,14 +319,15 @@ void PartSet_WidgetSketchLabel::enableFocusProcessing()
   myStackWidget->installEventFilter(this);
 }
 
-void PartSet_WidgetSketchLabel::storeAttributeValue()
+void PartSet_WidgetSketchLabel::storeAttributeValue(const AttributePtr& theAttribute)
 {
-  ModuleBase_WidgetValidated::storeAttributeValue();
+  ModuleBase_WidgetValidated::storeAttributeValue(theAttribute);
 }
 
-void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid)
+void PartSet_WidgetSketchLabel::restoreAttributeValue(const AttributePtr& theAttribute,
+                                                      const bool theValid)
 {
-  ModuleBase_WidgetValidated::restoreAttributeValue(theValid);
+  ModuleBase_WidgetValidated::restoreAttributeValue(theAttribute, theValid);
 
   // it is not necessary to save the previous plane value because the plane is chosen once
   DataPtr aData = feature()->data();
@@ -359,9 +361,11 @@ bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrs& thePrs
     std::shared_ptr<GeomAPI_Face> aGeomFace;
     const TopoDS_Shape aShape = thePrs.shape();
     if (aShape.IsNull()) {
-      GeomShapePtr aGeomShape = aResult->shape();
-      std::shared_ptr<GeomAPI_Face> aGeomFace(new GeomAPI_Face(aGeomShape));
-      aCanFillSketch = aGeomFace.get() && aGeomFace->isPlanar();
+      if (aResult.get()) {
+        GeomShapePtr aGeomShape = aResult->shape();
+        std::shared_ptr<GeomAPI_Face> aGeomFace(new GeomAPI_Face(aGeomShape));
+        aCanFillSketch = aGeomFace.get() && aGeomFace->isPlanar();
+      }
     }
     else if (aShape.ShapeType() == TopAbs_FACE) {
       std::shared_ptr<GeomAPI_Face> aGeomFace(new GeomAPI_Face());