<!--icon=":pictures/x_point.png"-->
</feature>
<feature id="SketchPoint" title="Point" tooltip="Create point" icon=":icons/point.png">
- <sketch-2dpoint_selector id="PointCoordindates" title="Point" tooltip="Point coordinates"/>
+ <sketch-2dpoint_selector id="PointCoordindates" accept_expressions="0" title="Point" tooltip="Point coordinates"/>
<boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
</feature>
<feature id="SketchLine" title="Line" tooltip="Create line" icon=":icons/line.png">
- <sketch-2dpoint_selector id="StartPoint" title="Start point" tooltip="Start point coordinates" previous_feature_param="EndPoint"/>
- <sketch-2dpoint_selector id="EndPoint" title="End point" tooltip="End point coordinates"/>
+ <sketch-2dpoint_selector id="StartPoint" accept_expressions="0" title="Start point" tooltip="Start point coordinates" previous_feature_param="EndPoint"/>
+ <sketch-2dpoint_selector id="EndPoint" accept_expressions="0" title="End point" tooltip="End point coordinates"/>
<boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
<validator id="GeomValidators_Different" parameters="StartPoint,EndPoint"/>
</feature>
<feature id="SketchCircle" title="Circle" tooltip="Create circle" icon=":icons/circle.png">
- <sketch-2dpoint_selector id="CircleCenter" title="Center" tooltip="Center coordinates"/>
- <point2ddistance id="CircleRadius" first_point="CircleCenter" label="Radius:" min="0" step="1.0" default="0" icon=":icons/radius.png" tooltip="Set radius">
+ <sketch-2dpoint_selector id="CircleCenter" accept_expressions="0" title="Center" tooltip="Center coordinates"/>
+ <point2ddistance id="CircleRadius" accept_expressions="0" first_point="CircleCenter" label="Radius:" min="0" step="1.0" default="0" icon=":icons/radius.png" tooltip="Set radius">
<validator id="GeomValidators_Positive"/>
</point2ddistance>
<boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
</feature>
<feature id="SketchArc" title="Arc" tooltip="Create arc" icon=":icons/arc.png">
- <sketch-2dpoint_selector id="ArcCenter" title="Center" tooltip="Center of a circle"/>
- <sketch-2dpoint_selector id="ArcStartPoint" title="Start point" tooltip="Start point"/>
- <sketch-2dpoint_selector id="ArcEndPoint" title="End point" tooltip="End point"/>
+ <sketch-2dpoint_selector id="ArcCenter" accept_expressions="0" title="Center" tooltip="Center of a circle"/>
+ <sketch-2dpoint_selector id="ArcStartPoint" accept_expressions="0" title="Start point" tooltip="Start point"/>
+ <sketch-2dpoint_selector id="ArcEndPoint" accept_expressions="0" title="End point" tooltip="End point"/>
<boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
<validator id="GeomValidators_Different" parameters="ArcCenter,ArcStartPoint,ArcEndPoint"/>
</feature>
+ <!-- SketchConstraintFillet -->
+ <feature id="SketchConstraintFillet" title="Fillet" tooltip="Create constraint defining fillet between two objects" icon=":icons/fillet.png">
+ <sketch_shape_selector id="ConstraintEntityA"
+ label="Point" tooltip="Select point for fillet (should be shared by two entities only)" shape_types="vertex">
+ <validator id="SketchPlugin_FilletVertexValidator"/>
+ </sketch_shape_selector>
+ <doublevalue label="Radius" tooltip="Fillet arc radius" id="ConstraintValue" accept_expressions="0" min="0" default="1" use_reset="false">
+ <validator id="GeomValidators_Positive"/>
+ </doublevalue>
+ <validator id="PartSet_FilletSelection"/>
+ </feature>
</group>
<group id="Constraints">
<validator id="SketchPlugin_ExternalValidator" parameters="ConstraintEntityA"/>
<validator id="GeomValidators_ShapeType" parameters="vertex,line"/>
</sketch_shape_selector>
- <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" default="computed" internal="1" obligatory="0"/>
+ <sketch-2dpoint_flyout_selector id="ConstraintFlyoutValuePnt" default="computed" internal="1" obligatory="0"/>
<doublevalue_editor label="Value" tooltip="Distance" id="ConstraintValue" default="computed" min="0">
<validator id="GeomValidators_Positive"/>
<shape_selector id="ConstraintEntityA" label="Line" tooltip="Select an line" shape_types="edge" >
<validator id="GeomValidators_ShapeType" parameters="line"/>
</shape_selector>
- <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" default="computed" internal="1" obligatory="0"/>
+ <sketch-2dpoint_flyout_selector id="ConstraintFlyoutValuePnt" default="computed" internal="1" obligatory="0"/>
<doublevalue_editor label="Value" tooltip="Length" id="ConstraintValue" default="computed">
<validator id="GeomValidators_Positive"/>
</doublevalue_editor>
shape_types="edge">
<validator id="GeomValidators_ShapeType" parameters="circle"/>
</shape_selector>
- <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" default="computed" internal="1" obligatory="0"/>
+ <sketch-2dpoint_flyout_selector id="ConstraintFlyoutValuePnt" default="computed" internal="1" obligatory="0"/>
<doublevalue_editor label="Value" tooltip="Radius" id="ConstraintValue" default="computed">
<validator id="GeomValidators_Positive"/>
</doublevalue_editor>
<!-- SketchConstraintAngle -->
<feature id="SketchConstraintAngle" title="Angle" tooltip="Set fixed angle between two line segments" icon=":icons/angle_constr.png">
- <shape_selector id="ConstraintEntityA" label="Line" tooltip="Select an line" shape_types="edge" >
+ <shape_selector id="ConstraintEntityA" label="Line 1" tooltip="Select an line" shape_types="edge" >
<validator id="GeomValidators_ShapeType" parameters="line"/>
<validator id="PartSet_DifferentObjects"/>
<validator id="SketchPlugin_ExternalValidator" parameters="ConstraintEntityB"/>
</shape_selector>
- <shape_selector id="ConstraintEntityB" label="Line" tooltip="Select an line" shape_types="edge" >
+ <shape_selector id="ConstraintEntityB" label="Line 2" tooltip="Select an line" shape_types="edge" >
<validator id="GeomValidators_ShapeType" parameters="line"/>
<validator id="PartSet_DifferentObjects"/>
<validator id="SketchPlugin_ExternalValidator" parameters="ConstraintEntityA"/>
</shape_selector>
- <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" default="computed" internal="1" obligatory="0"/>
- <doublevalue_editor label="Value" tooltip="Angle" id="ConstraintValue" default="computed" />
+ <sketch-2dpoint_flyout_selector id="ConstraintFlyoutValuePnt" default="computed" internal="1" obligatory="0"/>
+ <doublevalue_editor label="Value" tooltip="Angle" id="ConstraintValue" default="computed" min="0" max="180" />
<validator id="PartSet_AngleSelection"/>
</feature>
<validator id="PartSet_DifferentObjects"/>
<validator id="SketchPlugin_ExternalValidator" parameters="ConstraintEntityA"/>
</sketch_shape_selector>
+ <validator id="PartSet_EqualSelection"/>
</feature>
<!-- SketchConstraintTangent -->
</group>
<group id="Edit">
- <!-- SketchConstraintFillet -->
- <feature id="SketchConstraintFillet" title="Fillet" tooltip="Create constraint defining fillet between two objects" icon=":icons/fillet.png">
- <sketch_shape_selector id="ConstraintEntityA"
- label="First object" tooltip="Select line or arc" shape_types="edge">
- <validator id="PartSet_DifferentObjects"/>
- <validator id="PartSet_CoincidentAttr" parameters="ConstraintEntityB"/>
- </sketch_shape_selector>
-
- <sketch_shape_selector id="ConstraintEntityB"
- label="Second object" tooltip="Select line or arc" shape_types="edge">
- <validator id="PartSet_DifferentObjects"/>
- <validator id="PartSet_CoincidentAttr" parameters="ConstraintEntityA"/>
- </sketch_shape_selector>
-
- <doublevalue label="Value" tooltip="Fillet radius" id="ConstraintValue" min="0" default="1" use_reset="false">
- <validator id="GeomValidators_Positive"/>
- </doublevalue>
- <validator id="PartSet_FilletSelection"/>
- </feature>
-
<!-- SketchConstraintMirror -->
<feature
id="SketchConstraintMirror"
use_external="true">
<validator id="SketchPlugin_CopyValidator" />
</sketch_multi_selector>
- <groupbox title="Direction">
- <sketch-2dpoint_selector
- id="MultiTranslationStartPoint"
- title="Start point"
- tooltip="Start point of translation"/>
- <sketch-2dpoint_selector
- id="MultiTranslationEndPoint"
- title="End point"
- tooltip="Final point of translation"/>
- </groupbox>
- <integervalue id="MultiTranslationCopies"
- label="Number of copies"
- tooltip="Number of copies"
- default="1" min="1" use_reset="false">
+ <toolbox id="ValueType">
+ <box id="SingleValue" title="Single value" icon=":icons/translate_32x32.png">
+ <groupbox title="Direction">
+ <sketch_shape_selector
+ id="MultiTranslationStartPoint"
+ label="Start point"
+ tooltip="Start point of translation"
+ shape_types="vertex">
+ <validator id="PartSet_DifferentObjects"/>
+ <validator id="GeomValidators_ShapeType" parameters="vertex"/>
+ </sketch_shape_selector>
+ <sketch_shape_selector
+ id="MultiTranslationEndPoint"
+ label="End point"
+ tooltip="Final point of translation"
+ shape_types="vertex">
+ <validator id="PartSet_DifferentObjects"/>
+ <validator id="GeomValidators_ShapeType" parameters="vertex"/>
+ </sketch_shape_selector>
+ </groupbox>
+ </box>
+ <box id="FullValue" title="Full value" icon=":icons/translate_full_32x32.png">
+ <groupbox title="Direction">
+ <sketch_shape_selector
+ id="MultiTranslationStartPoint"
+ label="Start point"
+ tooltip="Start point of translation"
+ shape_types="vertex">
+ <validator id="PartSet_DifferentObjects"/>
+ <validator id="GeomValidators_ShapeType" parameters="vertex"/>
+ </sketch_shape_selector>
+ <sketch_shape_selector
+ id="MultiTranslationEndPoint"
+ label="End point"
+ tooltip="Final point of translation"
+ shape_types="vertex">
+ <validator id="PartSet_DifferentObjects"/>
+ <validator id="GeomValidators_ShapeType" parameters="vertex"/>
+ </sketch_shape_selector>
+ </groupbox>
+ </box>
+ </toolbox>
+ <integervalue id="MultiTranslationObjects"
+ label="Total number of objects"
+ tooltip="Total number of objects"
+ default="2" min="2" use_reset="false">
<validator id="GeomValidators_Positive"/>
</integervalue>
</feature>
-
+
<!-- SketchMultiRotation -->
<feature
id="SketchMultiRotation"
use_external="true">
<validator id="SketchPlugin_CopyValidator" />
</sketch_multi_selector>
- <sketch-2dpoint_selector
- id="MultiRotationCenter"
- title="Center of rotation"
- tooltip="Center of rotation"/>
- <point2dangle id="MultiRotationAngle"
- first_point="MultiRotationCenter"
+ <sketch_shape_selector
+ id="MultiRotationCenter"
+ label="Center of rotation"
+ tooltip="Center of rotation"
+ shape_types="vertex">
+ <validator id="GeomValidators_ShapeType" parameters="vertex"/>
+ </sketch_shape_selector>
+ <toolbox id="AngleType">
+ <box id="SingleAngle" title="Single angle" icon=":icons/angle_up_32x32.png">
+ <doublevalue id="MultiRotationAngle"
+ label="Angle"
+ icon=":icons/angle.png"
+ tooltip="Rotation angle"
+ default="90" use_reset="false"/>
+ </box>
+ <box id="FullAngle" title="Full angle" icon=":icons/angle_up_full_32x32.png">
+ <doublevalue id="MultiRotationAngle"
label="Angle"
icon=":icons/angle.png"
tooltip="Rotation angle"
- default="90"/>
- <integervalue id="MultiRotationCopies"
- label="Number of copies"
- tooltip="Number of copies"
- default="1" min="1" use_reset="false">
+ default="90" use_reset="false"/>
+ </box>
+ </toolbox>
+ <integervalue id="MultiRotationObjects"
+ label="Total number of objects"
+ tooltip="Total number of objects"
+ default="2" min="2" use_reset="false">
<validator id="GeomValidators_Positive"/>
</integervalue>
</feature>
