Revision: 54318
http://brlcad.svn.sourceforge.net/brlcad/?rev=54318&view=rev
Author: bob1961
Date: 2013-02-06 13:25:29 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
Updated the moveElement methods for moving ARB edges (i.e. use a view_z
calculated using edge vertices instead of from the arb's center).
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/archer/Arb5EditFrame.tcl
brlcad/trunk/src/tclscripts/archer/Arb6EditFrame.tcl
brlcad/trunk/src/tclscripts/archer/Arb7EditFrame.tcl
brlcad/trunk/src/tclscripts/archer/Arb8EditFrame.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Arb5EditFrame.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/Arb5EditFrame.tcl 2013-02-05
21:13:40 UTC (rev 54317)
+++ brlcad/trunk/src/tclscripts/archer/Arb5EditFrame.tcl 2013-02-06
13:25:29 UTC (rev 54318)
@@ -618,6 +618,46 @@
::itcl::body Arb5EditFrame::moveElement {_dm _obj _vx _vy _ocenter} {
switch -- $mEditMode \
+ $moveEdge12 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V2]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge23 {
+ set ptA [$itk_option(-mged) get $_obj V2]
+ set ptB [$itk_option(-mged) get $_obj V3]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge34 {
+ set ptA [$itk_option(-mged) get $_obj V3]
+ set ptB [$itk_option(-mged) get $_obj V4]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge14 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V4]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge15 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V5]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge25 {
+ set ptA [$itk_option(-mged) get $_obj V2]
+ set ptB [$itk_option(-mged) get $_obj V5]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge35 {
+ set ptA [$itk_option(-mged) get $_obj V3]
+ set ptB [$itk_option(-mged) get $_obj V5]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge45 {
+ set ptA [$itk_option(-mged) get $_obj V4]
+ set ptB [$itk_option(-mged) get $_obj V5]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
$movePoint5 {
set pt [$itk_option(-mged) get $_obj V5]
} \
Modified: brlcad/trunk/src/tclscripts/archer/Arb6EditFrame.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/Arb6EditFrame.tcl 2013-02-05
21:13:40 UTC (rev 54317)
+++ brlcad/trunk/src/tclscripts/archer/Arb6EditFrame.tcl 2013-02-06
13:25:29 UTC (rev 54318)
@@ -676,6 +676,46 @@
::itcl::body Arb6EditFrame::moveElement {_dm _obj _vx _vy _ocenter} {
switch -- $mEditMode \
+ $moveEdge12 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V2]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge23 {
+ set ptA [$itk_option(-mged) get $_obj V2]
+ set ptB [$itk_option(-mged) get $_obj V3]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge34 {
+ set ptA [$itk_option(-mged) get $_obj V3]
+ set ptB [$itk_option(-mged) get $_obj V4]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge14 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V4]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge15 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V5]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge25 {
+ set ptA [$itk_option(-mged) get $_obj V2]
+ set ptB [$itk_option(-mged) get $_obj V5]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge36 {
+ set ptA [$itk_option(-mged) get $_obj V3]
+ set ptB [$itk_option(-mged) get $_obj V6]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge46 {
+ set ptA [$itk_option(-mged) get $_obj V4]
+ set ptB [$itk_option(-mged) get $_obj V6]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
$movePoint5 {
set pt [$itk_option(-mged) get $_obj V5]
} \
Modified: brlcad/trunk/src/tclscripts/archer/Arb7EditFrame.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/Arb7EditFrame.tcl 2013-02-05
21:13:40 UTC (rev 54317)
+++ brlcad/trunk/src/tclscripts/archer/Arb7EditFrame.tcl 2013-02-06
13:25:29 UTC (rev 54318)
@@ -735,6 +735,61 @@
::itcl::body Arb7EditFrame::moveElement {_dm _obj _vx _vy _ocenter} {
switch -- $mEditMode \
+ $moveEdge12 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V2]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge23 {
+ set ptA [$itk_option(-mged) get $_obj V2]
+ set ptB [$itk_option(-mged) get $_obj V3]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge34 {
+ set ptA [$itk_option(-mged) get $_obj V3]
+ set ptB [$itk_option(-mged) get $_obj V4]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge14 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V4]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge15 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V5]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge26 {
+ set ptA [$itk_option(-mged) get $_obj V2]
+ set ptB [$itk_option(-mged) get $_obj V6]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge56 {
+ set ptA [$itk_option(-mged) get $_obj V5]
+ set ptB [$itk_option(-mged) get $_obj V6]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge67 {
+ set ptA [$itk_option(-mged) get $_obj V6]
+ set ptB [$itk_option(-mged) get $_obj V7]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge37 {
+ set ptA [$itk_option(-mged) get $_obj V3]
+ set ptB [$itk_option(-mged) get $_obj V7]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge57 {
+ set ptA [$itk_option(-mged) get $_obj V5]
+ set ptB [$itk_option(-mged) get $_obj V7]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge45 {
+ set ptA [$itk_option(-mged) get $_obj V4]
+ set ptB [$itk_option(-mged) get $_obj V5]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
$movePoint5 {
set pt [$itk_option(-mged) get $_obj V5]
} \
Modified: brlcad/trunk/src/tclscripts/archer/Arb8EditFrame.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/Arb8EditFrame.tcl 2013-02-05
21:13:40 UTC (rev 54317)
+++ brlcad/trunk/src/tclscripts/archer/Arb8EditFrame.tcl 2013-02-06
13:25:29 UTC (rev 54318)
@@ -39,6 +39,7 @@
method initTranslate {}
method updateGeometry {}
method createGeometry {obj}
+ method moveElement {_dm _obj _vx _vy _ocenter}
method p {obj args}
}
@@ -844,6 +845,82 @@
V8 [list $mXmin $mYmax $mZmax]
}
+
+::itcl::body Arb8EditFrame::moveElement {_dm _obj _vx _vy _ocenter} {
+ switch -- $mEditMode \
+ $moveEdge12 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V2]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge23 {
+ set ptA [$itk_option(-mged) get $_obj V2]
+ set ptB [$itk_option(-mged) get $_obj V3]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge34 {
+ set ptA [$itk_option(-mged) get $_obj V3]
+ set ptB [$itk_option(-mged) get $_obj V4]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge14 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V4]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge15 {
+ set ptA [$itk_option(-mged) get $_obj V1]
+ set ptB [$itk_option(-mged) get $_obj V5]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge26 {
+ set ptA [$itk_option(-mged) get $_obj V2]
+ set ptB [$itk_option(-mged) get $_obj V6]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge56 {
+ set ptA [$itk_option(-mged) get $_obj V5]
+ set ptB [$itk_option(-mged) get $_obj V6]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge67 {
+ set ptA [$itk_option(-mged) get $_obj V6]
+ set ptB [$itk_option(-mged) get $_obj V7]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge78 {
+ set ptA [$itk_option(-mged) get $_obj V7]
+ set ptB [$itk_option(-mged) get $_obj V8]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge58 {
+ set ptA [$itk_option(-mged) get $_obj V5]
+ set ptB [$itk_option(-mged) get $_obj V8]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge37 {
+ set ptA [$itk_option(-mged) get $_obj V3]
+ set ptB [$itk_option(-mged) get $_obj V7]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ $moveEdge48 {
+ set ptA [$itk_option(-mged) get $_obj V4]
+ set ptB [$itk_option(-mged) get $_obj V8]
+ set pt [::vscale [vadd2 $ptA $ptB] 0.5]
+ } \
+ default {
+ $itk_option(-mged) $mEditCommand $_obj $mEditParam1 $_ocenter
+ return
+ }
+
+ set vpt [$itk_option(-mged) pane_m2v_point $_dm $pt]
+ set vz [lindex $vpt 2]
+ set new_vpt [list $_vx $_vy $vz]
+ set new_ocenter [$itk_option(-mged) pane_v2m_point $_dm $new_vpt]
+ $itk_option(-mged) $mEditCommand $_obj $mEditParam1 $new_ocenter
+}
+
+
::itcl::body Arb8EditFrame::p {obj args} {
if {[llength $args] != 3 ||
![string is double [lindex $args 0]] ||
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
