Revision: 33289 http://brlcad.svn.sourceforge.net/brlcad/?rev=33289&view=rev Author: bob1961 Date: 2008-12-04 19:52:19 +0000 (Thu, 04 Dec 2008)
Log Message: ----------- Added wrappers for the "in" and "inside" commands in Archer. Modified the Command widget to append more_args, if any, to the invoked command. Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl brlcad/trunk/src/tclscripts/lib/Command.tcl brlcad/trunk/src/tclscripts/lib/Ged.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2008-12-04 18:32:36 UTC (rev 33288) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2008-12-04 19:52:19 UTC (rev 33289) @@ -133,6 +133,8 @@ method get {args} method group {args} method i {args} + method in {args} + method inside {args} method item {args} method kill {args} method killall {args} @@ -362,9 +364,8 @@ whichid who unpackTree Z zap } variable mMgedCommands { \ - bot2pipe \ - adjust arced attr blast c comb comb_color concat copyeval E edcomb \ - edmater erase_all ev find hide item killall killtree make \ + adjust arced attr blast bot2pipe c comb comb_color concat copyeval E edcomb \ + edmater erase_all ev find hide in inside item killall killtree make \ make_bb make_name mater mirror mvall push put r rmater report \ shader track unhide vdraw wmater } @@ -3833,6 +3834,14 @@ } +::itcl::body ArcherCore::in {args} { + eval mgedWrapper in 0 0 1 1 $args +} + +::itcl::body ArcherCore::inside {args} { + eval mgedWrapper inside 0 0 1 1 $args +} + ::itcl::body ArcherCore::item {args} { eval mgedWrapper item 0 0 1 1 $args } Modified: brlcad/trunk/src/tclscripts/lib/Command.tcl =================================================================== --- brlcad/trunk/src/tclscripts/lib/Command.tcl 2008-12-04 18:32:36 UTC (rev 33288) +++ brlcad/trunk/src/tclscripts/lib/Command.tcl 2008-12-04 19:52:19 UTC (rev 33289) @@ -116,6 +116,7 @@ private variable search_char "" private variable search_dir "" + private variable more_args_list {} private variable more_args_var "" private variable more_args_begin_index "" private variable more_args_end_index "" @@ -262,6 +263,7 @@ bind $w <Return> "[::itcl::code $this doReturn]; break" bind $w <KP_Enter> "[::itcl::code $this doReturn]; break" + eval lappend more_args_list $more_args_var return $more_args_var } @@ -302,6 +304,7 @@ set w $itk_component(text) set cmd [$w get promptEnd insert] + set more_args_list {} # remove any instances of prompt2 from the beginning of each secondary line regsub -all "\n$itk_option(-prompt2)" $cmd "" cmd @@ -328,6 +331,7 @@ } if {$do_history} { + eval lappend cmd $more_args_list $hist add $cmd } print_prompt Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl =================================================================== --- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2008-12-04 18:32:36 UTC (rev 33288) +++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2008-12-04 19:52:19 UTC (rev 33289) @@ -2772,7 +2772,6 @@ $help add idents {{file object(s)} {dump the idents for the specified objects to file}} $help add illum {{name} {illuminate object}} $help add importFg4Section {{obj section} {create an object by importing the specified section}} -#XXX Temporarily disabled (i.e. doesn't work properly) $help add in {{args} {creates a primitive by prompting the user for input}} $help add inside {{out_prim in_prim th(s)} {Creates in_prim as the inside of out_prim}} $help add isize {{} {returns the inverse of view size}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits