0028313: Extend Draw functionality with some new useful commands and features

1) In Views menu the check button item "Extended view commands" has been added. Pressing on it shows/hides the set of buttons in the main window that allow manipulating of view zoom/pan/rotate by mouse. 2) New category of commands "Vector and measurement Commands" has been added. The commands in this category allow simple calculations using 2D and 3D vectors, such as cross and dot products, computation of distances of points to other objects, and other functions. 3) The new command "pickf" has been added in "DRAW Variables management" category. It allows extracting a picked with mouse face included in some shape as a new variable. 4) New commands "del" and "era" have been added in "DRAW Variables management" category. They allow deleting (destructing) or erasing (from view) variables matched by glob pattern. 5) Missing help for some commands like "don", "disp" and others has been added.
2025-04-03 17:56:21 +03:00 · 2017-02-02 15:57:58 +03:00 · 2017-02-02 15:57:58 +03:00 · 472634fa06
commit 472634fa06
parent 2b3e2b780d
11 changed files with 999 additions and 46 deletions
--- a/dox/user_guides/draw_test_harness/draw_test_harness.md
+++ b/dox/user_guides/draw_test_harness/draw_test_harness.md
@ -43,8 +43,9 @@ This documentation describes:
  * The graphical commands.
  * The Geometry set of commands.
  * The Topology set of commands.
-
-This document does not describe other sets of commands and does not explain how to extend Draw using C++. 
+  * OCAF commands.
+  * Data Exchange commands
+  * Shape Healing commands

 This document is a reference manual. It contains a full description of each command. All descriptions have the format illustrated below for the exit command. 

@ -325,6 +326,17 @@ puts ;x = [dval x], cos(x/pi) = [dval cos(x/pi)];

 **Note,** that in TCL, parentheses are not considered to be special characters. Do not forget to quote an expression if it contains spaces in order to avoid parsing different words. <i>(a + b)</i> is parsed as three words: <i>"(a + b)"</i> or <i>(a+b)</i> are correct.

+@subsubsection occt_draw_2_3_3 del, dall
+
+Syntax:      
+~~~~~
+del varname_pattern [varname_pattern ...] 
+dall
+~~~~~
+
+*del* command does the same thing as *unset*, but it deletes the variables matched by the pattern.
+
+*dall* command deletes all variables in the session.

@subsection occt_draw_2_4 lists

@ -698,21 +710,21 @@ Radius :5
 **Note** The behavior of *whatis* on other variables (not Draw) is not excellent. 


-@subsubsection occt_draw_3_2_3 rename, copy
+@subsubsection occt_draw_3_2_3 renamevar, copy

 Syntax:      
 ~~~~~
-rename varname tovarname [varname tovarname ...] 
+renamevar varname tovarname [varname tovarname ...] 
 copy varname tovarname [varname tovarname ...] 
 ~~~~~

-  * **rename** changes the name of a Draw variable. The original variable will no longer exist. Note that the content is not modified. Only the name is changed. 
+  * **renamevar** changes the name of a Draw variable. The original variable will no longer exist. Note that the content is not modified. Only the name is changed. 
  * **copy** creates a new variable with a copy of the content of an existing variable. The exact behavior of **copy** is type dependent; in the case of certain topological variables, the content may still be shared. 

 **Example:** 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
 circle c1 0 0 1 0 5 
-rename c1 c2 
+renamevar c1 c2 

 # curves are copied, c2 will not be modified 
 copy c2 c3 
@ -1180,7 +1192,7 @@ point . x y z
 # p0, p1, p2, .... 

 # give a name to a graphic object 
-rename . x 
+renamevar . x 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


@ -1255,6 +1267,13 @@ foreach var [directory c_*] {erase $var}
 2dclear 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+@subsubsection occt_draw_4_1_14_1 disp, don, era
+
+These commands have the same meaning as correspondingly display, donly and erase, but with the difference that they evaluate the arguments using glob pattern rules. For example, to display all objects with names d_1, d_2, d_3, etc. it is enouth to run the command:
+~~~~~{.cpp}
+disp d_*
+~~~~~
+
@subsubsection occt_draw_4_1_15 repaint, dflush


@ -5939,6 +5958,20 @@ Creates a vertex at either a 3d location x,y,z or the point at parameter p on an
 vertex v1 10 20 30 
 ~~~~~

+@subsubsection occt_draw_7_2_1a  mkpoint
+
+Syntax:
+~~~~~
+mkpoint name vertex
+~~~~~
+
+Creates a point from the coordinates of a given vertex.
+
+**Example:** 
+~~~~~
+mkpoint p v1
+~~~~~
+
@subsubsection occt_draw_7_2_2  edge, mkedge, uisoedge, visoedge

 Syntax:      
@ -9902,6 +9935,510 @@ vdrawsphere s 200 1 1 1 500 1
 ~~~~~


+@section occt_draw_12 Simple vector algebra and measurements
+
+This section contains description of auxiliary commands that can be useful for simple calculations and manipulations needed when analyzing complex models.
+
+@subsection occt_draw_12_1 Vector algebra commands
+
+This section describes commands providing simple calculations with 2D and 3D vectors. The vector is represented by a TCL list of double values (coordinates). The commands get input vector coordinates from the command line as distinct values. So, if you have a vector stored in a variable you need to use *eval* command as a prefix, for example, to compute the magnitude of cross products of two vectors given by 3 points the following commands can be used:
+~~~~~{.cpp}
+Draw[10]> set vec1 [vec 12 28 99 12 58 99]
+0 30 0
+Draw[13]> set vec2 [vec 12 28 99 16 21 89]
+4 -7 -10
+Draw[14]> set cross [eval cross $vec1 $vec2]
+-300 0 -120
+Draw[15]> eval module $cross
+323.10988842807024
+~~~~~
+
+@subsubsection occt_draw_12_1_1 vec
+
+Syntax:
+~~~~~
+vec <x1> <y1> <z1> <x2> <y2> <z2>
+~~~~~ 
+
+Returns coordinates of vector between two 3D points.
+
+Example:
+~~~~~{.cpp}
+vec 1 2 3 6 5 4
+~~~~~
+
+@subsubsection occt_draw_12_1_2 2dvec
+
+Syntax:
+~~~~~
+2dvec <x1> <y1> <x2> <y2>
+~~~~~ 
+
+Returns coordinates of vector between two 2D points.
+
+Example: 
+~~~~~{.cpp}
+2dvec 1 2 4 3
+~~~~~
+
+@subsubsection occt_draw_12_1_3 pln
+
+Syntax:
+~~~~~
+pln <x1> <y1> <z1> <x2> <y2> <z2> <x3> <y3> <z3>
+~~~~~ 
+
+Returns plane built on three points. A plane is represented by 6 double values: coordinates of the origin point and the normal directoin.
+
+Example: 
+~~~~~{.cpp}
+pln 1 2 3 6 5 4 9 8 7
+~~~~~
+
+@subsubsection occt_draw_12_1_4 module
+
+Syntax:
+~~~~~
+module <x> <y> <z>
+~~~~~ 
+
+Returns module of a vector.
+
+Example: 
+~~~~~{.cpp}
+module 1 2 3
+~~~~~
+
+@subsubsection occt_draw_12_1_5 2dmodule
+
+Syntax:
+~~~~~
+2dmodule <x> <y>
+~~~~~ 
+
+Returns module of a 2D vector.
+
+Example: 
+~~~~~{.cpp}
+2dmodule 1 2
+~~~~~
+
+@subsubsection occt_draw_12_1_6 norm
+
+Syntax:
+~~~~~
+norm <x> <y> <z>
+~~~~~ 
+
+Returns unified vector from a given 3D vector.
+
+Example: 
+~~~~~{.cpp}
+norm 1 2 3
+~~~~~
+
+@subsubsection occt_draw_12_1_7 2dnorm
+
+Syntax:
+~~~~~
+2dnorm <x> <y>
+~~~~~ 
+
+Returns unified vector from a given 2D vector.
+
+Example: 
+~~~~~{.cpp}
+2dnorm 1 2
+~~~~~
+
+@subsubsection occt_draw_12_1_8 inverse
+
+Syntax:
+~~~~~
+inverse <x> <y> <z>
+~~~~~ 
+
+Returns inversed 3D vector.
+
+Example: 
+~~~~~{.cpp}
+inverse 1 2 3
+~~~~~
+
+@subsubsection occt_draw_12_1_9 2dinverse
+
+Syntax:
+~~~~~
+2dinverse <x> <y>
+~~~~~ 
+
+Returns inversed 2D vector.
+
+Example: 
+~~~~~{.cpp}
+2dinverse 1 2
+~~~~~
+
+@subsubsection occt_draw_12_1_10 2dort
+
+Syntax:
+~~~~~
+2dort <x> <y>
+~~~~~ 
+
+Returns 2D vector rotated on 90 degrees.
+
+Example: 
+~~~~~{.cpp}
+2dort 1 2
+~~~~~
+
+@subsubsection occt_draw_12_1_11 distpp
+
+Syntax:
+~~~~~
+distpp <x1> <y1> <z1> <x2> <y2> <z2>
+~~~~~ 
+
+Returns distance between two 3D points.
+
+Example: 
+~~~~~{.cpp}
+distpp 1 2 3 4 5 6
+~~~~~
+
+@subsubsection occt_draw_12_1_12 2ddistpp
+
+Syntax:
+~~~~~
+2ddistpp <x1> <y1> <x2> <y2>
+~~~~~ 
+
+Returns distance between two 2D points.
+
+Example: 
+~~~~~{.cpp}
+2ddistpp 1 2 3 4
+~~~~~
+
+@subsubsection occt_draw_12_1_13 distplp
+
+Syntax:
+~~~~~
+distplp <x0> <y0> <z0> <nx> <ny> <nz> <xp> <yp> <zp>
+~~~~~ 
+
+Returns distance between plane defined by point and normal direction and another point.
+
+Example: 
+~~~~~{.cpp}
+distplp 0 0 0 0 0 1 5 6 7
+~~~~~
+
+@subsubsection occt_draw_12_1_14 distlp
+
+Syntax:
+~~~~~
+distlp <x0> <y0> <z0> <dx> <dy> <dz> <xp> <yp> <zp>
+~~~~~ 
+
+Returns distance between 3D line defined by point and direction and another point.
+
+Example: 
+~~~~~{.cpp}
+distlp 0 0 0 1 0 0 5 6 7
+~~~~~
+
+@subsubsection occt_draw_12_1_15 2ddistlp
+
+Syntax:
+~~~~~
+2ddistlp <x0> <y0> <dx> <dy> <xp> <yp>
+~~~~~ 
+
+Returns distance between 2D line defined by point and direction and another point.
+
+Example: 
+~~~~~{.cpp}
+2ddistlp 0 0 1 0 5 6
+~~~~~
+
+@subsubsection occt_draw_12_1_16 distppp
+
+Syntax:
+~~~~~
+distppp <x1> <y1> <z1> <x2> <y2> <z2> <x3> <y3> <z3>
+~~~~~ 
+
+Returns deviation of point (x2,y2,z2) from segment defined by points (x1,y1,z1) and (x3,y3,z3).
+
+Example: 
+~~~~~{.cpp}
+distppp 0 0 0 1 1 0 2 0 0
+~~~~~
+
+@subsubsection occt_draw_12_1_17 2ddistppp
+
+Syntax:
+~~~~~
+2ddistppp <x1> <y1> <x2> <y2> <x3> <y3>
+~~~~~ 
+
+Returns deviation of point (x2,y2) from segment defined by points (x1,y1) and (x3,y3). The result is a signed value. It is positive if the point (x2,y2) is on the left side of the segment, and negative otherwise.
+
+Example: 
+~~~~~{.cpp}
+2ddistppp 0 0 1 -1 2 0
+~~~~~
+
+@subsubsection occt_draw_12_1_18 barycen
+
+Syntax:
+~~~~~
+barycen <x1> <y1> <z1> <x2> <y2> <z2> <par>
+~~~~~ 
+
+Returns point of a given parameter between two 3D points.
+
+Example: 
+~~~~~{.cpp}
+barycen 0 0 0 1 1 1 0.3
+~~~~~
+
+@subsubsection occt_draw_12_1_19 2dbarycen
+
+Syntax:
+~~~~~
+2dbarycen <x1> <y1> <x2> <y2> <par>
+~~~~~ 
+
+Returns point of a given parameter between two 2D points.
+
+Example: 
+~~~~~{.cpp}
+2dbarycen 0 0 1 1 0.3
+~~~~~
+
+@subsubsection occt_draw_12_1_20 cross
+
+Syntax:
+~~~~~
+cross <x1> <y1> <z1> <x2> <y2> <z2>
+~~~~~ 
+
+Returns cross product of two 3D vectors.
+
+Example: 
+~~~~~{.cpp}
+cross 1 0 0 0 1 0
+~~~~~
+
+@subsubsection occt_draw_12_1_21 2dcross
+
+Syntax:
+~~~~~
+2dcross <x1> <y1> <x2> <y2>
+~~~~~ 
+
+Returns cross product of two 2D vectors.
+
+Example: 
+~~~~~{.cpp}
+2dcross 1 0 0 1
+~~~~~
+
+@subsubsection occt_draw_12_1_22 dot
+
+Syntax:
+~~~~~
+dot <x1> <y1> <z1> <x2> <y2> <z2>
+~~~~~ 
+
+Returns scalar product of two 3D vectors.
+
+Example: 
+~~~~~{.cpp}
+dot 1 0 0 0 1 0
+~~~~~
+
+@subsubsection occt_draw_12_1_23 2ddot
+
+Syntax:
+~~~~~
+2ddot <x1> <y1> <x2> <y2>
+~~~~~ 
+
+Returns scalar product of two 2D vectors.
+
+Example: 
+~~~~~{.cpp}
+2ddot 1 0 0 1
+~~~~~
+
+@subsubsection occt_draw_12_1_23 scale
+
+Syntax:
+~~~~~
+scale <x> <y> <z> <factor>
+~~~~~ 
+
+Returns 3D vector multiplied by scalar.
+
+Example: 
+~~~~~{.cpp}
+scale 1 0 0 5
+~~~~~
+
+@subsubsection occt_draw_12_1_24 2dscale
+
+Syntax:
+~~~~~
+2dscale <x> <y> <factor>
+~~~~~ 
+
+Returns 2D vector multiplied by scalar.
+
+Example: 
+~~~~~{.cpp}
+2dscale 1 0 5
+~~~~~
+
+@subsection occt_draw_12_2 Measurements commands
+
+This section describes commands that make possible to provide measurements on a model.
+
+@subsubsection occt_draw_12_2_1 pnt
+
+Syntax:
+~~~~~
+pnt <object>
+~~~~~ 
+
+Returns coordinates of point in the given Draw variable. Object can be of type point or vertex. Actually this command is built up from the commands @ref occt_draw_7_2_1a "mkpoint" and @ref occt_draw_6_6_1 "coord".
+
+Example: 
+~~~~~{.cpp}
+vertex v 0 1 0
+pnt v
+~~~~~
+
+@subsubsection occt_draw_12_2_2 pntc
+
+Syntax:
+~~~~~
+pntc <curv> <par>
+~~~~~ 
+
+Returns coordinates of point on 3D curve with given parameter. Actually this command is based on the command @ref occt_draw_6_6_2 "cvalue".
+
+Example: 
+~~~~~{.cpp}
+circle c 0 0 0 10
+pntc c [dval pi/2]
+~~~~~
+
+@subsubsection occt_draw_12_2_3 2dpntc
+
+Syntax:
+~~~~~
+2dpntc <curv2d> <par>
+~~~~~ 
+
+Returns coordinates of point on 2D curve with given parameter. Actually this command is based on the command @ref occt_draw_6_6_2 "2dcvalue".
+
+Example: 
+~~~~~{.cpp}
+circle c 0 0 10
+2dpntc c [dval pi/2]
+~~~~~
+
+@subsubsection occt_draw_12_2_4 pntsu
+
+Syntax:
+~~~~~
+pntsu <surf> <u> <v>
+~~~~~ 
+
+Returns coordinates of point on surface with given parameters. Actually this command is based on the command @ref occt_draw_6_6_3 "svalue".
+
+Example: 
+~~~~~{.cpp}
+cylinder s 10
+pntsu s [dval pi/2] 5
+~~~~~
+
+@subsubsection occt_draw_12_2_5 pntcons
+
+Syntax:
+~~~~~
+pntcons <curv2d> <surf> <par>
+~~~~~ 
+
+Returns coordinates of point on surface defined by point on 2D curve with given parameter. Actually this command is based on the commands @ref occt_draw_6_6_2 "2dcvalue" and @ref occt_draw_6_6_3 "svalue".
+
+Example: 
+~~~~~{.cpp}
+line c 0 0 1 0
+cylinder s 10
+pntcons c s [dval pi/2]
+~~~~~
+
+@subsubsection occt_draw_12_2_6 drseg
+
+Syntax:
+~~~~~
+drseg <name> <x1> <y1> <z1> <x2> <y2> <z2>
+~~~~~ 
+
+Creates a linear segment between two 3D points. The new object is given the *name*. The object is drawn in the axonometric view.
+
+Example: 
+~~~~~{.cpp}
+drseg s 0 0 0 1 0 0
+~~~~~
+
+@subsubsection occt_draw_12_2_7 2ddrseg
+
+Syntax:
+~~~~~
+2ddrseg <name> <x1> <y1> <x2> <y2>
+~~~~~ 
+
+Creates a linear segment between two 2D points. The new object is given the *name*. The object is drawn in the 2D view.
+
+Example: 
+~~~~~{.cpp}
+2ddrseg s 0 0 1 0
+~~~~~
+
+@subsubsection occt_draw_12_2_8 mpick
+
+Syntax:
+~~~~~
+mpick
+~~~~~ 
+
+Prints in the console the coordinates of a point clicked by mouse in a view (axonometric or 2D). This command will wait for mouse click event in a view.
+
+Example: 
+~~~~~{.cpp}
+mpick
+~~~~~
+
+@subsubsection occt_draw_12_2_9 mdist
+
+Syntax:
+~~~~~
+mdist
+~~~~~ 
+
+Prints in the console the distance between two points clicked by mouse in a view (axonometric or 2D). This command will wait for two mouse click events in a view.
+
+Example: 
+~~~~~{.cpp}
+mdist
+~~~~~
+
@section occt_draw_11 Extending Test Harness with custom commands


--- a/src/DrawResources/DrawDefault
+++ b/src/DrawResources/DrawDefault
@ -36,7 +36,8 @@ if { [info exists env(DRAWHOME) ] } {

 # load standard DRAW scripts
 if { [file isdirectory $dir] } { 
-  foreach script {StandardCommands.tcl Geometry.tcl StandardViews.tcl TestCommands.tcl CheckCommands.tcl} {
+  foreach script {StandardCommands.tcl Geometry.tcl StandardViews.tcl
+                  TestCommands.tcl CheckCommands.tcl Vector.tcl} {
    if [file exist [file join $dir $script]] {
      source [file join $dir $script]
    } else {
--- a/src/DrawResources/DrawTK.tcl
+++ b/src/DrawResources/DrawTK.tcl
@ -93,6 +93,11 @@ fillloadmenu

 # the view menu

+source [file join $dir Move.tcl]
+
+addmenuitem Views {checkbutton -label "Extended view commands" \
+    -command ShowHideExtCommands -variable ShowExtCommands -onvalue 1 -offvalue 0}
+addmenuitem Views   "separator"
 addmenu Views axo   {smallview AXON}
 addmenu Views top   {smallview +X+Y}
 addmenu Views front {smallview +X+Z}
--- a/src/DrawResources/Geometry.tcl
+++ b/src/DrawResources/Geometry.tcl
@ -58,6 +58,9 @@ proc smp {} {
 #################################################
 # smooth
 #################################################
+
+help smooth {smooth  cname tol [filename] } "DRAW Variables management"
+
 proc smooth {name tol {file ""}} {
    if {$file == ""} {
 	uplevel #0 "bsmooth $name $tol"
@ -68,11 +71,12 @@ proc smooth {name tol {file ""}} {
    return $name
 }

-help smooth {smooth  cname tol [filename] } "DRAW Variables management"
-
 #################################################
 # beziersmooth
 #################################################
+
+help beziersmooth { beziersmooth  cname tol deg [-GR -VA -PR] [filename] } "DRAW Variables management"
+
 proc beziersmooth {name tol deg option {file ""}} {
    if {$file == ""} {
 	uplevel #0 "bzsmooth $name $tol $deg $option"
@ -83,6 +87,10 @@ proc beziersmooth {name tol deg option {file ""}} {
    return $name
 }

-help beziersmooth { beziersmooth  cname tol deg [-GR -VA -PR] [filename] } "DRAW Variables management"
-
+help pickf {name : extract picked with mouse face as a new variable\
+} {DRAW Variables management}

+proc pickf {name} {
+    global $name
+    eval renamevar "[pickface]" $name
+}
--- a/src/DrawResources/Move.tcl
+++ b/src/DrawResources/Move.tcl
@ -19,7 +19,6 @@
 #

 frame .move -relief groove -borderwidth 1 
-pack .move -pady 1 -padx 1 -anchor w -side left
 #toplevel .move

 frame .move.rotate -borderwidth 1 
@ -61,3 +60,26 @@ pack .move.zoom.mu -side top
 pack .move.zoom.md -side bottom
 pack .move.zoom

+frame .pick -borderwidth 1
+label .pick.title -text " Pick "
+button .pick.coords -text "Coords" -command {catch {puts [mpick]}}
+button .pick.dist -text "Dist" -command {catch {puts [mdist]}}
+button .pick.whatis -text "What is" -command {catch {puts [whatis .]}}
+button .pick.erase -text "Erase" -command {catch {puts [erase .]}}
+pack .pick.title
+pack .pick.coords -pady 2 -padx 10
+pack .pick.dist -pady 2 -padx 10
+pack .pick.whatis -pady 2 -padx 10
+pack .pick.erase -pady 2 -padx 10
+
+set ShowExtCommands 0
+
+proc ShowHideExtCommands {} {
+    global ShowExtCommands
+    if $ShowExtCommands {
+        pack .move -pady 1 -padx 1 -side left
+        pack .pick -pady 1 -padx 1
+    } else {
+        pack forget .move .pick
+    }
+}
--- a/src/DrawResources/StandardCommands.tcl
+++ b/src/DrawResources/StandardCommands.tcl
@ -95,6 +95,7 @@ help help {help pattern, or help command string group, to set help} {DRAW Genera
 # the getsourcefile command in TCL
 #################################################

+help getsourcefile {getsourcefile, or getsourcefile command } {DRAW General Commands}

 proc getsourcefile {{command ""}} {

@ -136,8 +137,6 @@ proc getsourcefile {{command ""}} {
    return [join $out "\n"]
 }

-help getsourcefile {getsourcefile, or getsourcefile command } {DRAW General Commands}
-
 #################################################
 # whatis
 #################################################
@ -147,6 +146,8 @@ help getsourcefile {getsourcefile, or getsourcefile command } {DRAW General Comm
 #    puts -nonewline $aVarName; puts -nonewline " is a "; puts [dtyp ${aVarName}]
 #}

+help whatis "whatis object1 object2 ..." 
+
 proc whatis args {
    set __out_string ""
    foreach i $args {
@ -159,8 +160,6 @@ proc whatis args {
    return ${__out_string}
 }

-help whatis "whatis object1 object2 ..." 
-
 #################################################
 # library, lsource
 #################################################
@ -195,6 +194,8 @@ proc isgdraw {var} {
    return [isdraw $var]
 }

+help directory {directory [pattern], list draw variables} {DRAW Variables management}
+
 proc directory {{joker *}} {
    set res ""
    foreach var [info globals $joker] { 
@ -203,8 +204,6 @@ proc directory {{joker *}} {
    return $res
 }

-help directory {directory [pattern], list draw variables} {DRAW Variables management}
-
 proc lsd {} { exec ls [datadir] }

 proc dall {} {
@ -259,6 +258,8 @@ proc do {var start end args} {

 set Draw_DataDir "."

+help datadir {datadir [directory]} "DRAW Variables management"
+
 proc datadir {{dir ""}} {
    global Draw_DataDir
    if {$dir != ""} {
@ -271,7 +272,7 @@ proc datadir {{dir ""}} {
    return $Draw_DataDir
 }

-help datadir {datadir [directory]} "DRAW Variables management"
+help save {save variable [filename]} "DRAW Variables management"

 proc save {name {file ""}} {
    if {$file == ""} {set file $name}
@ -282,7 +283,7 @@ proc save {name {file ""}} {
    return [file join $Draw_DataDir $file]
 }

-help save {save variable [filename]} "DRAW Variables management"
+help restore {restore filename [variablename]} "DRAW Variables management"

 proc restore {file {name ""}} {
    if {$name == ""} {
@ -295,8 +296,6 @@ proc restore {file {name ""}} {
    return $name
 }

-help restore {restore filename [variablename]} "DRAW Variables management"
-
 #################################################
 # misc...
 #################################################
@ -311,6 +310,7 @@ proc ppcurve {a} {
 # display and donly with jokers
 #################################################

+help disp {display variables matched by glob pattern} "DRAW Variables management"

 proc disp { args } {
    set res ""
@ -331,25 +331,7 @@ proc disp { args } {
    return $res
 }

-
-proc donl { args } {
-    set res ""
-    foreach joker $args {
-	if { $joker == "." } {
-             dtyp .
-             set joker [lastrep id x y b]
-	}
-        foreach var [info globals $joker] { 
-	   if { $var == "." } {
-               dtyp .
-               set var [lastrep id x y b]
-	   }
-	   if [isgdraw $var] {lappend res $var}
-        }
-    }
-    uplevel #0 eval donly $res
-    return $res
-}
+help don {display only variables matched by glob pattern} "DRAW Variables management"

 proc don { args } {
    set res ""
@ -370,6 +352,41 @@ proc don { args } {
    return $res
 }

+help del {unset (remove) variables matched by glob pattern} "DRAW Variables management"
+
+proc del args {
+    set res ""
+    foreach joker [eval concat $args] {
+        if { $joker == "." } {
+            dtyp .
+            set joker [lastrep id x y b]
+        }
+        foreach var [directory $joker] {
+            global $var
+            if ![isprot $var] {
+                lappend res $var; unset $var
+            }
+        }
+    }
+    return $res
+}
+
+help era {erase variables matched by glob pattern} "DRAW Variables management"
+
+proc era args {
+    set res ""
+    foreach joker [eval concat $args] {
+        if { $joker == "." } {
+            dtyp .
+            set joker [lastrep id x y b]
+        }
+        eval lappend res [directory $joker]
+    }
+    if [llength $res] {
+        uplevel \#0 eval erase $res
+    }
+}
+
 # The following commands (definitions are surrounded by if) are
 # available in extended Tcl (Tclx).
 # These procedures are added just to make full-working simulations of them.
--- a/src/DrawResources/Vector.tcl
+++ b/src/DrawResources/Vector.tcl
@ -0,0 +1,363 @@
+# Copyright (c) 2016 OPEN CASCADE SAS
+#
+# This file is part of Open CASCADE Technology software library.
+#
+# This library is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 2.1 as published
+# by the Free Software Foundation, with special exception defined in the file
+# OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+# distribution for complete text of the license and disclaimer of any warranty.
+#
+# Alternatively, this file may be used under the terms of Open CASCADE
+# commercial license or contractual agreement.
+#
+# Created by: M.Sazonov
+#
+# Working with vectors and various measurements
+#
+# [2d] point is represented by (two/three) coords
+# [2d] vector is represented by (two/three) coords
+# plane is represented by an origin point and a normal vector
+# [2d] line is represented by an origin point and a vector
+
+help vec {vec x1 y1 z1 x2 y2 z2
+  returns coordinates of vector between two points\
+} {Vector and measurement Commands}
+
+proc vec {x1 y1 z1 x2 y2 z2} {
+    uplevel list [dval ($x2)-($x1)] [dval ($y2)-($y1)] [dval ($z2)-($z1)]
+}
+
+help 2dvec {2dvec x1 y1 x2 y2
+  returns coordinates of 2D vector between two 2D points\
+} {Vector and measurement Commands}
+
+proc 2dvec {x1 y1 x2 y2} {
+    uplevel list [dval ($x2)-($x1)] [dval ($y2)-($y1)]
+}
+
+help pln {pln x1 y1 z1 x2 y2 z2 x3 y3 z3
+  returns plane built on three points\
+} {Vector and measurement Commands}
+
+proc pln {x1 y1 z1 x2 y2 z2 x3 y3 z3} {
+    set v12 [uplevel eval norm [vec $x1 $y1 $z1 $x2 $y2 $z2]]
+    set v13 [uplevel eval norm [vec $x1 $y1 $z1 $x3 $y3 $z3]]
+    set vn [eval cross $v12 $v13]
+    set N [eval module $vn]
+    if [expr $N < 1e-7] {
+        puts "points are on a line"
+        return
+    }
+    concat $x1 $y1 $z1 [eval norm $vn]
+}
+
+help module {module x y z
+  returns module of a vector\
+} {Vector and measurement Commands}
+
+proc module {x y z} {
+    uplevel dval sqrt(($x)*($x)+($y)*($y)+($z)*($z))
+}
+
+help 2dmodule {2dmodule x y
+  returns module of a 2D vector\
+} {Vector and measurement Commands}
+
+proc 2dmodule {x y} {
+    uplevel dval sqrt(($x)*($x)+($y)*($y))
+}
+
+help norm {norm x y z
+  returns unified vector from a given vector\
+} {Vector and measurement Commands}
+
+proc norm {x y z} {
+    set N [uplevel dval sqrt(($x)*($x)+($y)*($y)+($z)*($z))]
+    list [uplevel dval ($x)/$N] [uplevel dval ($y)/$N] [uplevel dval ($z)/$N]
+}
+
+help 2dnorm {2dnorm x y
+  returns unified vector from a given 2D vector\
+} {Vector and measurement Commands}
+
+proc 2dnorm {x y} {
+    set N [uplevel dval sqrt(($x)*($x)+($y)*($y))]
+    list [uplevel dval ($x)/$N] [uplevel dval ($y)/$N]
+}
+
+help inverse {inverse x y z
+  returns inversed vector\
+} {Vector and measurement Commands}
+
+proc inverse {x y z} {
+    list [uplevel dval -$x] [uplevel dval -$y] [uplevel dval -$z]
+}
+
+help 2dinverse {2dinverse x y
+  returns inversed 2D vector\
+} {Vector and measurement Commands}
+
+proc 2dinverse {x y} {
+    list [uplevel dval -$x] [uplevel dval -$y]
+}
+
+help 2dort {2dort x y
+  returns 2D vector rotated on 90 degrees\
+} {Vector and measurement Commands}
+
+proc 2dort {x y} {
+    list [uplevel dval -$y] [uplevel dval $x]
+}
+
+help distpp {distpp x1 y1 z1 x2 y2 z2
+  returns distance between two points\
+} {Vector and measurement Commands}
+
+proc distpp {x1 y1 z1 x2 y2 z2} {
+    eval module [uplevel vec $x1 $y1 $z1 $x2 $y2 $z2]
+}
+
+help 2ddistpp {2ddistpp x1 y1 x2 y2
+  returns distance between two 2D points\
+} {Vector and measurement Commands}
+
+proc 2ddistpp {x1 y1 x2 y2} {
+    eval 2dmodule [uplevel 1 2dvec $x1 $y1 $x2 $y2]
+}
+
+help distplp {distplp xo yo zo dx dy dz xp yp zp
+  returns distance between plane and point\
+} {Vector and measurement Commands}
+
+proc distplp {xo yo zo dx dy dz xp yp zp} {
+    set vop [uplevel vec $xo $yo $zo $xp $yp $zp]
+    set vn [uplevel norm $dx $dy $dz]
+    eval dot $vop $vn
+}
+
+help distlp {distlp xo yo zo dx dy dz xp yp zp
+  returns distance between line and point\
+} {Vector and measurement Commands}
+
+proc distlp {xo yo zo dx dy dz xp yp zp} {
+    set vop [uplevel vec $xo $yo $zo $xp $yp $zp]
+    set vl [uplevel norm $dx $dy $dz]
+    eval module [eval cross $vl $vop]
+}
+
+help 2ddistlp {2ddistlp xo yo dx dy xp yp
+  returns distance between 2D line and point\
+} {Vector and measurement Commands}
+
+proc 2ddistlp {xo yo dx dy xp yp} {
+    set vop [uplevel 1 2dvec $xo $yo $xp $yp]
+    set vl [uplevel 1 2dnorm $dx $dy]
+    eval 2dcross $vl $vop
+}
+
+help distppp {distppp x1 y1 z1 x2 y2 z2 x3 y3 z3
+  returns deviation of point p2 from segment p1-p3\
+} {Vector and measurement Commands}
+
+proc distppp {x1 y1 z1 x2 y2 z2 x3 y3 z3} {
+    set vop [uplevel vec $x1 $y1 $z1 $x2 $y2 $z2]
+    set vl [uplevel eval norm [vec $x1 $y1 $z1 $x3 $y3 $z3]]
+    eval module [eval cross $vl $vop]
+}
+
+help 2ddistppp {2ddistppp x1 y1 x2 y2 x3 y3
+  returns deviation of 2D point p2 from segment p1-p3 (sign shows the side)\
+} {Vector and measurement Commands}
+
+proc 2ddistppp {x1 y1 x2 y2 x3 y3} {
+    set vop [uplevel 1 2dvec $x1 $y1 $x2 $y2]
+    set vl [uplevel eval 2dnorm [2dvec $x1 $y1 $x3 $y3]]
+    eval 2dcross $vl $vop
+}
+
+help barycen {barycen x1 y1 z1 x2 y2 z2 par
+  returns point of a given parameter between two points\
+} {Vector and measurement Commands}
+
+proc barycen {x1 y1 z1 x2 y2 z2 par} {
+    uplevel list [dval ($x1)*(1-($par))+($x2)*($par)]\
+        [dval ($y1)*(1-($par))+($y2)*($par)]\
+        [dval ($z1)*(1-($par))+($z2)*($par)]
+}
+
+help 2dbarycen {2dbarycen x1 y1 x2 y2 par
+  returns 2D point of a given parameter between two points\
+} {Vector and measurement Commands}
+
+proc 2dbarycen {x1 y1 x2 y2 par} {
+    uplevel list [dval ($x1)*(1-($par))+($x2)*($par)]\
+        [dval ($y1)*(1-($par))+($y2)*($par)]
+}
+
+help cross {cross x1 y1 z1 x2 y2 z2
+  returns cross product of two vectors\
+} {Vector and measurement Commands}
+
+proc cross {x1 y1 z1 x2 y2 z2} {
+    set x [uplevel dval ($y1)*($z2)-($z1)*($y2)]
+    set y [uplevel dval ($z1)*($x2)-($x1)*($z2)]
+    set z [uplevel dval ($x1)*($y2)-($y1)*($x2)]
+    list $x $y $z
+}
+
+help 2dcross {2dcross x1 y1 x2 y2
+  returns cross product of two 2D vectors\
+} {Vector and measurement Commands}
+
+proc 2dcross {x1 y1 x2 y2} {
+    uplevel dval ($x1)*($y2)-($y1)*($x2)
+}
+
+help dot {dot x1 y1 z1 x2 y2 z2
+  returns scalar product of two vectors\
+} {Vector and measurement Commands}
+
+proc dot {x1 y1 z1 x2 y2 z2} {
+    uplevel dval ($x1)*($x2)+($y1)*($y2)+($z1)*($z2)
+}
+
+help 2ddot {2ddot x1 y1 x2 y2
+  returns scalar product of two 2D vectors\
+} {Vector and measurement Commands}
+
+proc 2ddot {x1 y1 x2 y2} {
+    uplevel dval ($x1)*($x2)+($y1)*($y2)
+}
+
+help scale {scale x y z factor
+  returns vector multiplied by scalar\
+} {Vector and measurement Commands}
+
+proc scale {x y z factor} {
+    list [dval $x*$factor] [dval $y^$factor] [dval $z*$factor]
+}
+
+help 2dscale {2dscale x y factor
+  returns 2D vector multiplied by scalar\
+} {Vector and measurement Commands}
+
+proc 2dscale {x y factor} {
+    list [dval $x*$factor] [dval $y^$factor]
+}
+
+help pntc {pntc curve u
+  returns coordinates of point on curve with given parameter\
+} {Vector and measurement Commands}
+
+proc pntc {curv u} {
+    upvar \#0 $curv c
+    cvalue c $u x y z
+    return "[dval x] [dval y] [dval z]"
+}
+
+help 2dpntc {2dpntc curv2d u
+  returns coordinates of 2D point on 2D curve with given parameter\
+} {Vector and measurement Commands}
+
+proc 2dpntc {curv2d u} {
+    upvar \#0 $curv2d c
+    2dcvalue c $u x y
+    return "[dval x] [dval y]"
+}
+
+help pntsu {pntsu surf u v
+  returns coordinates of point on surface with given parameters\
+} {Vector and measurement Commands}
+
+proc pntsu {surf u v} {
+    upvar \#0 $surf s
+    svalue s $u $v x y z
+    return "[dval x] [dval y] [dval z]"
+}
+
+help pntcons {pntcons curv2d surf u
+  returns coordinates of point on surface defined by 
+  point on 2D curve with given parameter\
+} {Vector and measurement Commands}
+
+proc pntcons {curv2d surf u} {
+    upvar \#0 $curv2d c $surf s
+    2dcvalue c $u u0 v0
+    svalue s u0 v0 x y z
+    return "[dval x] [dval y] [dval z]"
+}
+
+help pnt {pnt point_or_vertex
+  returns coordinates of point in the given Draw variable of type point or vertex\
+} {Vector and measurement Commands}
+
+proc pnt var {
+    upvar \#0 $var v
+    set type [dtyp v]
+    set pp v
+    if {[lindex $type 1] == "VERTEX"} {
+        mkpoint p v
+        set pp p
+        set type "point"
+    }
+    if {$type == "point"} {
+        if [catch {coord $pp x y z}] {
+            if ![catch {coord $pp x y}] {
+                return "[dval x] [dval y]"
+            }
+        } else {
+            return "[dval x] [dval y] [dval z]"
+        }
+    }
+}
+
+help drseg {drseg name x1 y1 z1 x2 y2 z2
+  creates a trimmed line between two points\
+} {Vector and measurement Commands}
+
+proc drseg {name x1 y1 z1 x2 y2 z2} {
+    set x [uplevel dval $x1]
+    set y [uplevel dval $y1]
+    set z [uplevel dval $z1]
+    set dx [uplevel dval ($x2)-($x1)]
+    set dy [uplevel dval ($y2)-($y1)]
+    set dz [uplevel dval ($z2)-($z1)]
+    set len [module $dx $dy $dz]
+    uplevel line $name $x $y $z $dx $dy $dz
+    uplevel trim $name $name 0 $len
+}
+
+help 2ddrseg {2ddrseg name x1 y1 x2 y2
+  creates a trimmed 2D line between two 2D points\
+} {Vector and measurement Commands}
+
+proc 2ddrseg {name x1 y1 x2 y2} {
+    set x [uplevel dval $x1]
+    set y [uplevel dval $y1]
+    set dx [uplevel dval ($x2)-($x1)]
+    set dy [uplevel dval ($y2)-($y1)]
+    set len [2dmodule $dx $dy]
+    uplevel line $name $x $y $dx $dy
+    uplevel trim $name $name 0 $len
+}
+
+help mpick {show coordinates at mouse click\
+} {Vector and measurement Commands}
+
+proc mpick {} {
+    puts "Pick position"
+    pick id x1 y1 z1 b
+    concat [dval x1] [dval y1] [dval z1]
+}
+
+help mdist {compute distance between two points of mouse clicks\
+} {Vector and measurement Commands}
+
+proc mdist {} {
+    puts "Pick first position"
+    pick id x1 y1 z1 b
+    puts "Pick second position"
+    pick id x2 y2 z2 b
+    dval sqrt((x1-x2)*(x1-x2)+(y1-y2)*(y1-y2)+(z1-z2)*(z1-z2))
+}
--- a/tests/bugs/moddata_2/bug354_2
+++ b/tests/bugs/moddata_2/bug354_2
@ -13,7 +13,7 @@ explode a f

 explode a_5 e

-donl a a_5_6
+donly a a_5_6

 chamf result a a_5_6 a_5 A 2 45
 checkshape result
--- a/tests/bugs/moddata_2/bug592
+++ b/tests/bugs/moddata_2/bug592
@ -16,7 +16,7 @@ cvalue cc 0.95 x y z
 vertex vv x y z
 mksurface gs ff114
 mkface ff gs
-donl ff114 vv
+donly ff114 vv
 trim trcc cc
 set aa [distmini dd vv ff]

--- a/tests/bugs/moddata_2/bug6862_8
+++ b/tests/bugs/moddata_2/bug6862_8
@ -15,7 +15,7 @@ explode b1 e
 explode b2 e
 tcopy b2_10 ee2
 compound b2_10 ee2 comp
-donl b1_10 comp
+donly b1_10 comp

 set resstr [bopargcheck b1_10 comp -O /RFTEIP]

--- a/tests/bugs/moddata_2/bug6862_9
+++ b/tests/bugs/moddata_2/bug6862_9
@ -15,7 +15,7 @@ explode b1 e
 explode b2 e
 tcopy b2_10 ee2
 wire ww b2_10 ee2
-donl b1_10 ww
+donly b1_10 ww

 set resstr [bopargcheck b1_10 ww -O /RFTVIP]