From c65acde5d945c7092bd3d48937b88bdb6e76cc08 Mon Sep 17 00:00:00 2001
From: dbv <dbv@opencascade.com>
Date: Wed, 2 Sep 2015 11:57:23 +0300
Subject: [PATCH] Improvement #615: Widgets position in Extrusion and Rotation
 features must be changed.

---
 src/FeaturesPlugin/extrusion_widget.xml      | 59 +++++++-------
 src/FeaturesPlugin/extrusioncut_widget.xml   | 36 ++++-----
 src/FeaturesPlugin/extrusionfuse_widget.xml  | 36 ++++-----
 src/FeaturesPlugin/revolution_widget.xml     | 81 ++++++++++++--------
 src/FeaturesPlugin/revolutioncut_widget.xml  | 60 ++++++++-------
 src/FeaturesPlugin/revolutionfuse_widget.xml | 60 ++++++++-------
 6 files changed, 185 insertions(+), 147 deletions(-)

diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml
index 4098595da..a21ebedb1 100644
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -1,40 +1,47 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
-  <multi_selector id="base"
-    label="Select a sketch face"
-    icon=":icons/sketch.png"
-    tooltip="Select a sketch face"
-    type_choice="Faces">
-    <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
-  </multi_selector>
   <toolbox id="CreationMethod">
     <box id="BySizes" title="By sizes" icon=":icons/dimension_up_down_32x32.png">
+      <multi_selector id="base"
+        label="Select a sketch face"
+        icon=":icons/sketch.png"
+        tooltip="Select a sketch face"
+        type_choice="Faces">
+        <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
+      </multi_selector>
       <groupbox>
         <doublevalue
-          id="to_size"
+          id="from_size"
           label="Size"
           step="1.0"
-          default="10"
-          icon=":icons/dimension_up.png"
-          tooltip="To size">
+          default="0"
+          icon=":icons/dimension_down.png"
+          tooltip="From size">
         </doublevalue>
       </groupbox>
       <groupbox>
         <doublevalue
-          id="from_size"
+          id="to_size"
           label="Size"
           step="1.0"
-          default="0"
-          icon=":icons/dimension_down.png"
-          tooltip="From size">
+          default="10"
+          icon=":icons/dimension_up.png"
+          tooltip="To size">
         </doublevalue>
       </groupbox>
     </box>
     <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-      <groupbox title="To">
-        <shape_selector id="to_object"
-                        icon=":icons/plane_inverted.png"
+      <multi_selector id="base"
+        label="Select a sketch face"
+        icon=":icons/sketch.png"
+        tooltip="Select a sketch face"
+        type_choice="Faces">
+        <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
+      </multi_selector>
+      <groupbox title="From">
+        <shape_selector id="from_object"
+                        icon=":icons/plane.png"
                         label="Plane face"
                         tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
@@ -42,17 +49,17 @@
           <validator id="GeomValidators_Face" parameters="plane"/>
         </shape_selector>
         <doublevalue
-          id="to_offset"
+          id="from_offset"
           label="Offset"
           step="1.0"
           default="0"
-          icon=":icons/dimension_up.png"
+          icon=":icons/dimension_down.png"
           tooltip="Offset for bounding plane">
         </doublevalue>
       </groupbox>
-      <groupbox title="From">
-        <shape_selector id="from_object"
-                        icon=":icons/plane.png"
+      <groupbox title="To">
+        <shape_selector id="to_object"
+                        icon=":icons/plane_inverted.png"
                         label="Plane face"
                         tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
@@ -60,15 +67,15 @@
           <validator id="GeomValidators_Face" parameters="plane"/>
         </shape_selector>
         <doublevalue
-          id="from_offset"
+          id="to_offset"
           label="Offset"
           step="1.0"
           default="0"
-          icon=":icons/dimension_down.png"
+          icon=":icons/dimension_up.png"
           tooltip="Offset for bounding plane">
         </doublevalue>
       </groupbox>
-    </box>    
+    </box>
   </toolbox>
   <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/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml
index e53323344..fbfb40f5f 100755
--- a/src/FeaturesPlugin/extrusioncut_widget.xml
+++ b/src/FeaturesPlugin/extrusioncut_widget.xml
@@ -11,53 +11,53 @@
       <box id="BySizes" title="By sizes" icon=":icons/dimension_up_down_32x32.png">
         <groupbox>
           <doublevalue
-            id="to_size"
+            id="from_size"
             label="Size"
             step="1.0"
-            default="0"
-            icon=":icons/dimension_up.png"
-            tooltip="To size">
+            default="10"
+            icon=":icons/dimension_down.png"
+            tooltip="From size">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="from_size"
+            id="to_size"
             label="Size"
             step="1.0"
-            default="10"
-            icon=":icons/dimension_down.png"
-            tooltip="From size">
+            default="0"
+            icon=":icons/dimension_up.png"
+            tooltip="To size">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <groupbox title="To">
-          <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+        <groupbox title="From">
+          <shape_selector id="from_object"
+                          icon=":icons/plane.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
                           default="&lt;base sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue  id="to_offset"
+          <doublevalue id="from_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_up.png"
+            icon=":icons/dimension_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
-        <groupbox title="From">
-          <shape_selector id="from_object"
-                          icon=":icons/plane.png"
+        <groupbox title="To">
+          <shape_selector id="to_object"
+                          icon=":icons/plane_inverted.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
                           default="&lt;base sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue id="from_offset"
+          <doublevalue  id="to_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_down.png"
+            icon=":icons/dimension_up.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
diff --git a/src/FeaturesPlugin/extrusionfuse_widget.xml b/src/FeaturesPlugin/extrusionfuse_widget.xml
index d68c2d101..d1805d94f 100644
--- a/src/FeaturesPlugin/extrusionfuse_widget.xml
+++ b/src/FeaturesPlugin/extrusionfuse_widget.xml
@@ -11,53 +11,53 @@
       <box id="BySizes" title="By sizes" icon=":icons/dimension_up_down_32x32.png">
         <groupbox>
           <doublevalue
-            id="to_size"
+            id="from_size"
             label="Size"
             step="1.0"
-            default="10"
-            icon=":icons/dimension_up.png"
-            tooltip="To size">
+            default="0"
+            icon=":icons/dimension_down.png"
+            tooltip="From size">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="from_size"
+            id="to_size"
             label="Size"
             step="1.0"
-            default="0"
-            icon=":icons/dimension_down.png"
-            tooltip="From size">
+            default="10"
+            icon=":icons/dimension_up.png"
+            tooltip="To size">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <groupbox title="To">
-          <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+        <groupbox title="From">
+          <shape_selector id="from_object"
+                          icon=":icons/plane.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
                           default="&lt;base sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue  id="to_offset"
+          <doublevalue id="from_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_up.png"
+            icon=":icons/dimension_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
-        <groupbox title="From">
-          <shape_selector id="from_object"
-                          icon=":icons/plane.png"
+        <groupbox title="To">
+          <shape_selector id="to_object"
+                          icon=":icons/plane_inverted.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
                           default="&lt;base sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue id="from_offset"
+          <doublevalue  id="to_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_down.png"
+            icon=":icons/dimension_up.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
diff --git a/src/FeaturesPlugin/revolution_widget.xml b/src/FeaturesPlugin/revolution_widget.xml
index fe97f392a..acece541a 100644
--- a/src/FeaturesPlugin/revolution_widget.xml
+++ b/src/FeaturesPlugin/revolution_widget.xml
@@ -1,48 +1,63 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
-  <multi_selector id="base"
-    label="Select a sketch face"
-    icon=":icons/sketch.png"
-    tooltip="Select a sketch face"
-    type_choice="Faces">
-    <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
-  </multi_selector>
-  <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>
   <toolbox id="CreationMethod">
     <box id="ByAngles" title="By angles" icon=":icons/angle_up_down_32x32.png">
+      <multi_selector id="base"
+        label="Select a sketch face"
+        icon=":icons/sketch.png"
+        tooltip="Select a sketch face"
+        type_choice="Faces">
+        <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
+      </multi_selector>
+      <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>
       <groupbox>
         <doublevalue
-          id="to_angle"
+          id="from_angle"
           label="Angle"
           step="1.0"
-          default="360"
-          icon=":icons/angle_up.png"
-          tooltip="To angle">
+          default="0"
+          icon=":icons/angle_down.png"
+          tooltip="From angle">
         </doublevalue>
       </groupbox>
       <groupbox>
         <doublevalue
-          id="from_angle"
+          id="to_angle"
           label="Angle"
           step="1.0"
-          default="0"
-          icon=":icons/angle_down.png"
-          tooltip="From angle">
+          default="360"
+          icon=":icons/angle_up.png"
+          tooltip="To angle">
         </doublevalue>
       </groupbox>
     </box>
     <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-      <groupbox title="To">
-        <shape_selector id="to_object"
-                        icon=":icons/plane_inverted.png"
+      <multi_selector id="base"
+        label="Select a sketch face"
+        icon=":icons/sketch.png"
+        tooltip="Select a sketch face"
+        type_choice="Faces">
+        <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
+      </multi_selector>
+      <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>
+      <groupbox title="From">
+        <shape_selector id="from_object"
+                        icon=":icons/plane.png"
                         label="Plane face"
                         tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
@@ -50,17 +65,17 @@
           <validator id="GeomValidators_Face" parameters="plane"/>
         </shape_selector>
         <doublevalue
-          id="to_offset"
+          id="from_offset"
           label="Offset"
           step="1.0"
           default="0"
-          icon=":icons/angle_up.png"
+          icon=":icons/angle_down.png"
           tooltip="Offset for bounding plane">
         </doublevalue>
       </groupbox>
-      <groupbox title="From">
-        <shape_selector id="from_object"
-                        icon=":icons/plane.png"
+      <groupbox title="To">
+        <shape_selector id="to_object"
+                        icon=":icons/plane_inverted.png"
                         label="Plane face"
                         tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
@@ -68,11 +83,11 @@
           <validator id="GeomValidators_Face" parameters="plane"/>
         </shape_selector>
         <doublevalue
-          id="from_offset"
+          id="to_offset"
           label="Offset"
           step="1.0"
           default="0"
-          icon=":icons/angle_down.png"
+          icon=":icons/angle_up.png"
           tooltip="Offset for bounding plane">
         </doublevalue>
       </groupbox>
diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index fc9bd6ad0..6a9bc063e 100644
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -7,65 +7,73 @@
       icon=":icons/sketch.png"
       tooltip="Create or edit a sketch">
     </sketch_launcher>
-    <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>
     <toolbox id="CreationMethod">
       <box id="ByAngles" title="By angles" icon=":icons/angle_up_down_32x32.png">
+        <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>
         <groupbox>
           <doublevalue
-            id="to_angle"
+            id="from_angle"
             label="Angle"
             step="1.0"
-            default="0"
-            icon=":icons/angle_up.png"
-            tooltip="To angle">
+            default="10"
+            icon=":icons/angle_down.png"
+            tooltip="From angle">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="from_angle"
+            id="to_angle"
             label="Angle"
             step="1.0"
-            default="10"
-            icon=":icons/angle_down.png"
-            tooltip="From angle">
+            default="0"
+            icon=":icons/angle_up.png"
+            tooltip="To angle">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <groupbox title="To">
-          <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+        <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>
+        <groupbox title="From">
+          <shape_selector id="from_object"
+                          icon=":icons/plane.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
                           default="&lt;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue  id="to_offset" label="Offset"
+          <doublevalue id="from_offset" label="Offset"
             step="1.0" default="0"
-            icon=":icons/angle_up.png"
+            icon=":icons/angle_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
-        <groupbox title="From">
-          <shape_selector id="from_object"
-                          icon=":icons/plane.png"
+        <groupbox title="To">
+          <shape_selector id="to_object"
+                          icon=":icons/plane_inverted.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
                           default="&lt;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue id="from_offset" label="Offset"
+          <doublevalue  id="to_offset" label="Offset"
             step="1.0" default="0"
-            icon=":icons/angle_down.png"
+            icon=":icons/angle_up.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml
index 472a60dd0..d211d9b56 100644
--- a/src/FeaturesPlugin/revolutionfuse_widget.xml
+++ b/src/FeaturesPlugin/revolutionfuse_widget.xml
@@ -7,65 +7,73 @@
       icon=":icons/sketch.png"
       tooltip="Create or edit a sketch">
     </sketch_launcher>
-    <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>
     <toolbox id="CreationMethod">
       <box id="ByAngles" title="By angles" icon=":icons/angle_up_down_32x32.png">
+        <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>
         <groupbox>
           <doublevalue
-            id="to_angle"
+            id="from_angle"
             label="Angle"
             step="1.0"
-            default="10"
-            icon=":icons/angle_up.png"
-            tooltip="To angle">
+            default="0"
+            icon=":icons/angle_down.png"
+            tooltip="From angle">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="from_angle"
+            id="to_angle"
             label="Angle"
             step="1.0"
-            default="0"
-            icon=":icons/angle_down.png"
-            tooltip="From angle">
+            default="10"
+            icon=":icons/angle_up.png"
+            tooltip="To angle">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <groupbox title="To">
-          <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+        <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>
+        <groupbox title="From">
+          <shape_selector id="from_object"
+                          icon=":icons/plane.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
                           default="&lt;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue  id="to_offset" label="Offset"
+          <doublevalue id="from_offset" label="Offset"
             step="1.0" default="0"
-            icon=":icons/angle_up.png"
+            icon=":icons/angle_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
-        <groupbox title="From">
-          <shape_selector id="from_object"
-                          icon=":icons/plane.png"
+        <groupbox title="To">
+          <shape_selector id="to_object"
+                          icon=":icons/plane_inverted.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
                           default="&lt;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue id="from_offset" label="Offset"
+          <doublevalue  id="to_offset" label="Offset"
             step="1.0" default="0"
-            icon=":icons/angle_down.png"
+            icon=":icons/angle_up.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
-- 
2.39.2