Extrusion cut operation

diff --git a/src/FeaturesPlugin/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml
index 7e510b16deb2d701cbac28752078dfe6b45df1da..dc541d1cc5738138efc943f73a2895c272240d52 100755 (executable)
--- a/src/FeaturesPlugin/extrusioncut_widget.xml
+++ b/src/FeaturesPlugin/extrusioncut_widget.xml
@@ -1,65 +1,57 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
-  <groupbox title="Revolution">
+  <groupbox title="Extrusion">
     <shape_selector id="main_objects"
-    label="Select an object"
-    icon=":icons/sketch.png"
-    tooltip="Select a destination element"
-    shape_types="face edge vertex"
-    default="&lt;sketch&gt;"
-  />
-  <shape_selector id="axis_object"
-                    icon=":icons/axis.png"
-                    label="Axis"
-                    tooltip="Select an edge for axis"
-                    shape_types="edge"
-                    default="">
-    <validator id="GeomValidators_ShapeType" parameters="line"/>
-    </shape_selector>
+      label="Select a planar face"
+      icon=":icons/sketch.png"
+      tooltip="Select a destination element"
+      shape_types="face edge vertex"
+      default="&lt;sketch&gt;"
+    />
     <groupbox title="From">
-    <shape_selector id="from_object"
-                    icon=":icons/plane.png"
-                    label="Plane face"
-                    tooltip="Select a planar face"
-                    shape_types="face"
-                    default="&lt;sketch&gt;">
-      <validator id="GeomValidators_Face" parameters="plane"/>
-    </shape_selector>
-    <doublevalue
-      id="from_size"
-      label="Angle"
-      min="0"
-      step="1.0"
-      default="0"
-      icon=":icons/angle_down.png"
-      tooltip="Height">
-    </doublevalue>
-  </groupbox>
-  <groupbox title="To">
-    <shape_selector id="to_object"
-                    icon=":icons/plane_inverted.png"
-                    label="Plane face"
-                    tooltip="Select a planar face"
-                    shape_types="face"
-                    default="&lt;sketch&gt;">
-      <validator id="GeomValidators_Face" parameters="plane"/>
-    </shape_selector>
-    <doublevalue
-      id="to_size"
-      label="Angle"
-      min="0"
-      step="1.0"
-      default="0"
-      icon=":icons/angle_down.png"
-      tooltip="Height">
-    </doublevalue>
-  </groupbox>
+      <shape_selector id="from_object"
+                      icon=":icons/plane.png"
+                      label="Plane face"
+                      tooltip="Select a planar face"
+                      shape_types="face"
+                      default="&lt;sketch&gt;">
+        <validator id="GeomValidators_Face" parameters="plane"/>
+      </shape_selector>
+      <doublevalue
+        id="from_size"
+        label="Size"
+        min="0"
+        step="1.0"
+        default="0"
+        icon=":icons/dimension_down.png"
+        tooltip="Height">
+      </doublevalue>
+    </groupbox>
+    <groupbox title="To">
+      <shape_selector id="to_object"
+                      icon=":icons/plane_inverted.png"
+                      label="Plane face"
+                      tooltip="Select a planar face"
+                      shape_types="face"
+                      default="&lt;sketch&gt;">
+        <validator id="GeomValidators_Face" parameters="plane"/>
+      </shape_selector>
+      <doublevalue
+        id="to_size"
+        label="Size"
+        min="0"
+        step="1.0"
+        default="0"
+        icon=":icons/dimension_up.png"
+        tooltip="Height">
+      </doublevalue>
+    </groupbox>
   </groupbox>
   <multi_selector id="main_objects"
     label="Cut from:"
     icon=":icons/cut_shape.png"
-    tooltip="Select a sketch face"
+    tooltip="Objects to Cut"
     type_choice="Solids">
   </multi_selector>
 </source>

diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml
index 312570f68c4ea0d9b6474f7aeab8652ebacd03df..be7733c07679e6d5fb55865e9f457604cbfbedca 100644 (file)
--- a/src/FeaturesPlugin/plugin-Features.xml
+++ b/src/FeaturesPlugin/plugin-Features.xml
@@ -15,13 +15,9 @@
       <feature id="Placement" title="Placement" tooltip="Perform moving of an object to specified position" icon=":icons/placement.png">
           <source path="placement_widget.xml"/>
       </feature>
-      <feature id="Rotation" title="Rotation" tooltip="Perform rotation of an objects around the axis to specified angle" icon=":icons/rotation.png">
-        <source path="rotation_widget.xml"/>
-      </feature>
-      <!--Modification for specification of 1.3.0
-      <feature id="ExtrusionCut" title="RevolutionCut" tooltip="" icon=":icons/placement.png">
+      <feature id="ExtrusionCut" title="ExtrusionCut" tooltip="" icon=":icons/placement.png">
         <source path="extrusioncut_widget.xml"/>
-      </feature>-->
+      </feature>
     </group>
     <group id="Collections">
       <feature id="Group"

diff --git a/src/PartSet/icons/extrusion_cut.png b/src/PartSet/icons/extrusion_cut.png
new file mode 100644 (file)
index 0000000..604db63
Binary files /dev/null and b/src/PartSet/icons/extrusion_cut.png differ