<!-- SketchPoint -->
<feature id="SketchPoint" title="Point" tooltip="Create point" icon="icons/Sketch/point.png">
- <sketch-2dpoint_selector id="PointCoordindates" accept_expressions="0" title="Point" tooltip="Point coordinates"
+ <sketch-2dpoint_selector id="PointCoordinates" accept_expressions="0" title="Point" tooltip="Point coordinates"
enable_value="enable_by_preferences"/>
<boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
</feature>
icon="icons/Sketch/circle.png"
title="Circle"
tooltip="Create circle">
- <toolbox id="circle_type" modified_in_edit="false">
+ <toolbox id="circle_type" modified_in_edit="edit_circle_type">
<box id="circle_type_by_center_and_passed_points"
icon="icons/Sketch/circle_pt_rad_32x32.png"
title="Center and passed points">
accept_expressions="0"
enable_value="enable_by_preferences">
<validator id="SketchPlugin_DifferentReference" parameters="first_point_ref,second_point_ref,third_point_ref"/>
- <validator id="SketchPlugin_ThirdPointValidator"/>
+ <validator id="SketchPlugin_ThirdPointValidator" parameters="third_point_ref"/>
</sketch-2dpoint_selector>
<validator id="GeomValidators_Different" parameters="first_point_ref,second_point_ref,third_point_ref"/>
</box>
</feature>
<!-- SketchArc -->
- <feature
- id="SketchArc"
- title="Arc"
- tooltip="Create arc"
- icon="icons/Sketch/arc.png">
- <toolbox id="ArcType">
- <box id="CenterStartEnd" title="Center and two points" icon="icons/Sketch/arc_base_32x32.png">
- <sketch-2dpoint_selector id="ArcCenter" accept_expressions="0" title="Center" tooltip="Center of a circle"
- enable_value="enable_by_preferences" reference_attribute="ArcCenterRef" />
- <!--reference_attribute="ArcCenterRef" />-->
- <sketch-2dpoint_selector id="ArcStartPoint" accept_expressions="0" title="Start point" tooltip="Start point"
- enable_value="enable_by_preferences"/>
- <sketch-2dpoint_selector id="ArcEndPoint" accept_expressions="0" title="End point" tooltip="End point"
- enable_value="enable_by_preferences"/>
- <validator id="GeomValidators_Different" parameters="ArcCenter,ArcStartPoint,ArcEndPoint"/>
- </box>
- <box id="ThreePoints" title="Three points on arc" icon="icons/Sketch/arc_3pt_32x32.png">
- <sketch-2dpoint_selector id="ArcStartPoint" accept_expressions="0" title="Start point" tooltip="Start point"
- enable_value="enable_by_preferences"/>
- <sketch-2dpoint_selector id="ArcEndPoint" accept_expressions="0" title="End point" tooltip="End point"
- enable_value="enable_by_preferences"/>
- <sketch-2dpoint_selector id="ArcPassedPoint" accept_expressions="0" title="Passed point" tooltip="Passed point"
- enable_value="enable_by_preferences"/>
- <validator id="GeomValidators_Different" parameters="ArcStartPoint,ArcEndPoint,ArcPassedPoint"/>
- </box>
- <box id="Tangent" title="Tangent with edge" icon="icons/Sketch/arc_tang_32x32.png">
- <sketch_shape_selector id="ArcTangentPoint" label="Tangent point" tooltip="Select point on line" shape_types="vertex">
- <validator id="SketchPlugin_ArcTangentPoint" parameters="" />
- </sketch_shape_selector>
- <sketch-2dpoint_selector id="ArcEndPoint" accept_expressions="0" title="End point" tooltip="End point"
- enable_value="enable_by_preferences"/>
- </box>
- </toolbox>
- <labelvalue id="ArcRadius" accept_expressions="0" label="Radius:" default="computed" icon="icons/Sketch/radius.png"
- tooltip="Set radius" obligatory="0" enable_value="enable_by_preferences">
- <validator id="GeomValidators_Positive"/>
+ <feature id="SketchArc"
+ icon="icons/Sketch/arc.png"
+ title="Arc"
+ tooltip="Create arc"
+ internal="1">
+ <sketch-2dpoint_selector id="center_point"
+ title="Center"
+ tooltip="Center of a circle"
+ accept_expressions="0"
+ enable_value="enable_by_preferences"/>
+ <sketch-2dpoint_selector id="start_point"
+ title="Start point"
+ tooltip="Start point"
+ accept_expressions="0"
+ enable_value="enable_by_preferences"/>
+ <sketch-2dpoint_selector id="end_point"
+ title="End point"
+ tooltip="End point"
+ accept_expressions="0"
+ enable_value="enable_by_preferences"/>
+ <validator id="GeomValidators_Different" parameters="center_point,start_point,end_point"/>
+ <labelvalue id="radius"
+ icon="icons/Sketch/radius.png"
+ label="Radius:"
+ tooltip="Set radius"
+ accept_expressions="0"
+ min="0"
+ default="0"
+ obligatory="0"
+ enable_value="enable_by_preferences">
</labelvalue>
- <labelvalue id="ArcAngle" label="Angle:" icon="icons/Sketch/angle.png" tooltip="Set angle" default="90" use_reset="false" obligatory="0"
- enable_value="enable_by_preferences"/>
- <boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
+ <labelvalue id="angle"
+ icon="icons/Sketch/angle.png"
+ label="Angle:"
+ tooltip="Set angle"
+ default="0"
+ use_reset="false"
+ obligatory="0"
+ enable_value="enable_by_preferences"/>
+ <boolvalue id="Auxiliary"
+ label="Auxiliary"
+ tooltip="Construction element"
+ default="false"
+ obligatory="0"/>
</feature>
<!-- SketchMacroArc -->
title="Arc"
tooltip="Create arc"
icon="icons/Sketch/arc.png">
- <toolbox id="arc_type">
+ <toolbox id="arc_type" modified_in_edit="edit_arc_type">
<box id="by_center_and_points"
icon="icons/Sketch/arc_base_32x32.png"
title="Center and two points">
title="End point"
tooltip="End point"
accept_expressions="0"
- enable_value="enable_by_preferences"/>
+ enable_value="enable_by_preferences">
+ <validator id="SketchPlugin_ArcEndPointValidator" parameters="end_point_ref"/>
+ <validator id="SketchPlugin_ArcEndPointIntersectionValidator" parameters="end_point_ref"/>
+ </sketch-2dpoint_selector>
<validator id="GeomValidators_Different" parameters="center_point,start_point_1,end_point_1"/>
</box>
<box id="by_three_points"
title="End point"
tooltip="End point"
accept_expressions="0"
- enable_value="enable_by_preferences"/>
+ enable_value="enable_by_preferences">
+ <validator id="SketchPlugin_DifferentReference" parameters="start_point_ref,end_point_ref"/>
+ </sketch-2dpoint_selector>
<sketch-2dpoint_selector id="passed_point"
reference_attribute="passed_point_ref"
title="Passed point"
tooltip="Passed point"
accept_expressions="0"
- enable_value="enable_by_preferences"/>
+ enable_value="enable_by_preferences">
+ <validator id="SketchPlugin_DifferentReference" parameters="start_point_ref,end_point_ref,passed_point_ref"/>
+ <validator id="SketchPlugin_ThirdPointValidator" parameters="passed_point_ref"/>
+ </sketch-2dpoint_selector>
<validator id="GeomValidators_Different" parameters="start_point_2,end_point_2,passed_point"/>
</box>
<box id="by_tangent_edge"
label="Tangent point"
tooltip="Select point on line"
shape_types="vertex">
- <!--<validator id="SketchPlugin_ArcTangentPoint"/>-->
+ <validator id="SketchPlugin_ArcTangentPoint"/>
</sketch_shape_selector>
<sketch-2dpoint_selector id="end_point_3"
reference_attribute="end_point_ref"
title="End point"
tooltip="End point"
accept_expressions="0"
- enable_value="enable_by_preferences"/>
+ enable_value="enable_by_preferences">
+ <validator id="SketchPlugin_ArcEndPointValidator" parameters="end_point_ref"/>
+ </sketch-2dpoint_selector>
</box>
</toolbox>
<labelvalue id="radius"
icon="icons/Sketch/split.png">
<sketch_sub_shape_selector
id="ConstraintValue"
- label="Split feature"
- tooltip="Select feature for split"
+ label="Segment"
+ tooltip="Select segment for split"
shape_types="edge"
use_external="false"
use_graphic_intersection="false">
icon="icons/Sketch/trim.png">
<sketch_feature_point_selector
id="SelectedObject"
- label="Split feature"
- tooltip="Select feature for split"
+ label="Segment"
+ tooltip="Select segment for trim"
shape_types="edge"
use_external="false"
use_graphic_intersection="true">