Some improvements in GUI

[modules/shaper.git] / src / ConstructionPlugin / point_widget.xml

diff --git a/src/ConstructionPlugin/point_widget.xml b/src/ConstructionPlugin/point_widget.xml
index 42368daf2b48b2c4519ebafa3b4279f7b6baadb8..8fb77b2a7388f853d96339bd51cdc3aff3895d17 100644 (file)
--- a/src/ConstructionPlugin/point_widget.xml
+++ b/src/ConstructionPlugin/point_widget.xml
@@ -20,11 +20,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 -->
 
 <source>
-  <doublevalue id="x" label="X " tooltip="X coordinate" default="0"/>
-  <doublevalue id="y" label="Y " tooltip="Y coordinate" default="0"/>
-  <doublevalue id="z" label="Z " tooltip="Z coordinate" default="0"/>
-
-  <!--<toolbox id="creation_method">
+  <toolbox id="creation_method">
     <box id="by_xyz"
          title="By X, Y, Z"
          tooltip="Point at a given distance from the origin."
@@ -56,40 +52,73 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
                       shape_types="edge">
         <validator id="GeomValidators_Finite"/>
       </shape_selector>
-      <groupbox title="Distance">
-        <doublevalue id="value"
-                     label="Value"
-                     tooltip="Distance value."
-                     icon="icons/Construction/distance_value.png"
-                     default="50"/>
-        <boolvalue id="percent"
-                   label="Percent(%)"
-                   tooltip="Distance in percent from length."
-                   default="true"/>
-      </groupbox>
+      <radiobox id="offset_type">
+        <radio id="offset_type_by_distance"
+             title="Distance on edge by value"
+             tooltip="Point on an edge, at a given distance specified by value."
+             icon="icons/Construction/point_by_distance_on_edge_24x24.png">
+          <doublevalue id="distance"
+             label="Distance"
+             tooltip="Distance value."
+             min="0.0"
+             default="10">
+          </doublevalue>
+        </radio>
+        <radio id="offset_type_by_ratio"
+             title="Distance on edge by ratio"
+             tooltip="Point on an edge, at a given distance specified by ratio."
+             icon="icons/Construction/point_by_ratio_on_edge_24x24.png">
+          <doublevalue id="ratio"
+             label="Ratio"
+             tooltip="Ratio value."
+             min="0.0"
+             max="1.0"
+             default="0.5">
+          </doublevalue>
+        </radio>
+      </radiobox>
       <boolvalue id="reverse"
            label="Reverse"
            tooltip="Distance from edge end point."
            default="false"/>
     </box>
     <box id="by_projection"
-         title="By projection"
-         tooltip="Point on face surface by projection selected point."
+         title="By projection on edge or plane"
+         tooltip="Point on edge or plane by projection selected point."
          icon="icons/Construction/point_by_projection_32x32.png">
-      <shape_selector id="point"
+      <shape_selector id="point_to_project"
                       label="Point"
                       tooltip="Point for projection."
                       icon="icons/Construction/point.png"
                       shape_types="vertex">
       </shape_selector>
-      <shape_selector id="plane"
-                      label="Plane"
-                      tooltip="Plane for projection."
-                      icon="icons/Construction/face.png"
-                      shape_types="face">
-        <validator id="GeomValidators_Face" parameters="plane"/>
-      </shape_selector>
+      <toolbox id="projection_type">
+        <box id="projection_type_on_edge"
+             title="By projection on edge"
+             tooltip="Point on edge by projection selected point."
+             icon="icons/Construction/point_by_projection_on_edge_24x24.png">
+          <shape_selector id="edge_for_point_projection"
+                          label="edge"
+                          tooltip="Edge for projection."
+                          icon="icons/Construction/edge.png"
+                          shape_types="edge">
+          </shape_selector>
+        </box>
+        <box id="projection_type_on_face"
+             title="By projection on face"
+             tooltip="Point on face surface by projection selected point."
+             icon="icons/Construction/point_by_projection_on_face_24x24.png">
+          <shape_selector id="face_for_point_projection"
+                          label="face"
+                          tooltip="Face for projection."
+                          icon="icons/Construction/face.png"
+                          shape_types="face">
+            <validator id="GeomValidators_Face" parameters="plane"/>
+          </shape_selector>
+        </box>
+      </toolbox>
     </box>
+<!--
     <box id="by_lines_intersection"
          title="By two lines intersection"
          tooltip="Point by intersection of two coplanar lines."
@@ -111,6 +140,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         <validator id="ConstructionPlugin_ValidatorPointLines" parameters="first_line"/>
       </shape_selector>
     </box>
+-->
     <box id="by_line_and_plane_intersection"
          title="By line and plane intersection"
          tooltip="Point by intersection of line and plane."
@@ -120,8 +150,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
                       tooltip="Line for intersection."
                       icon="icons/Construction/edge.png"
                       shape_types="edge">
-        <validator id="GeomValidators_ShapeType" parameters="line"/>
-        <validator id="ConstructionPlugin_ValidatorPointLineAndPlaneNotParallel" parameters="intersection_plane"/>
+        <validator id="ConstructionPlugin_ValidatorPointEdgeAndPlaneNotParallel" parameters="intersection_plane"/>
       </shape_selector>
       <shape_selector id="intersection_plane"
                       label="Plane"
@@ -129,9 +158,13 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
                       icon="icons/Construction/face.png"
                       shape_types="face">
         <validator id="GeomValidators_Face" parameters="plane"/>
-        <validator id="ConstructionPlugin_ValidatorPointLineAndPlaneNotParallel" parameters="intersection_line"/>
+        <validator id="ConstructionPlugin_ValidatorPointEdgeAndPlaneNotParallel" parameters="intersection_line"/>
       </shape_selector>
+      <optionalbox id="use_offset" title="Offset from the plane">
+        <doublevalue id="offset" label="Distance " tooltip="Distance from the plane" min="0" default="0"/>
+        <boolvalue id="reverse_offset" label="Reverse" tooltip="Reverse offset value" default="false"/>
+      </optionalbox>
     </box>
 
-  </toolbox>-->
+  </toolbox>
 </source>