[brlcad-commits] SF.net SVN: brlcad:[53411] brlcad/trunk/src/tclscripts/lib/Ged.tcl

[<bo...@us...>]

Revision: 53411
          http://brlcad.svn.sourceforge.net/brlcad/?rev=53411&view=rev
Author:   bob1961
Date:     2012-11-01 11:23:22 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Update init_view_rect and end_view_rect to accomodate selecting the points within a bot.

Modified Paths:
--------------
    brlcad/trunk/src/tclscripts/lib/Ged.tcl

Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl	2012-11-01 11:20:19 UTC (rev 53410)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl	2012-11-01 11:23:22 UTC (rev 53411)
@@ -599,7 +599,7 @@
 	method end_data_poly_rect {_pane {_button 1}}
 	method end_view_measure {_pane _part1_button _part2_button}
 	method end_view_measure_part2 {_pane _button}
-	method end_view_rect {_pane {_button 1} {_pflag 0}}
+	method end_view_rect {_pane {_button 1} {_pflag 0} {_bot ""}}
 	method end_view_rotate {_pane}
 	method end_view_scale {_pane}
 	method end_view_translate {_pane}
@@ -632,7 +632,7 @@
 	method init_view_center {{_button 1}}
 	method init_view_measure {{_button 1} {_part2_button 2}}
 	method init_view_measure_part2 {_button}
-	method init_view_rect {{_button 1} {_pflag 0}}
+	method init_view_rect {{_button 1} {_pflag 0} {_bot ""}}
 	method init_view_rotate {{_button 1}}
 	method init_view_scale {{_button 1}}
 	method init_view_translate {{_button 1}}
@@ -3884,7 +3884,7 @@
     init_button_no_op_prot $_button
 }
 
-::itcl::body cadwidgets::Ged::end_view_rect {_pane {_button 1} {_pflag 0}} {
+::itcl::body cadwidgets::Ged::end_view_rect {_pane {_button 1} {_pflag 0} {_bot ""}} {
     $mGed idle_mode $itk_component($_pane)
 
 #    # Add specific bindings to eliminate bleed through from rectangle mode
@@ -3894,17 +3894,25 @@
 #    }
 
     if {[llength $mViewRectCallbacks] == 0} {
-	if {$_pflag} {
-	    tk_messageBox -message [$mGed rselect -p $itk_component($_pane)]
+	if {$_bot != ""} {
+	    tk_messageBox -message [$mGed rselect $itk_component($_pane) -b $_bot]
 	} else {
-	    tk_messageBox -message [$mGed rselect $itk_component($_pane)]
+	    if {$_pflag} {
+		tk_messageBox -message [$mGed rselect $itk_component($_pane) -p]
+	    } else {
+		tk_messageBox -message [$mGed rselect $itk_component($_pane)]
+	    }
 	}
     } else {
 	foreach callback $mViewRectCallbacks {
-	    if {$_pflag} {
-		catch {$callback [$mGed rselect $itk_component($_pane) -p]}
+	    if {$_bot != ""} {
+		catch {$callback [$mGed rselect $itk_component($_pane) -b $_bot]}
 	    } else {
-		catch {$callback [$mGed rselect $itk_component($_pane)]}
+		if {$_pflag} {
+		    catch {$callback [$mGed rselect $itk_component($_pane) -p]}
+		} else {
+		    catch {$callback [$mGed rselect $itk_component($_pane)]}
+		}
 	    }
 	}
     }
@@ -4258,12 +4266,12 @@
     }
 }
 
-::itcl::body cadwidgets::Ged::init_view_rect {{_button 1} {_pflag 0}} {
+::itcl::body cadwidgets::Ged::init_view_rect {{_button 1} {_pflag 0} {_bot ""}} {
     measure_line_erase
 
     foreach dm {ur ul ll lr} {
 	bind $itk_component($dm) <$_button> "$mGed rect_mode $itk_component($dm) %x %y; focus %W; break"
-	bind $itk_component($dm) <ButtonRelease-$_button> "[::itcl::code $this end_view_rect $dm $_button $_pflag]; break"
+	bind $itk_component($dm) <ButtonRelease-$_button> "[::itcl::code $this end_view_rect $dm $_button $_pflag $_bot]; break"
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.