Revision: 34241
http://brlcad.svn.sourceforge.net/brlcad/?rev=34241&view=rev
Author: bob1961
Date: 2009-04-16 20:05:23 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
Updates related to Archer's view-only mode.
Modified Paths:
--------------
brlcad/trunk/src/archer/archer
brlcad/trunk/src/tclscripts/archer/Archer.tcl
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/archer/archer
===================================================================
--- brlcad/trunk/src/archer/archer 2009-04-16 14:31:11 UTC (rev 34240)
+++ brlcad/trunk/src/archer/archer 2009-04-16 20:05:23 UTC (rev 34241)
@@ -69,13 +69,13 @@
}
set env(ARCHER_HOME) $dir
-# Decide on a parent class for Archer
-#namespace eval Archer {
-# if {1} {
+# Decide on a parent class for ArcherCore
+#namespace eval ArcherCore {
+# if {0} {
# set parentClass itk::Toplevel
# set inheritFromToplevel 1
# } else {
-# set parentClass TabWindow
+# set parentClass itk::Widget
# set inheritFromToplevel 0
# }
#}
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2009-04-16 14:31:11 UTC
(rev 34240)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2009-04-16 20:05:23 UTC
(rev 34241)
@@ -846,14 +846,14 @@
buildGroundPlane
showGroundPlane
-
- # refresh tree contents
- refreshTree 0
} else {
applyPreferences
doLighting
}
+ # refresh tree contents
+ refreshTree 0
+
if {$mBindingMode == 0} {
set mDefaultBindingMode $ROTATE_MODE
beginViewRotate
@@ -1046,11 +1046,16 @@
ArcherCore::initDefaultBindings $_comp
- if {!$mViewOnly} {
- foreach dname {ul ur ll lr} {
- set dm [$_comp component $dname]
- set win [$dm component dm]
+ foreach dname {ul ur ll lr} {
+ set dm [$_comp component $dname]
+ set win [$dm component dm]
+ if {$mViewOnly} {
+ bind $win <Control-ButtonPress-1> \
+ "[::itcl::code $this launchDisplayMenuBegin $dm
[$itk_component(canvas_menu) component view-menu] %X %Y]; break"
+ bind $win <3> \
+ "[::itcl::code $this launchDisplayMenuBegin $dm
[$itk_component(canvas_menu) component view-menu] %X %Y]; break"
+ } else {
if {$ArcherCore::inheritFromToplevel} {
bind $win <Control-ButtonPress-1> \
"[::itcl::code $this launchDisplayMenuBegin $dm
$itk_component(displaymenu) %X %Y]; break"
@@ -2144,7 +2149,7 @@
::itcl::body Archer::buildToplevelMenubar {} {
itk_component add menubar {
- menu $itk_interior.menubar \
+ ::menu $itk_interior.menubar \
-tearoff 0
} {
keep -background
@@ -2183,7 +2188,7 @@
-command [::itcl::code $this Close]
itk_component add displaymenu {
- menu $itk_component(menubar).displaymenu \
+ ::menu $itk_component(menubar).displaymenu \
-tearoff 0
} {
keep -background
@@ -2202,7 +2207,7 @@
-state disabled
itk_component add backgroundmenu {
- menu $itk_component(displaymenu).backgroundmenu \
+ ::menu $itk_component(displaymenu).backgroundmenu \
-tearoff 0
} {
keep -background
@@ -2228,7 +2233,7 @@
-state normal
itk_component add stdviewsmenu {
- menu $itk_component(displaymenu).stdviewsmenu \
+ ::menu $itk_component(displaymenu).stdviewsmenu \
-tearoff 0
} {
keep -background
@@ -2275,14 +2280,14 @@
updateUtilityMenu
itk_component add raytracemenu {
- menu $itk_component(menubar).raytracemenu \
+ ::menu $itk_component(menubar).raytracemenu \
-tearoff 0
} {
keep -background
}
itk_component add rtmenu {
- menu $itk_component(raytracemenu).rtmenu \
+ ::menu $itk_component(raytracemenu).rtmenu \
-tearoff 0
} {
keep -background
@@ -2298,7 +2303,7 @@
-command [::itcl::code $this launchRtApp rt window]
itk_component add rtcheckmenu {
- menu $itk_component(raytracemenu).rtcheckmenu \
+ ::menu $itk_component(raytracemenu).rtcheckmenu \
-tearoff 0
} {
keep -background
@@ -2317,7 +2322,7 @@
-command [::itcl::code $this launchRtApp rtcheck 512]
itk_component add rtedgemenu {
- menu $itk_component(raytracemenu).rtedgemenu \
+ ::menu $itk_component(raytracemenu).rtedgemenu \
-tearoff 0
} {
keep -background
@@ -2351,7 +2356,7 @@
-state disabled
itk_component add helpmenu {
- menu $itk_component(menubar).helpmenu \
+ ::menu $itk_component(menubar).helpmenu \
-tearoff 0
} {
# rename -font -menuFont menuFont MenuFont
@@ -3472,9 +3477,6 @@
updateVPaneFractions
}
- set itk_option(-primaryToolbar) 1
- doPrimaryToolbar
-
if {$ArcherCore::inheritFromToplevel == 0} {
pack forget $itk_component(menubar)
::itcl::delete object $itk_component(menubar)
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2009-04-16 14:31:11 UTC
(rev 34240)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2009-04-16 20:05:23 UTC
(rev 34241)
@@ -39,12 +39,9 @@
namespace eval ArcherCore {
set cursorWaitCount 0
- if {1} {
+ if {![info exists parentClass]} {
set parentClass itk::Toplevel
set inheritFromToplevel 1
- } else {
- set parentClass itk::Widget
- set inheritFromToplevel 0
}
}
@@ -53,9 +50,6 @@
itk_option define -quitcmd quitCmd Command {}
itk_option define -master master Master "."
- itk_option define -primaryToolbar primaryToolbar PrimaryToolbar 1
- itk_option define -viewToolbar viewToolbar ViewToolbar 1
- itk_option define -statusbar statusbar Statusbar 1
constructor {{_viewOnly 0} {_noCopy 0} args} {}
destructor {}
@@ -484,11 +478,6 @@
method primaryToolbarAdd {_type _name {args ""}}
method primaryToolbarRemove {_index}
- # private window commands
- method doPrimaryToolbar {}
- method doViewToolbar {}
- method doStatusBar {}
-
# tree commands
method alterTreeNodeChildren {node option value}
method toggleTreePath {_path}
@@ -603,7 +592,6 @@
if {[llength $args] == 1} {
set args [lindex $args 0]
-
}
set mDisplayType [dm_bestXType $env(DISPLAY)]
@@ -684,8 +672,8 @@
} else {
$itk_component(vpane) add geomView
$itk_component(vpane) paneconfigure geomView \
- -margin 0
- $itk_component(vpane) hide hierarchyView
+ -margin 0 \
+ -minimum 0
}
# frame for all geometry canvas's
@@ -696,42 +684,16 @@
-relief sunken
} {}
-# if {!$mViewOnly}
- if {0} {
- itk_component add tree_expand {
- ::button $itk_component(canvasF).tree_expand
- } {}
- $itk_component(tree_expand) configure \
- -relief flat \
- -image [image create photo -file \
- [file join $mImgDir Themes $mTheme "pane_blank.png"]] \
- -state disabled \
- -command [::itcl::code $this toggleTreeView "open"] \
- -background $LABEL_BACKGROUND_COLOR
-
- itk_component add canvas_menu {
- ::iwidgets::menubar $itk_component(canvasF).canvas_menu \
- -helpvariable [::itcl::scope mStatusStr] \
- -font $mFontText \
- -activeborderwidth 2 \
- -borderwidth 0 \
- -activebackground $SystemHighlight \
- -activeforeground $SystemHighlightText \
- } {
- keep -background
- }
- } else {
- itk_component add canvas_menu {
- ::iwidgets::menubar $itk_component(canvasF).canvas_menu \
- -helpvariable [::itcl::scope mStatusStr] \
- -font $mFontText \
- -activeborderwidth 2 \
- -borderwidth 0 \
- -activebackground $SystemHighlight \
- -activeforeground $SystemHighlightText \
- } {
- keep -background
- }
+ itk_component add canvas_menu {
+ ::iwidgets::menubar $itk_component(canvasF).canvas_menu \
+ -helpvariable [::itcl::scope mStatusStr] \
+ -font $mFontText \
+ -activeborderwidth 2 \
+ -borderwidth 0 \
+ -activebackground $SystemHighlight \
+ -activeforeground $SystemHighlightText
+ } {
+ keep -background
}
buildCanvasMenubar
@@ -825,6 +787,7 @@
pack $itk_component(east) -side right -fill y
if {!$mViewOnly} {
pack $itk_component(advancedTabs) -fill both -expand yes
+ pack $itk_component(statusF) -before $itk_component(south) -side bottom
-fill x
}
pack $itk_component(tree) -fill both -expand yes
pack $itk_component(hpane) -fill both -expand yes
@@ -893,41 +856,10 @@
# ------------------------------------------------------------
# OPTIONS
# ------------------------------------------------------------
-::itcl::configbody ArcherCore::primaryToolbar {
- if {!$mViewOnly} {
- if {$itk_option(-primaryToolbar)} {
- pack $itk_component(primaryToolbar) \
- -before $itk_component(north) \
- -side top \
- -fill x \
- -pady 2
- } else {
- pack forget $itk_component(primaryToolbar)
- }
- }
-}
-::itcl::configbody ArcherCore::viewToolbar {
- return
- if {!$mViewOnly} {
- if {$itk_option(-viewToolbar)} {
- pack $itk_component(viewToolbar) -expand yes -fill both
- } else {
- pack forget $itk_component(viewToolbar)
- }
- }
-}
-::itcl::configbody ArcherCore::statusbar {
- if {!$mViewOnly} {
- if {$itk_option(-statusbar)} {
- pack $itk_component(statusF) -before $itk_component(south) -side
bottom -fill x
- } else {
- pack forget $itk_component(statusF)
- }
- }
-}
+
::itcl::body ArcherCore::handleMoreArgs {args} {
eval $itk_component(cmd) print_more_args_prompt $args
return [$itk_component(cmd) get_more_args]
@@ -1237,7 +1169,7 @@
# RT Control Panel
itk_component add rtcntrl {
- RtControl $itk_interior.rtcp -mged $itk_component(ged)
+ RtControl $itk_interior.rtcp -mged $itk_component(ged) -tearoff 0
} {
usual
}
@@ -1270,8 +1202,7 @@
# Other bindings for mged
#bind $itk_component(ged) <Enter> {focus %W}
-# if {!$mViewOnly}
- if {0} {
+ if {$mViewOnly} {
$itk_component(canvas_menu) menuconfigure .raytrace.rt \
-state normal
$itk_component(canvas_menu) menuconfigure .raytrace.rt.fivetwelve \
@@ -1300,25 +1231,23 @@
-state normal
$itk_component(canvas_menu) menuconfigure .raytrace.nirt \
-state normal
- }
- if {0} {
- $itk_component(canvas_menu) menuconfigure .view.front \
- -state normal
- $itk_component(canvas_menu) menuconfigure .view.rear \
- -state normal
- $itk_component(canvas_menu) menuconfigure .view.port \
- -state normal
- $itk_component(canvas_menu) menuconfigure .view.starboard \
- -state normal
- $itk_component(canvas_menu) menuconfigure .view.top \
- -state normal
- $itk_component(canvas_menu) menuconfigure .view.bottom \
- -state normal
- $itk_component(canvas_menu) menuconfigure .view.35,25 \
- -state normal
- $itk_component(canvas_menu) menuconfigure .view.45,45 \
- -state normal
+ $itk_component(canvas_menu) menuconfigure .view.front \
+ -state normal
+ $itk_component(canvas_menu) menuconfigure .view.rear \
+ -state normal
+ $itk_component(canvas_menu) menuconfigure .view.port \
+ -state normal
+ $itk_component(canvas_menu) menuconfigure .view.starboard \
+ -state normal
+ $itk_component(canvas_menu) menuconfigure .view.top \
+ -state normal
+ $itk_component(canvas_menu) menuconfigure .view.bottom \
+ -state normal
+ $itk_component(canvas_menu) menuconfigure .view.35,25 \
+ -state normal
+ $itk_component(canvas_menu) menuconfigure .view.45,45 \
+ -state normal
}
bind $itk_component(canvasF) <Configure> [::itcl::code $this
updateRtControl]
@@ -1439,17 +1368,7 @@
# ------------------------------------------------------------
# WINDOW COMMANDS
# ------------------------------------------------------------
-::itcl::body ArcherCore::doPrimaryToolbar {} {
- configure -primaryToolbar $itk_option(-primaryToolbar)
-}
-::itcl::body ArcherCore::doViewToolbar {} {
-}
-
-::itcl::body ArcherCore::doStatusBar {} {
- configure -statusbar $itk_option(-statusbar)
-}
-
::itcl::body ArcherCore::dockArea {{position "south"}} {
switch -- $position {
"north" -
@@ -1657,6 +1576,20 @@
$itk_component(primaryToolbar) itemconfigure measure -state disabled
eval pack configure [pack slaves $itk_component(primaryToolbar)] -padx 2
+
+ if {$mViewOnly} {
+ grid $itk_component(primaryToolbar) \
+ -row 0 \
+ -column 0 \
+ -in $itk_component(canvasF) \
+ -sticky e
+ } else {
+ pack $itk_component(primaryToolbar) \
+ -before $itk_component(north) \
+ -side top \
+ -fill x \
+ -pady 2
+ }
}
::itcl::body ArcherCore::beginViewRotate {} {
@@ -3204,7 +3137,7 @@
::itcl::body ArcherCore::launchRtApp {app size} {
global tcl_platform
- if {![info exists itk_component(ged)] || $mViewOnly} {
+ if {![info exists itk_component(ged)]} {
return
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
