From: nds <nds@opencascade.com>
Date: Fri, 28 Aug 2015 18:17:32 +0000 (+0300)
Subject: Issue #764 extrusionfuse - plane for sketch
X-Git-Tag: V_1.4.0_beta4~199
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d7ec97585608cd5f8b9555b952041c1c87c1e235;p=modules%2Fshaper.git

Issue #764 extrusionfuse - plane for sketch
---

diff --git a/src/FeaturesPlugin/extrusionfuse_widget.xml b/src/FeaturesPlugin/extrusionfuse_widget.xml
index 17ef824ba..519a22ec8 100644
--- a/src/FeaturesPlugin/extrusionfuse_widget.xml
+++ b/src/FeaturesPlugin/extrusionfuse_widget.xml
@@ -72,6 +72,7 @@
     tooltip="Objects to Fuse"
     type_choice="Solids"
     concealment="true">
+    <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
 </source>
diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index b45230c66..4cc39ef71 100644
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -80,6 +80,7 @@
     tooltip="Objects to Cut"
     type_choice="Solids"
     concealment="true">
+    <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,ByAngles,to_angle,from_angle,to_object,to_offset,from_object,from_offset"/>
 </source>
diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml
index e348ecd06..81c0f1a60 100644
--- a/src/FeaturesPlugin/revolutionfuse_widget.xml
+++ b/src/FeaturesPlugin/revolutionfuse_widget.xml
@@ -80,6 +80,7 @@
     tooltip="Objects to Fuse"
     type_choice="Solids"
     concealment="true">
+    <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,ByAngles,to_angle,from_angle,to_object,to_offset,from_object,from_offset"/>
 </source>
diff --git a/src/PartSet/PartSet_WidgetSketchCreator.cpp b/src/PartSet/PartSet_WidgetSketchCreator.cpp
index c93c58516..f7a52416e 100644
--- a/src/PartSet/PartSet_WidgetSketchCreator.cpp
+++ b/src/PartSet/PartSet_WidgetSketchCreator.cpp
@@ -198,11 +198,12 @@ void PartSet_WidgetSketchCreator::onResumed(ModuleBase_Operation* theOp)
         ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
         AttributePtr anAttribute = myFeature->attribute(anObjectsAttribute);
         std::string aValidatorID, anError;
-        if (aFactory->validate(anAttribute, aValidatorID, anError)) {
-          AttributeSelectionListPtr aSelList = aCompFeature->data()->selectionList(anObjectsAttribute);
-          aSelList->append(aRes, GeomShapePtr());
+        AttributeSelectionListPtr aSelList = aCompFeature->data()->selectionList(anObjectsAttribute);
+        aSelList->append(aRes, GeomShapePtr());
+        if (aFactory->validate(anAttribute, aValidatorID, anError))
           updateObject(aCompFeature);
-        }
+        else
+          aSelList->clear();
       }
     }
   }