Thread: [brlcad-commits] SF.net SVN: brlcad:[55264] brlcad/trunk/src/tclscripts/archer/ArcherCore. tcl (Page 5)
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <bo...@us...> - 2013-04-29 17:32:07
|
Revision: 55264 http://sourceforge.net/p/brlcad/code/55264 Author: bob1961 Date: 2013-04-29 17:31:59 +0000 (Mon, 29 Apr 2013) Log Message: ----------- Added aliases for blast, draw and erase (i.e. B, e and d, respectively). Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-04-29 16:54:08 UTC (rev 55263) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-04-29 17:31:59 UTC (rev 55264) @@ -180,6 +180,7 @@ method attr {args} method bb {args} method bev {args} + method B {args} method blast {args} method bo {args} method bot {args} @@ -212,11 +213,13 @@ method decompose {args} method delete {args} method draw {args} + method e {args} method E {args} method edcodes {args} method edcolor {args} method edcomb {args} method edmater {args} + method d {args} method erase {args} method ev {args} method exists {args} @@ -562,12 +565,12 @@ # This is mostly a list of wrapped Ged commands. However, it also contains # a few commands that are implemented here in ArcherCore. variable mArcherCoreCommands { \ - 3ptarb adjust arced attr bb bev blast bo bot bot_condense \ + 3ptarb adjust arced attr bb bev B blast bo bot bot_condense \ bot_decimate bot_face_fuse bot_face_sort bot_flip \ bot_merge bot_smooth bot_split bot_sync bot_vertex_fuse \ c cd clear clone closedb color comb comb_color combmem \ copy copyeval copymat cp cpi dbconcat dbExpand decompose \ - delete draw E edcodes edcolor edcomb edit edmater erase ev exists \ + delete draw e E edcodes edcolor edcomb edit edmater d erase ev exists \ exit facetize fracture freezeGUI g get graph group hide human i igraph \ importFg4Section in inside item kill killall killrefs \ killtree l ls make make_bb make_name make_pnts man mater mirror move \ @@ -5947,6 +5950,10 @@ eval gedWrapper bev 0 0 1 1 $args } +::itcl::body ArcherCore::B {args} { + eval blast $args +} + ::itcl::body ArcherCore::blast {args} { eval gedWrapper blast 0 0 0 1 $args } @@ -6166,6 +6173,10 @@ eval gedWrapper kill 1 0 1 2 $args } +::itcl::body ArcherCore::e {args} { + eval draw $args +} + ::itcl::body ArcherCore::draw {args} { if {[llength $args] == 0} { return @@ -6256,6 +6267,10 @@ eval gedWrapper edmater 0 0 1 0 $args } +::itcl::body ArcherCore::d {args} { + eval erase $args +} + ::itcl::body ArcherCore::erase {args} { if {[llength $args] == 0} { return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2013-05-13 14:42:41
|
Revision: 55394 http://sourceforge.net/p/brlcad/code/55394 Author: bob1961 Date: 2013-05-13 14:42:37 +0000 (Mon, 13 May 2013) Log Message: ----------- Update ArcherCore::rsyncTree to use the get_type command. Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-05-13 14:27:29 UTC (rev 55393) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-05-13 14:42:37 UTC (rev 55394) @@ -2356,8 +2356,7 @@ # Is _pnode currently set up for children? if {![catch {set clists $mPNode2CList($_pnode)}]} { - set pgdata [$itk_component(ged) get $ptext] - set ptype [lindex $pgdata 0] + set ptype [$itk_component(ged) get_type $ptext] if {$ptype == "dsp" || $ptype == "ebm" || @@ -2521,8 +2520,7 @@ } } } else { - set pgdata [$itk_component(ged) get $ptext] - set ptype [lindex $pgdata 0] + set ptype [$itk_component(ged) get_type $ptext] if {$ptype == "comb"} { set mlist [getTreeMembers $ptext] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2013-05-20 15:51:26
|
Revision: 55513 http://sourceforge.net/p/brlcad/code/55513 Author: bob1961 Date: 2013-05-20 15:51:22 +0000 (Mon, 20 May 2013) Log Message: ----------- Minor tweak to ArcherCore::render to reset mSavedCenter and mSavedSize. Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-05-20 12:45:28 UTC (rev 55512) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-05-20 15:51:22 UTC (rev 55513) @@ -3769,11 +3769,11 @@ ($mColorObjects != "" || $mGhostObjects != "" || $mEdgeObjects != "")} { $itk_component(ged) center $mSavedCenter $itk_component(ged) size $mSavedSize - } else { - set mSavedCenter "" - set mSavedSize "" } + set mSavedCenter "" + set mSavedSize "" + # Get the eye pt in model coordinates set eyemodel [split [regsub {;} [$itk_component(ged) get_eyemodel] {}] "\n"] set eye_pt [lrange [lindex $eyemodel 2] 1 end] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2013-05-21 13:07:25
|
Revision: 55519 http://sourceforge.net/p/brlcad/code/55519 Author: bob1961 Date: 2013-05-21 13:07:22 +0000 (Tue, 21 May 2013) Log Message: ----------- By default, Archer will use display lists. Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-05-21 13:02:03 UTC (rev 55518) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-05-21 13:07:22 UTC (rev 55519) @@ -489,7 +489,7 @@ variable mLightingMode 1 variable mLightingModePref "" - variable mDisplayListMode 0 + variable mDisplayListMode 1 variable mDisplayListModePref "" variable mWireframeMode 0 variable mWireframeModePref "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2013-05-22 11:12:20
|
Revision: 55529 http://sourceforge.net/p/brlcad/code/55529 Author: bob1961 Date: 2013-05-22 11:12:16 +0000 (Wed, 22 May 2013) Log Message: ----------- Tweaks for Archer's Rt image view mode. Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-05-22 03:28:04 UTC (rev 55528) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-05-22 11:12:16 UTC (rev 55529) @@ -408,6 +408,9 @@ variable mColorObjects {} variable mGhostObjects {} variable mEdgeObjects {} + variable mColorObjectsHow 0 + variable mGhostObjectsHow 0 + variable mEdgeObjectsHow 0 variable mAccordianCallbackActive 0 variable mTreeMode $TREE_MODE_TREE @@ -2630,16 +2633,26 @@ set whoList [gedCmd who] + set who [lindex $whoList 0] + if {$who != ""} { + set how [gedCmd how $who] + } else { + set how 0 + } + switch -- $mTreeMode \ $TREE_MODE_TREE - \ $TREE_MODE_COLOR_OBJECTS { set mColorObjects $whoList + set mColorObjectsHow $how } \ $TREE_MODE_GHOST_OBJECTS { set mGhostObjects $whoList + set mGhostObjectsHow $how } \ $TREE_MODE_EDGE_OBJECTS { set mEdgeObjects $whoList + set mEdgeObjectsHow $how } foreach ditem $whoList { @@ -7244,6 +7257,7 @@ set drawem 0 set draw_objects "" + set how 0 if {!$_state && !$mToolViewChange} { # The same accordian button was pressed and there's NO tool view change if {[regexp Tree $_item all]} { @@ -7316,12 +7330,15 @@ $TREE_MODE_TREE - \ $TREE_MODE_COLOR_OBJECTS { set draw_objects $mColorObjects + set how $mColorObjectsHow } \ $TREE_MODE_GHOST_OBJECTS { set draw_objects $mGhostObjects + set how $mGhostObjectsHow } \ $TREE_MODE_EDGE_OBJECTS { set draw_objects $mEdgeObjects + set how $mEdgeObjectsHow } } @@ -7344,7 +7361,11 @@ set mSavedCenter [$itk_component(ged) center] set mSavedSize [$itk_component(ged) size] zap - eval draw $draw_objects + + if {$draw_objects != ""} { + eval draw -m$how $draw_objects + } + $itk_component(ged) center $mSavedCenter $itk_component(ged) size $mSavedSize $itk_component(ged) refresh_on This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2013-07-25 17:02:30
|
Revision: 56218 http://sourceforge.net/p/brlcad/code/56218 Author: bob1961 Date: 2013-07-25 17:02:27 +0000 (Thu, 25 Jul 2013) Log Message: ----------- Added ArcherCore::updatePrimitiveLabels (used by ArcherCore::kill and ArcherCore::killall to update cadwidgets::Ged's -primitiveLabels option before calling kill/killall. Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-07-25 16:59:28 UTC (rev 56217) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-07-25 17:02:27 UTC (rev 56218) @@ -970,6 +970,7 @@ method watchVar {_name1 _name2 _op} method accordianCallback {_item _state} + method updatePrimitiveLabels {args} } } @@ -6457,11 +6458,38 @@ eval gedWrapper item 0 0 1 0 $args } +::itcl::body ArcherCore::updatePrimitiveLabels {args} { + if {![info exists itk_component(ged)]} { + return + } + + set plist [$itk_component(ged) cget -primitiveLabels] + if {[llength $plist] > 0} { + set tail_plist {} + foreach item $plist { + lappend tail_plist [file tail $item] + } + + foreach item [eval gedCmd kill -n $args] { + set item [string trim $item] + set i [lsearch $tail_plist $item] + if {$i != -1} { + set plist [lreplace $plist $i $i] + set tail_plist [lreplace $tail_plist $i $i] + } + } + + $itk_component(ged) configure -primitiveLabels $plist + } +} + ::itcl::body ArcherCore::kill {args} { + eval updatePrimitiveLabels $args eval gedWrapper kill 1 0 1 2 $args } ::itcl::body ArcherCore::killall {args} { + eval updatePrimitiveLabels $args eval gedWrapper killall 1 0 1 2 $args } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <n_...@us...> - 2013-07-31 21:06:12
|
Revision: 56397 http://sourceforge.net/p/brlcad/code/56397 Author: n_reed Date: 2013-07-31 21:06:04 +0000 (Wed, 31 Jul 2013) Log Message: ----------- Handle hidden line mode when redrawing from script side. Extends r56389 fix to object rotate/translate/scale. Revision Links: -------------- http://sourceforge.net/p/brlcad/code/56389 Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-07-31 20:55:09 UTC (rev 56396) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-07-31 21:06:04 UTC (rev 56397) @@ -1581,7 +1581,11 @@ foreach item [gedCmd report 0] { if {[lsearch [split $item /] $obj] != -1} { - gedCmd draw -m$rmode -x$rtrans $item + if { $rmode == $DISPLAY_MODE_HIDDEN } { + gedCmd draw -h $item + } else { + gedCmd draw -m$rmode -x$rtrans $item + } } } } @@ -1593,7 +1597,12 @@ set rdata [gedCmd how -b $obj] set rmode [lindex $rdata 0] set rtrans [lindex $rdata 1] - gedCmd draw -m$rmode -x$rtrans $obj + + if [ $rmode == $DISPLAY_MODE_HIDDEN ] { + gedCmd draw -h $obj + } else { + gedCmd draw -m$rmode -x$rtrans $obj + } } $itk_component(ged) refresh_on This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2013-10-25 13:27:26
|
Revision: 58295 http://sourceforge.net/p/brlcad/code/58295 Author: bob1961 Date: 2013-10-25 13:27:20 +0000 (Fri, 25 Oct 2013) Log Message: ----------- Fixed a bug that breaks ArcherCore::redrawWho. This appears to have been introduced in r56397. Revision Links: -------------- http://sourceforge.net/p/brlcad/code/56397 Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-10-25 12:49:09 UTC (rev 58294) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-10-25 13:27:20 UTC (rev 58295) @@ -1601,7 +1601,7 @@ set rmode [lindex $rdata 0] set rtrans [lindex $rdata 1] - if [ $rmode == $DISPLAY_MODE_HIDDEN ] { + if {$rmode == $DISPLAY_MODE_HIDDEN} { gedCmd draw -h $obj } else { gedCmd draw -m$rmode -x$rtrans $obj This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2013-11-15 15:57:25
|
Revision: 58545 http://sourceforge.net/p/brlcad/code/58545 Author: starseeker Date: 2013-11-15 15:57:22 +0000 (Fri, 15 Nov 2013) Log Message: ----------- Don't change the current working directory by default, since this breaks assumptions being made by bu_argv0_full_path. Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-11-15 13:42:26 UTC (rev 58544) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-11-15 15:57:22 UTC (rev 58545) @@ -2131,8 +2131,6 @@ ::update Load $target - - cd $mLastSelectedDir } ::itcl::body ArcherCore::saveDb {} { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <n_...@us...> - 2014-02-14 01:24:54
|
Revision: 59880 http://sourceforge.net/p/brlcad/code/59880 Author: n_reed Date: 2014-02-14 01:24:49 +0000 (Fri, 14 Feb 2014) Log Message: ----------- Archer was calling search command on startup with empty -name option, causing new db_search to print a warning message. Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-02-13 23:54:52 UTC (rev 59879) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-02-14 01:24:49 UTC (rev 59880) @@ -4971,13 +4971,15 @@ if {$_rflag} { rebuildTree - if {$mEnableListView} { - selectTreePath $mSelectedObj - } else { - if {![catch {set paths [gedCmd search -Q / -name $mSelectedObj]}]} { - if {[llength $paths]} { - selectTreePath [lindex $paths 0] - } + if {$mSelectedObj != ""} { + if {$mEnableListView} { + selectTreePath $mSelectedObj + } else { + if {![catch {set paths [gedCmd search -Q / -name $mSelectedObj]}]} { + if {[llength $paths]} { + selectTreePath [lindex $paths 0] + } + } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <n_...@us...> - 2014-12-17 23:12:57
|
Revision: 63770 http://sourceforge.net/p/brlcad/code/63770 Author: n_reed Date: 2014-12-17 23:12:54 +0000 (Wed, 17 Dec 2014) Log Message: ----------- catch errors from get_type and form commands Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-12-17 21:08:14 UTC (rev 63769) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-12-17 23:12:54 UTC (rev 63770) @@ -4184,18 +4184,17 @@ return } - set ctype [$itk_component(ged) get_type $_ctext] - set isregion [lsearch [$itk_component(ged) form $ctype] region] + set ctype invalid + set isregion 0 - if {$isregion == -1} { - set isregion 0 - } else { - if {[catch {$itk_component(ged) get $_ctext} cgdata]} { - set ctype invalid - set isregion 0 - } else { - set ctype [lindex $cgdata 0] - set isregion [isRegion $cgdata] + if {![catch {$itk_component(ged) get_type $_ctext} ctype]} { + if {![catch {$itk_component(ged) form $ctype} cform]} { + if {[lsearch $cform region] > -1} { + if {![catch {$itk_component(ged) get $_ctext} cgdata]} { + set ctype [lindex $cgdata 0] + set isregion [isRegion $cgdata] + } + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2014-12-18 20:50:59
|
Revision: 63783 http://sourceforge.net/p/brlcad/code/63783 Author: starseeker Date: 2014-12-18 20:50:51 +0000 (Thu, 18 Dec 2014) Log Message: ----------- Try a few more get_type usages - need to check with Nick Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-12-18 19:30:18 UTC (rev 63782) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-12-18 20:50:51 UTC (rev 63783) @@ -689,10 +689,26 @@ variable mImage_arb8Inter "" variable mImage_arb8Sub "" variable mImage_arb8Union "" - variable mImage_arb7Labeled "" - variable mImage_arb6Labeled "" - variable mImage_arb5Labeled "" - variable mImage_arb4Labeled "" + variable mImage_arb7 "" + variable mImage_arb7Labeled "" + variable mImage_arb7Inter "" + variable mImage_arb7Sub "" + variable mImage_arb7Union "" + variable mImage_arb6 "" + variable mImage_arb6Labeled "" + variable mImage_arb6Inter "" + variable mImage_arb6Sub "" + variable mImage_arb6Union "" + variable mImage_arb5 "" + variable mImage_arb5Labeled "" + variable mImage_arb5Inter "" + variable mImage_arb5Sub "" + variable mImage_arb5Union "" + variable mImage_arb4 "" + variable mImage_arb4Labeled "" + variable mImage_arb4Inter "" + variable mImage_arb4Sub "" + variable mImage_arb4Union "" variable mImage_arbn "" variable mImage_arbnLabeled "" variable mImage_arbnInter "" @@ -1776,10 +1792,29 @@ set mImage_arb8Sub [image create photo -file [file join $mImgDir arb8_subtract.png]] set mImage_arb8Union [image create photo -file [file join $mImgDir arb8_union.png]] + set mImage_arb7 [image create photo -file [file join $mImgDir arb7.png]] set mImage_arb7Labeled [image create photo -file [file join $mImgDir arb7_labeled.png]] + set mImage_arb7Inter [image create photo -file [file join $mImgDir arb7_intersect.png]] + set mImage_arb7Sub [image create photo -file [file join $mImgDir arb7_subtract.png]] + set mImage_arb7Union [image create photo -file [file join $mImgDir arb7_union.png]] + + set mImage_arb6 [image create photo -file [file join $mImgDir arb6.png]] set mImage_arb6Labeled [image create photo -file [file join $mImgDir arb6_labeled.png]] + set mImage_arb6Inter [image create photo -file [file join $mImgDir arb6_intersect.png]] + set mImage_arb6Sub [image create photo -file [file join $mImgDir arb6_subtract.png]] + set mImage_arb6Union [image create photo -file [file join $mImgDir arb6_union.png]] + + set mImage_arb5 [image create photo -file [file join $mImgDir arb5.png]] set mImage_arb5Labeled [image create photo -file [file join $mImgDir arb5_labeled.png]] + set mImage_arb5Inter [image create photo -file [file join $mImgDir arb5_intersect.png]] + set mImage_arb5Sub [image create photo -file [file join $mImgDir arb5_subtract.png]] + set mImage_arb5Union [image create photo -file [file join $mImgDir arb5_union.png]] + + set mImage_arb4 [image create photo -file [file join $mImgDir arb4.png]] set mImage_arb4Labeled [image create photo -file [file join $mImgDir arb4_labeled.png]] + set mImage_arb4Inter [image create photo -file [file join $mImgDir arb4_intersect.png]] + set mImage_arb4Sub [image create photo -file [file join $mImgDir arb4_subtract.png]] + set mImage_arb4Union [image create photo -file [file join $mImgDir arb4_union.png]] set mImage_arbn [image create photo -file [file join $mImgDir arbn.png]] set mImage_arbnLabeled [image create photo -file [file join $mImgDir arbn_labeled.png]] @@ -2508,7 +2543,7 @@ set mlist [lreplace $mlist $i $i] - if {[catch {$itk_component(ged) get $ctext} cgdata]} { + if {[catch {$itk_component(ged) get_type $ctext} cgdata]} { # In here, the child node refers to non-existent geometry # so update the image and remove any grandchildren etc. @@ -4584,6 +4619,10 @@ } } } + arb4 - + arb5 - + arb6 - + arb7 - arb8 - arbn - ars - @@ -4745,10 +4784,11 @@ set cnode [$itk_component(newtree) focus] set ctext [$itk_component(newtree) item $cnode -text] - set cgdata [$itk_component(ged) get $ctext] + set cgdata [$itk_component(ged) get_type $ctext] set ctype [lindex $cgdata 0] if {($ctype == "comb" || + $ctype == "region" || $ctype == "dsp" || $ctype == "ebm" || $ctype == "extrude" || @@ -4763,10 +4803,11 @@ unset mPNode2CList($cnode) switch -- $ctype { + "region" - "comb" { #set tree [getTreeFromGData $cgdata] foreach gctext [getTreeMembers $ctext 1] { - if {[catch {$itk_component(ged) get $gctext} gcgdata]} { + if {[catch {$itk_component(ged) get_type $gctext} gcgdata]} { set op [getTreeOp $ctext $gctext] set img [getTreeImage $gctext "invalid" $op] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <n_...@us...> - 2014-12-23 21:49:46
|
Revision: 63837 http://sourceforge.net/p/brlcad/code/63837 Author: n_reed Date: 2014-12-23 21:49:20 +0000 (Tue, 23 Dec 2014) Log Message: ----------- Add a right-click menu to Archer's command window with an entry for pasting the selected path in the tree/list view. Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-12-23 21:40:46 UTC (rev 63836) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-12-23 21:49:20 UTC (rev 63837) @@ -172,6 +172,7 @@ method putString {_str} method rtcntrl {args} method setStatusString {_str} + method getSelectedTreePaths {} # Commands exposed to the user via the command line. # More to be added later... @@ -894,6 +895,7 @@ method treeNodeIsOpen {_node} method purgeNodeData {_node} method updateTreeTopWithName {_name} + method handleCmdPopup {_X _Y} # db/display commands method getNodeChildren {_node} @@ -1408,6 +1410,18 @@ $itk_component(advancedTabs) add $itk_component(cmd) -text "Command" $itk_component(advancedTabs) add $itk_component(history) -text "History" + + itk_component add cmdpopup { + ::menu $itk_component(advancedTabs).cmdmenu \ + -tearoff 0 + } {} + + $itk_component(cmdpopup) add command \ + -label "Paste Selected Path" \ + -command "[$itk_component(cmd) component text] insert insert \ + \[[::itcl::code $this getSelectedTreePaths]\]" + + bind [$itk_component(cmd) component text] <Button-3> [::itcl::code $this handleCmdPopup %X %Y] } ::itcl::body ArcherCore::buildCanvasMenubar {} { @@ -4772,6 +4786,10 @@ return [getTreePath $parent $_path] } +::itcl::body ArcherCore::getSelectedTreePaths {} { + return [getTreePath [$itk_component(newtree) selection]] +} + ::itcl::body ArcherCore::handleTreeClose {} { } @@ -4907,6 +4925,10 @@ tk_popup $itk_component(newtreepopup) $_X $_Y } +::itcl::body ArcherCore::handleCmdPopup {_X _Y} { + tk_popup $itk_component(cmdpopup) $_X $_Y +} + ::itcl::body ArcherCore::handleTreeSelect {} { if {$mDoubleClickActive} { set mDoubleClickActive 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <n_...@us...> - 2014-12-31 17:15:46
|
Revision: 63850 http://sourceforge.net/p/brlcad/code/63850 Author: n_reed Date: 2014-12-31 17:15:38 +0000 (Wed, 31 Dec 2014) Log Message: ----------- remove unused proc Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-12-30 21:52:11 UTC (rev 63849) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-12-31 17:15:38 UTC (rev 63850) @@ -630,7 +630,6 @@ method colorMenuStatusCB {_w} method menuStatusCB {_w} - method menuStatusCB_junk {_w} method transparencyMenuStatusCB {_w} method updateSaveMode {} @@ -5648,120 +5647,6 @@ } } -::itcl::body ArcherCore::menuStatusCB_junk {_w} { - if {$mDoStatus} { - # entry might not support -label (i.e. tearoffs) - if {[catch {$_w entrycget active -label} op]} { - set op "" - } - - switch -- $op { - "Open..." { - set mStatusStr "Open a target description" - } - "Save" { - set mStatusStr "Save the current target description" - } - "Quit" { - set mStatusStr "Exit ArcherCore" - } - "Reset" { - set mStatusStr "Set view to default" - } - "Autoview" { - set mStatusStr "Set view size and center according to what's being displayed" - } - "Center..." { - set mStatusStr "Set the view center" - } - "Front" { - set mStatusStr "Set view to front" - } - "Rear" { - set mStatusStr "Set view to rear" - } - "Port" { - set mStatusStr "Set view to port/left" - } - "Starboard" { - set mStatusStr "Set view to starboard/right" - } - "Top" { - set mStatusStr "Set view to top" - } - "Bottom" { - set mStatusStr "Set view to bottom" - } - "35,25" { - set mStatusStr "Set view to az=35, el=25" - } - "45,45" { - set mStatusStr "Set view to az=45, el=45" - } - "Primary" { - set mStatusStr "Toggle on/off primary toolbar" - } - "View Controls" { - set mStatusStr "Toggle on/off view toolbar" - } - "Status Bar" { - set mStatusStr "Toggle on/off status bar" - } - "Command Window" { - set mStatusStr "Toggle on/off command window" - } - "Upper Left" { - set mStatusStr "Set the active pane to the upper left pane" - } - "Upper Right" { - set mStatusStr "Set the active pane to the upper right pane" - } - "Lower Left" { - set mStatusStr "Set the active pane to the lower left pane" - } - "Lower Right" { - set mStatusStr "Set the active pane to the lower right pane" - } - "Quad View" { - set mStatusStr "Toggle between single and multiple geometry pane mode" - } - "View Axes" { - set mStatusStr "Hide/Show view axes" - } - "Model Axes" { - set mStatusStr "Hide/Show model axes" - } - "File" { - set mStatusStr "" - } - "View" { - set mStatusStr "" - } - "Modes" { - set mStatusStr "" - } - "Help" { - set mStatusStr "" - } - "Wireframe" { - set mStatusStr "Draw object as wireframe" - } - "Shaded" { - set mStatusStr "Draw object as shaded if a bot or polysolid (unevaluated)" - } - "Hidden Line" { - set mStatusStr "Draw object as hidden line" - } - "Off" { - set mStatusStr "Erase object" - } - default { - set mStatusStr "" - } - } - } -} - ::itcl::body ArcherCore::transparencyMenuStatusCB {_w} { if {$mDoStatus} { # entry might not support -label (i.e. tearoffs) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <n_...@us...> - 2015-01-07 21:26:26
|
Revision: 63895 http://sourceforge.net/p/brlcad/code/63895 Author: n_reed Date: 2015-01-07 21:26:24 +0000 (Wed, 07 Jan 2015) Log Message: ----------- move duplicate switches to function Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2015-01-07 21:12:07 UTC (rev 63894) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2015-01-07 21:26:24 UTC (rev 63895) @@ -634,6 +634,7 @@ method colorMenuStatusCB {_w} method menuStatusCB {_w} method transparencyMenuStatusCB {_w} + method setViewTypeFromTreeMode {} method updateSaveMode {} method createTargetCopy {} @@ -2409,6 +2410,31 @@ # ------------------------------------------------------------ # PUBLIC TREE COMMANDS # ------------------------------------------------------------ +::itcl::body ArcherCore::setViewTypeFromTreeMode {} { + switch -- $mTreeMode \ + $TREE_MODE_TREE - \ + $TREE_MODE_COLOR_OBJECTS { + if {$mEnableColorListView} { + set mEnableListView 1 + } else { + set mEnableListView 0 + } + } \ + $TREE_MODE_GHOST_OBJECTS { + if {$mEnableGhostListView} { + set mEnableListView 1 + } else { + set mEnableListView 0 + } + } \ + $TREE_MODE_EDGE_OBJECTS { + if {$mEnableEdgeListView} { + set mEnableListView 1 + } else { + set mEnableListView 0 + } + } +} ::itcl::body ArcherCore::rebuildTree {} { if {$mNoTree || $mFreezeGUI} { @@ -2440,29 +2466,7 @@ set mNodeDrawList "" set mAffectedNodeList "" - switch -- $mTreeMode \ - $TREE_MODE_TREE - \ - $TREE_MODE_COLOR_OBJECTS { - if {$mEnableColorListView} { - set mEnableListView 1 - } else { - set mEnableListView 0 - } - } \ - $TREE_MODE_GHOST_OBJECTS { - if {$mEnableGhostListView} { - set mEnableListView 1 - } else { - set mEnableListView 0 - } - } \ - $TREE_MODE_EDGE_OBJECTS { - if {$mEnableEdgeListView} { - set mEnableListView 1 - } else { - set mEnableListView 0 - } - } + setViewTypeFromTreeMode if {$mEnableListView} { set items [lsort -dictionary [$itk_component(ged) ls]] @@ -5176,29 +5180,7 @@ } } - switch -- $mTreeMode \ - $TREE_MODE_TREE - \ - $TREE_MODE_COLOR_OBJECTS { - if {$mEnableColorListView} { - set mEnableListView 1 - } else { - set mEnableListView 0 - } - } \ - $TREE_MODE_GHOST_OBJECTS { - if {$mEnableGhostListView} { - set mEnableListView 1 - } else { - set mEnableListView 0 - } - } \ - $TREE_MODE_EDGE_OBJECTS { - if {$mEnableEdgeListView} { - set mEnableListView 1 - } else { - set mEnableListView 0 - } - } + setViewTypeFromTreeMode if {$mTreeMode < $TREE_MODE_COLOR_OBJECTS} { if {$mEnableListView} { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2016-01-21 14:34:26
|
Revision: 66933 http://sourceforge.net/p/brlcad/code/66933 Author: bob1961 Date: 2016-01-21 14:34:24 +0000 (Thu, 21 Jan 2016) Log Message: ----------- Minor mod to updateVPaneFractions --- catch call to fraction Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2016-01-20 23:45:10 UTC (rev 66932) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2016-01-21 14:34:24 UTC (rev 66933) @@ -3583,7 +3583,9 @@ return } - set fractions [$itk_component(vpane) fraction] + if {[catch {$itk_component(vpane) fraction} fractions]} { + return + } switch -- [llength $fractions] { 2 { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2016-02-26 15:43:59
|
Revision: 67148 http://sourceforge.net/p/brlcad/code/67148 Author: bob1961 Date: 2016-02-26 15:43:57 +0000 (Fri, 26 Feb 2016) Log Message: ----------- ArcherCore::OpenTarget needed a "global" statement for tcl_platform. Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2016-02-26 15:41:10 UTC (rev 67147) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2016-02-26 15:43:57 UTC (rev 67148) @@ -5344,6 +5344,8 @@ # GENERAL # ------------------------------------------------------------ ::itcl::body ArcherCore::OpenTarget {target} { + global tcl_platform + set mTarget $target set mDbType "BRL-CAD" set mCopyObj "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2016-04-21 13:34:52
|
Revision: 67708 http://sourceforge.net/p/brlcad/code/67708 Author: bob1961 Date: 2016-04-21 13:34:49 +0000 (Thu, 21 Apr 2016) Log Message: ----------- Simplified ArcherCore::getTreeMembers Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2016-04-21 04:49:17 UTC (rev 67707) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2016-04-21 13:34:49 UTC (rev 67708) @@ -3755,25 +3755,20 @@ return "" } - set i 0 + set tlist [$itk_component(ged) lt -c " " $_comb] + set tlen [llength $tlist] - set tlist {} - foreach item [regsub -all {/|/R} [lrange [split [$itk_component(ged) tree -d 1 $_comb] "\n"] 1 end-1] ""] { - lappend tlist [lindex $item 1] - incr i + if {$tlen >= $mMaxCombMembersShown} { + if {$_wflag} { + set j [lsearch $mCombWarningList $_comb] - if {$i >= $mMaxCombMembersShown} { - if {$_wflag} { - set j [lsearch $mCombWarningList $_comb] - - if {$j == -1} { - tk_messageBox -message "Warning: not all members of $_comb will be visible in the tree. See the \"Max Comb Members Shown\" preference." - lappend mCombWarningList $_comb - } + if {$j == -1} { + tk_messageBox -message "Warning: not all members of $_comb will be visible in the tree. See the \"Max Comb Members Shown\" preference." + lappend mCombWarningList $_comb } + } - break - } + set tlist [lrange $tlist 0 $mMaxCombMembersShown-1] } return $tlist @@ -5133,7 +5128,7 @@ if {$mSelectedObj != ""} { if {$mEnableListView} { - selectTreePath $mSelectedObj + selectTreePath $mSelectedObj } else { if {![catch {set paths [gedCmd search -Q / -name $mSelectedObj]}]} { if {[llength $paths]} { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2016-05-11 18:16:09
|
Revision: 67867 http://sourceforge.net/p/brlcad/code/67867 Author: bob1961 Date: 2016-05-11 18:16:07 +0000 (Wed, 11 May 2016) Log Message: ----------- Modify ArcherCore::saveDb to set the modified time of mTargetCopy before saving to mTarget. Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2016-05-11 02:14:41 UTC (rev 67866) +++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2016-05-11 18:16:07 UTC (rev 67867) @@ -2260,7 +2260,9 @@ } set mTarget $target - file copy -force $mTargetCopy $mTarget + set t [::clock seconds] + ::file mtime $mTargetCopy $t + ::file copy -force $mTargetCopy $mTarget } ::itcl::body ArcherCore::exportDb {} { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |