Changeset 1228

Timestamp:

Nov 24, 2008 9:48:03 AM (15 years ago)

Author:

gah

Message:

Fixes for parallel makes

Location:

trunk

Files:

• Makefile.in (modified) (2 diffs)
• gui/scripts/heightmapviewer.tcl (modified) (40 diffs)
• gui/scripts/molvisviewer.tcl (modified) (3 diffs)
• gui/scripts/nanovisviewer.tcl (modified) (46 diffs)
• gui/scripts/visviewer.tcl (modified) (1 diff)
• lang/matlab/Makefile.in (modified) (1 diff)
• packages/vizservers/nanovis/Makefile.in (modified) (1 diff)
• src/Makefile.in (modified) (1 diff)

trunk/Makefile.in

@@ -35 +35 @@
 
 ifneq ($(ENABLE_GUI),)
-  TARGETS += gui lang examples lib
+  TARGETS += gui lang lib examples
 endif
 
+.NOTPARALLEL:
 
 .PHONY: $(TARGETS)
@@ -45 +46 @@
 src:
         $(MAKE) -C src all
-gui:
+gui: 
         $(MAKE) -C gui all
-lang:
+lang: 
         $(MAKE) -C lang all
-lib:
+examples: 
+        $(MAKE) -C examples all
+lib: 
         $(MAKE) -C lib all
-examples:
-        $(MAKE) -C examples all
-test:
+test: 
         #$(MAKE) -C test all
 

trunk/gui/scripts/heightmapviewer.tcl

@@ -53 +53 @@
         Rappture::VisViewer::SetServerList "nanovis" $namelist
     }
-    public method isconnected {}
     public method add {dataobj {settings ""}}
     public method get {args}
@@ -67 +66 @@
     protected method _send {string}
     protected method _send_dataobjs {}
-    protected method _receive_image {option size}
-    protected method ReceiveLegend {ivol vmin vmax size}
+    protected method ReceiveImage {option size}
+    private method ReceiveLegend {ivol vmin vmax size}
     protected method _receive_echo {channel {data ""}}
 
@@ -81 +80 @@
 
 
-    private variable _outbuf       ;# buffer for outgoing commands
-
-    private variable _dlist ""     ;# list of data objects
-    private variable _dims ""      ;# dimensionality of data objects
-    private variable _obj2style    ;# maps dataobj => style settings
-    private variable _obj2ovride   ;# maps dataobj => style override
-    private variable _obj2id       ;# maps dataobj => heightmap ID in server
-    private variable _id2obj       ;# maps heightmap ID => dataobj in server
-    private variable _sendobjs ""  ;# list of data objs to send to server
-    private variable _receiveids   ;# list of data responses from the server
-    private variable _click        ;# info used for _rotate operations
-    private variable _limits       ;# autoscale min/max for all axes
-    private variable _view         ;# view params for 3D view
-
-    private common _settings      ;# Array used for checkbuttons and radiobuttons
+    private variable outbuf_       ;# buffer for outgoing commands
+
+    private variable dlist_ ""     ;# list of data objects
+    private variable obj2style_    ;# maps dataobj => style settings
+    private variable obj2ovride_   ;# maps dataobj => style override
+    private variable obj2id_       ;# maps dataobj => heightmap ID in server
+    private variable id2obj_       ;# maps heightmap ID => dataobj in server
+    private variable sendobjs_ ""  ;# list of data objs to send to server
+    private variable receiveIds_   ;# list of data responses from the server
+    private variable click_        ;# info used for _rotate operations
+    private variable limits_       ;# autoscale min/max for all axes
+    private variable view_         ;# view params for 3D view
+
+    private common settings_      ;# Array used for checkbuttons and radiobuttons
                         
 }
@@ -120 +118 @@
     $_dispatcher dispatch $this !rebuild "[itcl::code $this _rebuild]; list"
 
-    set _outbuf ""
+    set outbuf_ ""
 
     #
     # Populate parser with commands handle incoming requests
     #
-    $_parser alias image [itcl::code $this _receive_image]
+    $_parser alias image [itcl::code $this ReceiveImage]
     $_parser alias legend [itcl::code $this ReceiveLegend]
 
     # Initialize the view to some default parameters.
-    array set _view {
+    array set view_ {
         theta   45
         phi     45
@@ -138 +136 @@
         zfocus  0
     }
-    set _obj2id(count) 0
+    set obj2id_(count) 0
 
     itk_component add zoom {
@@ -211 +209 @@
     set fg [option get $itk_component(hull) font Font]
     
-    set ::Rappture::HeightmapViewer::_settings($this-grid) 1
+    set ::Rappture::HeightmapViewer::settings_($this-grid) 1
     ::checkbutton $inner.f.grid \
         -text "Grid" \
-        -variable ::Rappture::HeightmapViewer::_settings($this-grid) \
+        -variable ::Rappture::HeightmapViewer::settings_($this-grid) \
         -command [itcl::code $this _fixSettings grid]
     grid $inner.f.grid -row 0 -column 0 -sticky w
 
-    set ::Rappture::HeightmapViewer::_settings($this-axes) 0
+    set ::Rappture::HeightmapViewer::settings_($this-axes) 0
     ::checkbutton $inner.f.axes \
         -text "Axes" \
-        -variable ::Rappture::HeightmapViewer::_settings($this-axes) \
+        -variable ::Rappture::HeightmapViewer::settings_($this-axes) \
         -command [itcl::code $this _fixSettings axes]
     grid $inner.f.axes -row 1 -column 0 -sticky w
 
-    set ::Rappture::HeightmapViewer::_settings($this-contourlines) 1
+    set ::Rappture::HeightmapViewer::settings_($this-contourlines) 1
     ::checkbutton $inner.f.contour \
         -text "Contour Lines" \
-        -variable ::Rappture::HeightmapViewer::_settings($this-contourlines) \
+        -variable ::Rappture::HeightmapViewer::settings_($this-contourlines) \
         -command [itcl::code $this _fixSettings contourlines]
     grid $inner.f.contour -row 2 -column 0 -sticky w
 
-    set ::Rappture::HeightmapViewer::_settings($this-wireframe) "fill"
+    set ::Rappture::HeightmapViewer::settings_($this-wireframe) "fill"
     ::checkbutton $inner.f.wireframe \
         -text "Wireframe" \
         -onvalue "wireframe" -offvalue "fill" \
-        -variable ::Rappture::HeightmapViewer::_settings($this-wireframe) \
+        -variable ::Rappture::HeightmapViewer::settings_($this-wireframe) \
         -command [itcl::code $this _fixSettings wireframe]
     grid $inner.f.wireframe -row 3 -column 0 -sticky w
 
-    set ::Rappture::HeightmapViewer::_settings($this-shading) "smooth"
+    set ::Rappture::HeightmapViewer::settings_($this-shading) "smooth"
     ::checkbutton $inner.f.shading \
         -text "Flat Shading" \
         -onvalue "flat" -offvalue "smooth" \
-        -variable ::Rappture::HeightmapViewer::_settings($this-shading) \
+        -variable ::Rappture::HeightmapViewer::settings_($this-shading) \
         -command [itcl::code $this _fixSettings shading]
     grid $inner.f.shading -row 4 -column 0 -sticky w
@@ -261 +259 @@
         [list $_dispatcher event -idle !legend]
 
-    # set up bindings for rotation
+    # Bindings for rotation via mouse
     bind $itk_component(3dview) <ButtonPress-1> \
         [itcl::code $this _rotate click %x %y]
@@ -271 +269 @@
         [itcl::code $this _send "screen %w %h"]
 
+    # Bindings for panning via mouse
     bind $itk_component(3dview) <ButtonPress-2> \
         [itcl::code $this _pan click %x %y]
@@ -278 +277 @@
         [itcl::code $this _pan release %x %y]
 
+    # Bindings for panning via keyboard
+    bind $itk_component(3dview) <KeyPress-Left> \
+        [itcl::code $this _pan set -10 0]
+    bind $itk_component(3dview) <KeyPress-Right> \
+        [itcl::code $this _pan set 10 0]
+    bind $itk_component(3dview) <KeyPress-Up> \
+        [itcl::code $this _pan set 0 -10]
+    bind $itk_component(3dview) <KeyPress-Down> \
+        [itcl::code $this _pan set 0 10]
+    bind $itk_component(3dview) <Shift-KeyPress-Left> \
+        [itcl::code $this _pan set -2 0]
+    bind $itk_component(3dview) <Shift-KeyPress-Right> \
+        [itcl::code $this _pan set 2 0]
+    bind $itk_component(3dview) <Shift-KeyPress-Up> \
+        [itcl::code $this _pan set 0 -2]
+    bind $itk_component(3dview) <Shift-KeyPress-Down> \
+        [itcl::code $this _pan set 0 2]
+
+    # Bindings for zoom via keyboard
+    bind $itk_component(3dview) <KeyPress-Prior> \
+        [itcl::code $this _zoom out]
+    bind $itk_component(3dview) <KeyPress-Next> \
+        [itcl::code $this _zoom in]
+
+    bind $itk_component(3dview) <Enter> "focus $itk_component(3dview)"
+
     if {[string equal "x11" [tk windowingsystem]]} {
+        # Bindings for zoom via mouse
         bind $itk_component(3dview) <4> [itcl::code $this _zoom out]
         bind $itk_component(3dview) <5> [itcl::code $this _zoom in]
@@ -294 +320 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::HeightmapViewer::destructor {} {
-    set _sendobjs ""  ;# stop any send in progress
+    set sendobjs_ ""  ;# stop any send in progress
     $_dispatcher cancel !rebuild
     $_dispatcher cancel !send_dataobjs
@@ -330 +356 @@
     }
 
-    set pos [lsearch -exact $dataobj $_dlist]
+    set pos [lsearch -exact $dataobj $dlist_]
     if {$pos < 0} {
-        lappend _dlist $dataobj
-        set _obj2ovride($dataobj-color) $params(-color)
-        set _obj2ovride($dataobj-width) $params(-width)
-        set _obj2ovride($dataobj-raise) $params(-raise)
+        lappend dlist_ $dataobj
+        set obj2ovride_($dataobj-color) $params(-color)
+        set obj2ovride_($dataobj-width) $params(-width)
+        set obj2ovride_($dataobj-raise) $params(-raise)
         $_dispatcher event -idle !rebuild
     }
@@ -357 +383 @@
       -objects {
         # put the dataobj list in order according to -raise options
-        set dlist $_dlist
+        set dlist $dlist_
         foreach obj $dlist {
-            if { [info exists _obj2ovride($obj-raise)] && 
-                 $_obj2ovride($obj-raise)} {
+            if { [info exists obj2ovride_($obj-raise)] && 
+                 $obj2ovride_($obj-raise)} {
                 set i [lsearch -exact $dlist $obj]
                 if {$i >= 0} {
@@ -400 +426 @@
 itcl::body Rappture::HeightmapViewer::delete {args} {
     if {[llength $args] == 0} {
-        set args $_dlist
+        set args $dlist_
     }
 
@@ -406 +432 @@
     set changed 0
     foreach dataobj $args {
-        set pos [lsearch -exact $_dlist $dataobj]
+        set pos [lsearch -exact $dlist_ $dataobj]
         if {$pos >= 0} {
-            set _dlist [lreplace $_dlist $pos $pos]
-            foreach key [array names _obj2ovride $dataobj-*] {
-                unset _obj2ovride($key)
+            set dlist_ [lreplace $dlist_ $pos $pos]
+            foreach key [array names obj2ovride_ $dataobj-*] {
+                unset obj2ovride_($key)
             }
             set changed 1
@@ -433 +459 @@
 itcl::body Rappture::HeightmapViewer::scale {args} {
     foreach val {xmin xmax ymin ymax zmin zmax vmin vmax} {
-        set _limits($val) ""
+        set limits_($val) ""
     }
     foreach obj $args {
@@ -439 +465 @@
             foreach {min max} [$obj limits $axis] break
             if {"" != $min && "" != $max} {
-                if {"" == $_limits(${axis}min)} {
-                    set _limits(${axis}min) $min
-                    set _limits(${axis}max) $max
+                if {"" == $limits_(${axis}min)} {
+                    set limits_(${axis}min) $min
+                    set limits_(${axis}max) $max
                 } else {
-                    if {$min < $_limits(${axis}min)} {
-                        set _limits(${axis}min) $min
+                    if {$min < $limits_(${axis}min)} {
+                        set limits_(${axis}min) $min
                     }
-                    if {$max > $_limits(${axis}max)} {
-                        set _limits(${axis}max) $max
+                    if {$max > $limits_(${axis}max)} {
+                        set limits_(${axis}max) $max
                     }
                 }
@@ -501 +527 @@
 
 # ----------------------------------------------------------------------
-# USAGE: isconnected
-#
-# Clients use this method to see if we are currently connected to
-# a server.
-# ----------------------------------------------------------------------
-itcl::body Rappture::HeightmapViewer::isconnected {} {
-    return [VisViewer::IsConnected]
-}
-
-# ----------------------------------------------------------------------
 # USAGE: Connect ?<host:port>,<host:port>...?
 #
@@ -536 +552 @@
     VisViewer::Disconnect
 
-    set _outbuf ""
+    set outbuf_ ""
     # disconnected -- no more data sitting on server
-    catch {unset _obj2id}
-    array unset _id2obj
-    set _obj2id(count) 0
-    set _id2obj(cound) 0
-    set _sendobjs ""
+    catch {unset obj2id_}
+    array unset id2obj_
+    set obj2id_(count) 0
+    set id2obj_(cound) 0
+    set sendobjs_ ""
 }
 
@@ -553 +569 @@
 #
 itcl::body Rappture::HeightmapViewer::_send {string} {
-    if {[llength $_sendobjs] > 0} {
-        append _outbuf $string "\n"
+    if {[llength $sendobjs_] > 0} {
+        append outbuf_ $string "\n"
     } else {
         if {[SendBytes $string]} {
@@ -575 +591 @@
 
     # Reset the overall limits 
-    if { $_sendobjs != "" } {
-        set _limits(vmin) ""
-        set _limits(vmax) ""
-    }
-    foreach dataobj $_sendobjs {
+    if { $sendobjs_ != "" } {
+        set limits_(vmin) ""
+        set limits_(vmax) ""
+    }
+    foreach dataobj $sendobjs_ {
         foreach comp [$dataobj components] {
             set data [$dataobj blob $comp]
 
             foreach { vmin vmax }  [$dataobj limits v] break
-            if { $_limits(vmin) == "" || $vmin < $_limits(vmin) } {
-                set _limits(vmin) $vmin
-            }
-            if { $_limits(vmax) == "" || $vmax > $_limits(vmax) } {
-                set _limits(vmax) $vmax
+            if { $limits_(vmin) == "" || $vmin < $limits_(vmin) } {
+                set limits_(vmin) $vmin
+            }
+            if { $limits_(vmax) == "" || $vmax > $limits_(vmax) } {
+                set limits_(vmax) $vmax
             }
 
@@ -600 +616 @@
                 return
             }
-            set id $_obj2id(count)
-            incr _obj2id(count)
-            set _id2obj($id) [list $dataobj $comp]
-            set _obj2id($dataobj-$comp) $id
-            set _receiveids($id) 1
+            set id $obj2id_(count)
+            incr obj2id_(count)
+            set id2obj_($id) [list $dataobj $comp]
+            set obj2id_($dataobj-$comp) $id
+            set receiveIds_($id) 1
 
             #
@@ -615 +631 @@
                 return
             }
-            set _obj2style($dataobj-$comp) $sname
-        }
-    }
-    set _sendobjs ""
+            set obj2style_($dataobj-$comp) $sname
+        }
+    }
+    set sendobjs_ ""
     blt::busy release $itk_component(hull)
 
@@ -630 +646 @@
     }
 
-    foreach key [array names _obj2id *-*] {
+    foreach key [array names obj2id_ *-*] {
         set state [string match $first-* $key]
-        _send "heightmap data visible $state $_obj2id($key)"
-        if {[info exists _obj2style($key)]} {
-            _send "heightmap transfunc $_obj2style($key) $_obj2id($key)"
+        _send "heightmap data visible $state $obj2id_($key)"
+        if {[info exists obj2style_($key)]} {
+            _send "heightmap transfunc $obj2style_($key) $obj2id_($key)"
         }
     }
 
     # if there are any commands in the buffer, send them now that we're done
-    SendBytes $_outbuf
-    set _outbuf ""
+    SendBytes $outbuf_
+    set outbuf_ ""
 
     $_dispatcher event -idle !legend
@@ -646 +662 @@
 
 # ----------------------------------------------------------------------
-# USAGE: _receive_image -bytes <size>
+# USAGE: ReceiveImage -bytes <size>
 #
 # Invoked automatically whenever the "image" command comes in from
@@ -652 +668 @@
 # specified <size> will follow.
 # ----------------------------------------------------------------------
-itcl::body Rappture::HeightmapViewer::_receive_image {option size} {
-    if {[isconnected]} {
+itcl::body Rappture::HeightmapViewer::ReceiveImage {option size} {
+    if {[IsConnected]} {
         set bytes [ReceiveBytes $size]
         $_image(plot) configure -data $bytes
@@ -668 +684 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::HeightmapViewer::ReceiveLegend {ivol vmin vmax size} {
-    if { [isconnected] } {
+    if { [IsConnected] } {
         set bytes [ReceiveBytes $size]
         $_image(legend) configure -data $bytes
@@ -701 +717 @@
 itcl::body Rappture::HeightmapViewer::_rebuild {} {
     # in the midst of sending data? then bail out
-    if {[llength $_sendobjs] > 0} {
+    if {[llength $sendobjs_] > 0} {
         return
     }
     # Find any new data that needs to be sent to the server.  Queue this up on
-    # the _sendobjs list, and send it out a little at a time.  Do this first,
+    # the sendobjs_ list, and send it out a little at a time.  Do this first,
     # before we rebuild the rest.
     foreach dataobj [get] {
         set comp [lindex [$dataobj components] 0]
-        if {![info exists _obj2id($dataobj-$comp)]} {
-            set i [lsearch -exact $_sendobjs $dataobj]
+        if {![info exists obj2id_($dataobj-$comp)]} {
+            set i [lsearch -exact $sendobjs_ $dataobj]
             if {$i < 0} {
-                lappend _sendobjs $dataobj
-            }
-        }
-    }
-    if {[llength $_sendobjs] > 0} {
+                lappend sendobjs_ $dataobj
+            }
+        }
+    }
+    if {[llength $sendobjs_] > 0} {
         # Send off new data objects
         $_dispatcher event -idle !send_dataobjs
@@ -728 +744 @@
             }
         }
-        foreach key [array names _obj2id *-*] {
+        foreach key [array names obj2id_ *-*] {
             set state [string match $first-* $key]
-            _send "heightmap data visible $state $_obj2id($key)"
-            if {[info exists _obj2style($key)]} {
-                _send "heightmap transfunc $_obj2style($key) $_obj2id($key)"
+            _send "heightmap data visible $state $obj2id_($key)"
+            if {[info exists obj2style_($key)]} {
+                _send "heightmap transfunc $obj2style_($key) $obj2id_($key)"
             }
         }
@@ -744 +760 @@
 
     # Reset the camera and other view parameters
-    set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
+    set xyz [Euler2XYZ $view_(theta) $view_(phi) $view_(psi)]
     _send "camera angle $xyz"
-    _send "camera zoom $_view(zoom)"
+    _send "camera zoom $view_(zoom)"
 
      if {"" == $itk_option(-plotoutline)} {
@@ -769 +785 @@
     switch -- $option {
         "in" {
-            set _view(zoom) [expr {$_view(zoom)*1.25}]
+            set view_(zoom) [expr {$view_(zoom)*1.25}]
         }
         "out" {
-            set _view(zoom) [expr {$_view(zoom)*0.8}]
+            set view_(zoom) [expr {$view_(zoom)*0.8}]
         }
         "reset" {
-            array set _view {
+            array set view_ {
                 theta   45
                 phi     45
@@ -781 +797 @@
                 zoom    1.0
             }
-            set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
+            set xyz [Euler2XYZ $view_(theta) $view_(phi) $view_(psi)]
             _send "camera angle $xyz"
         }
     }
-    _send "camera zoom $_view(zoom)"
+    _send "camera zoom $view_(zoom)"
 }
 
@@ -797 +813 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::HeightmapViewer::_pan {option x y} {
+    return
+    # Experimental stuff
+    if { $option == "set" } {
+        set dx $x
+        set dy $y
+        set view_(x) [expr $view_(x) + $dx]
+        set view_(y) [expr $view_(y) + $dy]
+        _send "pan $dx $dy"
+        return
+    }
     if { $option == "click" } { 
         $itk_component(3dview) configure -cursor hand1
     }
     if { $option == "drag" || $option == "release" } {
-        set _view(x) [expr $_view(x) + $x]
-        set _view(y) [expr $_view(y) + $y]
-        _send "camera pan $_view(x) $_view(y) 0"
+        set view_(x) [expr $view_(x) + $x]
+        set view_(y) [expr $view_(y) + $y]
+        _send "camera pan $view_(x) $view_(y) 0"
     }
     if { $option == "release" } {
@@ -822 +848 @@
         click {
             $itk_component(3dview) configure -cursor fleur
-            set _click(x)       $x
-            set _click(y)       $y
-            set _click(theta)   $_view(theta)
-            set _click(phi)     $_view(phi)
+            array set click [subst {
+                x       $x
+                y       $y
+                theta   $view_(theta)
+                phi     $view_(phi)
+            }]
         }
         drag {
-            if {[array size _click] == 0} {
+            if {[array size click_] == 0} {
                 _rotate click $x $y
             } else {
@@ -839 +867 @@
                 if {[catch {
                     # this fails sometimes for no apparent reason
-                    set dx [expr {double($x-$_click(x))/$w}]
-                    set dy [expr {double($y-$_click(y))/$h}]
+                    set dx [expr {double($x-$click_(x))/$w}]
+                    set dy [expr {double($y-$click_(y))/$h}]
                 }]} {
                     return
@@ -848 +876 @@
                 # Rotate the camera in 3D
                 #
-                if {$_view(psi) > 90 || $_view(psi) < -90} {
+                if {$view_(psi) > 90 || $view_(psi) < -90} {
                     # when psi is flipped around, theta moves backwards
                     set dy [expr {-$dy}]
                 }
-                set theta [expr {$_view(theta) - $dy*180}]
+                set theta [expr {$view_(theta) - $dy*180}]
                 while {$theta < 0} { set theta [expr {$theta+180}] }
                 while {$theta > 180} { set theta [expr {$theta-180}] }
 
                 if {abs($theta) >= 30 && abs($theta) <= 160} {
-                    set phi [expr {$_view(phi) - $dx*360}]
+                    set phi [expr {$view_(phi) - $dx*360}]
                     while {$phi < 0} { set phi [expr {$phi+360}] }
                     while {$phi > 360} { set phi [expr {$phi-360}] }
-                    set psi $_view(psi)
+                    set psi $view_(psi)
                 } else {
-                    set phi $_view(phi)
-                    set psi [expr {$_view(psi) - $dx*360}]
+                    set phi $view_(phi)
+                    set psi [expr {$view_(psi) - $dx*360}]
                     while {$psi < -180} { set psi [expr {$psi+360}] }
                     while {$psi > 180} { set psi [expr {$psi-360}] }
                 }
 
-                set _view(theta)        $theta
-                set _view(phi)          $phi
-                set _view(psi)          $psi
-                set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
+                set view_(theta)        $theta
+                set view_(phi)          $phi
+                set view_(psi)          $psi
+                set xyz [Euler2XYZ $view_(theta) $view_(phi) $view_(psi)]
                 _send "camera angle $xyz"
-                set _click(x) $x
-                set _click(y) $y
+                set click_(x) $x
+                set click_(y) $y
             }
         }
@@ -880 +908 @@
             _rotate drag $x $y
             $itk_component(3dview) configure -cursor ""
-            catch {unset _click}
+            catch {unset click_}
         }
         default {
@@ -920 +948 @@
             if {"" != $dataobj} {
                 set comp [lindex [$dataobj components] 0]
-                if {[info exists _obj2id($dataobj-$comp)]} {
-                    set imap $_obj2id($dataobj-$comp)
+                if {[info exists obj2id_($dataobj-$comp)]} {
+                    set imap $obj2id_($dataobj-$comp)
                 }
             }
@@ -931 +959 @@
         }
         "grid" {
-            if { [isconnected] } {
-                _send "grid visible $_settings($this-grid)"
+            if { [IsConnected] } {
+                _send "grid visible $settings_($this-grid)"
             }
         }
         "axes" {
-            if { [isconnected] } {
-                _send "axis visible $_settings($this-axes)"
+            if { [IsConnected] } {
+                _send "axis visible $settings_($this-axes)"
             }
         }
         "shading" {
-            if { [isconnected] } {
-                _send "heightmap shading $_settings($this-shading)"
+            if { [IsConnected] } {
+                _send "heightmap shading $settings_($this-shading)"
             }
         }
         "wireframe" {
-            if { [isconnected] } {
-                _send "heightmap polygon $_settings($this-wireframe)"
+            if { [IsConnected] } {
+                _send "heightmap polygon $settings_($this-wireframe)"
             }
         }
         "contourlines" {
-            if {[isconnected]} {
+            if {[IsConnected]} {
                 set dataobj [lindex [get] 0]
                 if {"" != $dataobj} {
                     set comp [lindex [$dataobj components] 0]
-                    if {[info exists _obj2id($dataobj-$comp)]} {
-                        set i $_obj2id($dataobj-$comp)
-                        set bool $_settings($this-contourlines)
+                    if {[info exists obj2id_($dataobj-$comp)]} {
+                        set i $obj2id_($dataobj-$comp)
+                        set bool $settings_($this-contourlines)
                         _send "heightmap linecontour visible $bool $i"
                     }
@@ -991 +1019 @@
     set color white
     set cmap "0.0 [Color2RGB $color] "
-    set range [expr $_limits(vmax) - $_limits(vmin)]
+    set range [expr $limits_(vmax) - $limits_(vmin)]
     for {set i 0} {$i < [llength $clist]} {incr i} {
         set xval [expr {double($i+1)/([llength $clist]+1)}]
@@ -1049 +1077 @@
 # ----------------------------------------------------------------------
 itcl::configbody Rappture::HeightmapViewer::plotoutline {
-    if {[isconnected]} {
+    if {[IsConnected]} {
         _send "grid linecolor [Color2RGB $itk_option(-plotoutline)]"
     }

trunk/gui/scripts/molvisviewer.tcl

@@ -103 +103 @@
     private variable _cacheimage ""
     private variable _busy 0
+
+    private variable delta1_ 10
+    private variable delta2_ 2
 
     private common _settings  ;# array of settings for all known widgets
@@ -320 +323 @@
     bind $itk_component(3dview) <ButtonRelease-2> \
         [itcl::code $this _pan release %x %y]
+
+    bind $itk_component(3dview) <KeyPress-Left> \
+        [itcl::code $this _pan set -10 0]
+    bind $itk_component(3dview) <KeyPress-Right> \
+        [itcl::code $this _pan set 10 0]
+    bind $itk_component(3dview) <KeyPress-Up> \
+        [itcl::code $this _pan set 0 -10]
+    bind $itk_component(3dview) <KeyPress-Down> \
+        [itcl::code $this _pan set 0 10]
+    bind $itk_component(3dview) <Shift-KeyPress-Left> \
+        [itcl::code $this _pan set -2 0]
+    bind $itk_component(3dview) <Shift-KeyPress-Right> \
+        [itcl::code $this _pan set 2 0]
+    bind $itk_component(3dview) <Shift-KeyPress-Up> \
+        [itcl::code $this _pan set 0 -2]
+    bind $itk_component(3dview) <Shift-KeyPress-Down> \
+        [itcl::code $this _pan set 0 2]
+    bind $itk_component(3dview) <KeyPress-Prior> \
+        [itcl::code $this _zoom out 2]
+    bind $itk_component(3dview) <KeyPress-Next> \
+        [itcl::code $this _zoom in 2]
+
+    bind $itk_component(3dview) <Enter> "focus $itk_component(3dview)"
+
 
     if {[string equal "x11" [tk windowingsystem]]} {
@@ -683 +710 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::_pan {option x y} {
+    if { $option == "set" } {
+        set dx $x
+        set dy $y
+        set view_(x) [expr $view_(x) + $dx]
+        set view_(y) [expr $view_(y) + $dy]
+        _send "pan $dx $dy"
+        return
+    }
     if { ![info exists _mevent(x)] } {
         set option "click"

trunk/gui/scripts/nanovisviewer.tcl

@@ -100 +100 @@
     private method _ParseLevelsOption { tf ivol levels }
 
-    private variable _outbuf       ;# buffer for outgoing commands
+    private variable outbuf_       ;# buffer for outgoing commands
 
     private variable _dlist ""     ;# list of data objects
@@ -114 +114 @@
     private variable _style2ids    ;# maps id => style settings
 
-    private variable _click        ;# info used for _rotate operations
-    private variable _limits       ;# autoscale min/max for all axes
-    private variable _view         ;# view params for 3D view
-    private variable _mevent
-    private variable _isomarkers    ;# array of isosurface level values 0..1
-    private variable _styles
-    private common   _settings
-    private variable _activeId ""   ;# The currently active volume.  This 
+    private variable click_        ;# info used for _rotate operations
+    private variable limits_       ;# autoscale min/max for all axes
+    private variable view_         ;# view params for 3D view
+    private variable isomarkers_    ;# array of isosurface level values 0..1
+    private common   settings_
+    private variable activeId_ ""   ;# The currently active volume.  This 
                                     # indicates which isomarkers and transfer
                                     # function to use when changing markers,
@@ -153 +151 @@
     $_dispatcher dispatch $this !rebuild "[itcl::code $this _rebuild]; list"
 
-    set _outbuf ""
+    set outbuf_ ""
 
     #
@@ -164 +162 @@
 
     # Initialize the view to some default parameters.
-    array set _view {
+    array set view_ {
         theta   45
         phi     45
@@ -175 +173 @@
     set _obj2id(count) 0
     set _id2obj(count) 0
-    set _limits(vmin) 0.0
-    set _limits(vmax) 1.0
+    set limits_(vmin) 0.0
+    set limits_(vmax) 1.0
 
     itk_component add zoom {
@@ -422 +420 @@
     $inner.scales.thickness set 350
 
-    set ::Rappture::NanovisViewer::_settings($this-isosurface) 0
+    set ::Rappture::NanovisViewer::settings_($this-isosurface) 0
     ::checkbutton $inner.scales.isosurface \
         -text "Isosurface shading" \
-        -variable ::Rappture::NanovisViewer::_settings($this-isosurface) \
+        -variable ::Rappture::NanovisViewer::settings_($this-isosurface) \
         -command [itcl::code $this _fixSettings isosurface]
     grid $inner.scales.isosurface -row 4 -column 0 -columnspan 2 -sticky w
 
-    set ::Rappture::NanovisViewer::_settings($this-axes) 1
+    set ::Rappture::NanovisViewer::settings_($this-axes) 1
     ::checkbutton $inner.scales.axes \
         -text "Axes" \
-        -variable ::Rappture::NanovisViewer::_settings($this-axes) \
+        -variable ::Rappture::NanovisViewer::settings_($this-axes) \
         -command [itcl::code $this _fixSettings axes]
     grid $inner.scales.axes -row 5 -column 0 -columnspan 2 -sticky w
 
-    set ::Rappture::NanovisViewer::_settings($this-grid) 0
+    set ::Rappture::NanovisViewer::settings_($this-grid) 0
     ::checkbutton $inner.scales.grid \
         -text "Grid" \
-        -variable ::Rappture::NanovisViewer::_settings($this-grid) \
+        -variable ::Rappture::NanovisViewer::settings_($this-grid) \
         -command [itcl::code $this _fixSettings grid]
     grid $inner.scales.grid -row 6 -column 0 -columnspan 2 -sticky w
 
-    set ::Rappture::NanovisViewer::_settings($this-outline) 1
+    set ::Rappture::NanovisViewer::settings_($this-outline) 1
     ::checkbutton $inner.scales.outline \
         -text "Outline" \
-        -variable ::Rappture::NanovisViewer::_settings($this-outline) \
+        -variable ::Rappture::NanovisViewer::settings_($this-outline) \
         -command [itcl::code $this _fixSettings outline]
     grid $inner.scales.outline -row 7 -column 0 -columnspan 2 -sticky w
@@ -464 +462 @@
         [list $_dispatcher event -idle !legend]
 
-    # set up bindings for rotation
+    # Bindings for rotation via mouse
     bind $itk_component(3dview) <ButtonPress-1> \
         [itcl::code $this _rotate click %x %y]
@@ -474 +472 @@
         [itcl::code $this _send "screen %w %h"]
 
+    # Bindings for panning via mouse
     bind $itk_component(3dview) <ButtonPress-2> \
         [itcl::code $this _pan click %x %y]
@@ -481 +480 @@
         [itcl::code $this _pan release %x %y]
 
+    # Bindings for panning via keyboard
+    bind $itk_component(3dview) <KeyPress-Left> \
+        [itcl::code $this _pan set -10 0]
+    bind $itk_component(3dview) <KeyPress-Right> \
+        [itcl::code $this _pan set 10 0]
+    bind $itk_component(3dview) <KeyPress-Up> \
+        [itcl::code $this _pan set 0 -10]
+    bind $itk_component(3dview) <KeyPress-Down> \
+        [itcl::code $this _pan set 0 10]
+    bind $itk_component(3dview) <Shift-KeyPress-Left> \
+        [itcl::code $this _pan set -2 0]
+    bind $itk_component(3dview) <Shift-KeyPress-Right> \
+        [itcl::code $this _pan set 2 0]
+    bind $itk_component(3dview) <Shift-KeyPress-Up> \
+        [itcl::code $this _pan set 0 -2]
+    bind $itk_component(3dview) <Shift-KeyPress-Down> \
+        [itcl::code $this _pan set 0 2]
+
+    # Bindings for zoom via keyboard
+    bind $itk_component(3dview) <KeyPress-Prior> \
+        [itcl::code $this _zoom out]
+    bind $itk_component(3dview) <KeyPress-Next> \
+        [itcl::code $this _zoom in]
+
+    bind $itk_component(3dview) <Enter> "focus $itk_component(3dview)"
+
     if {[string equal "x11" [tk windowingsystem]]} {
+        # Bindings for zoom via mouse
         bind $itk_component(3dview) <4> [itcl::code $this _zoom out]
         bind $itk_component(3dview) <5> [itcl::code $this _zoom in]
@@ -504 +530 @@
     image delete $_image(legend)
     image delete $_image(download)
-    array unset _settings $this-*
+    array unset settings_ $this-*
 }
 
@@ -638 +664 @@
 itcl::body Rappture::NanovisViewer::scale {args} {
     foreach val {xmin xmax ymin ymax zmin zmax vmin vmax} {
-        set _limits($val) ""
+        set limits_($val) ""
     }
     foreach obj $args {
@@ -646 +672 @@
 
             if {"" != $min && "" != $max} {
-                if {"" == $_limits(${axis}min)} {
-                    set _limits(${axis}min) $min
-                    set _limits(${axis}max) $max
+                if {"" == $limits_(${axis}min)} {
+                    set limits_(${axis}min) $min
+                    set limits_(${axis}max) $max
                 } else {
-                    if {$min < $_limits(${axis}min)} {
-                        set _limits(${axis}min) $min
+                    if {$min < $limits_(${axis}min)} {
+                        set limits_(${axis}min) $min
                     }
-                    if {$max > $_limits(${axis}max)} {
-                        set _limits(${axis}max) $max
+                    if {$max > $limits_(${axis}max)} {
+                        set limits_(${axis}max) $max
                     }
                 }
@@ -737 +763 @@
 
     # disconnected -- no more data sitting on server
-    set _outbuf ""
+    set outbuf_ ""
     catch {unset _obj2id}
     array unset _id2obj
@@ -754 +780 @@
 itcl::body Rappture::NanovisViewer::_send {string} {
     if {[llength $_sendobjs] > 0} {
-        append _outbuf $string "\n"
+        append outbuf_ $string "\n"
     } else {
         foreach line [split $string \n] {
@@ -806 +832 @@
         # transferred.
         set comp [lindex [$first components] 0]
-        set _activeId $_obj2id($first-$comp)
+        set activeId_ $_obj2id($first-$comp)
     }
     foreach key [array names _obj2id *-*] {
@@ -833 +859 @@
     }
     # if there are any commands in the buffer, send them now that we're done
-    SendBytes $_outbuf
-    set _outbuf ""
+    SendBytes $outbuf_
+    set outbuf_ ""
 
     $_dispatcher event -idle !legend
@@ -847 +873 @@
     # Insure that the global opacity and thickness settings (in the slider
     # settings widgets) are used for the transfer-function used by the active
-    # volume.  Update the values in the _settings varible.
+    # volume.  Update the values in the settings_ varible.
     set inner [$itk_component(controls).panel component inner]
-    set tf $_id2style($_activeId)
+    set tf $_id2style($activeId_)
     set value [$inner.scales.opacity get]
     set opacity [expr { double($value) * 0.01 }]
-    set _settings($this-$tf-opacity) $opacity
+    set settings_($this-$tf-opacity) $opacity
     set value [$inner.scales.thickness get]
     # Scale values between 0.00001 and 0.01000
     set thickness [expr {double($value) * 0.0001}]
-    set _settings($this-$tf-thickness) $thickness
+    set settings_($this-$tf-thickness) $thickness
 
     if { ![info exists $_obj2styles($first)] } {
@@ -932 +958 @@
 
     # Display the markers used by the active volume.
-    set tf $_id2style($_activeId)
-    if { [info exists _isomarkers($tf)] } {
-        foreach m $_isomarkers($tf) {
+    set tf $_id2style($activeId_)
+    if { [info exists isomarkers_($tf)] } {
+        foreach m $isomarkers_($tf) {
             $m Show
         }
@@ -970 +996 @@
     set ivol $info(id);                 # Id of volume created by server.
 
-    set _limits($ivol-min) $info(min);  # Minimum value of the volume.
-    set _limits($ivol-max) $info(max);  # Maximum value of the volume.
-    set _limits(vmin)      $info(vmin); # Overall minimum value.
-    set _limits(vmax)      $info(vmax); # Overall maximum value.
+    set limits_($ivol-min) $info(min);  # Minimum value of the volume.
+    set limits_($ivol-max) $info(max);  # Maximum value of the volume.
+    set limits_(vmin)      $info(vmin); # Overall minimum value.
+    set limits_(vmax)      $info(vmax); # Overall maximum value.
 
     unset _receiveids($ivol)
@@ -1011 +1037 @@
     # settings since the user may have created/deleted/moved markers.
 
-    foreach tf [array names _isomarkers] {
-        foreach m $_isomarkers($tf) {
+    foreach tf [array names isomarkers_] {
+        foreach m $isomarkers_($tf) {
             $m Hide
         }
@@ -1041 +1067 @@
     # Reset the camera and other view parameters
     #
-    set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
+    set xyz [Euler2XYZ $view_(theta) $view_(phi) $view_(psi)]
     _send "camera angle $xyz"
-    _send "camera zoom $_view(zoom)"
+    _send "camera zoom $view_(zoom)"
     
     _fixSettings light
@@ -1135 +1161 @@
     switch -- $option {
         "in" {
-            set _view(zoom) [expr {$_view(zoom)* 1.25}]
+            set view_(zoom) [expr {$view_(zoom)* 1.25}]
         }
         "out" {
-            set _view(zoom) [expr {$_view(zoom)* 0.8}]
+            set view_(zoom) [expr {$view_(zoom)* 0.8}]
         }
         "reset" {
-            array set _view {
+            array set view_ {
                 theta 45
                 phi 45
@@ -1147 +1173 @@
                 zoom 1.0
             }
-            set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
+            set xyz [Euler2XYZ $view_(theta) $view_(phi) $view_(psi)]
             _send "camera angle $xyz"
         }
     }
-    _send "camera zoom $_view(zoom)"
+    _send "camera zoom $view_(zoom)"
 }
 
@@ -1166 +1192 @@
         click {
             $itk_component(3dview) configure -cursor fleur
-            set _click(x) $x
-            set _click(y) $y
-            set _click(theta) $_view(theta)
-            set _click(phi) $_view(phi)
+            set click_(x) $x
+            set click_(y) $y
+            set click_(theta) $view_(theta)
+            set click_(phi) $view_(phi)
         }
         drag {
-            if {[array size _click] == 0} {
+            if {[array size click_] == 0} {
                 _rotate click $x $y
             } else {
@@ -1183 +1209 @@
                 if {[catch {
                     # this fails sometimes for no apparent reason
-                    set dx [expr {double($x-$_click(x))/$w}]
-                    set dy [expr {double($y-$_click(y))/$h}]
+                    set dx [expr {double($x-$click_(x))/$w}]
+                    set dy [expr {double($y-$click_(y))/$h}]
                 }]} {
                     return
@@ -1192 +1218 @@
                 # Rotate the camera in 3D
                 #
-                if {$_view(psi) > 90 || $_view(psi) < -90} {
+                if {$view_(psi) > 90 || $view_(psi) < -90} {
                     # when psi is flipped around, theta moves backwards
                     set dy [expr {-$dy}]
                 }
-                set theta [expr {$_view(theta) - $dy*180}]
+                set theta [expr {$view_(theta) - $dy*180}]
                 while {$theta < 0} { set theta [expr {$theta+180}] }
                 while {$theta > 180} { set theta [expr {$theta-180}] }
 
                 if {abs($theta) >= 30 && abs($theta) <= 160} {
-                    set phi [expr {$_view(phi) - $dx*360}]
+                    set phi [expr {$view_(phi) - $dx*360}]
                     while {$phi < 0} { set phi [expr {$phi+360}] }
                     while {$phi > 360} { set phi [expr {$phi-360}] }
-                    set psi $_view(psi)
+                    set psi $view_(psi)
                 } else {
-                    set phi $_view(phi)
-                    set psi [expr {$_view(psi) - $dx*360}]
+                    set phi $view_(phi)
+                    set psi [expr {$view_(psi) - $dx*360}]
                     while {$psi < -180} { set psi [expr {$psi+360}] }
                     while {$psi > 180} { set psi [expr {$psi-360}] }
                 }
 
-                array set _view [subst {
+                array set view_ [subst {
                     theta $theta
                     phi $phi
@@ -1219 +1245 @@
                 set xyz [Euler2XYZ $theta $phi $psi]
                 _send "camera angle $xyz"
-                set _click(x) $x
-                set _click(y) $y
+                set click_(x) $x
+                set click_(y) $y
             }
         }
@@ -1226 +1252 @@
             _rotate drag $x $y
             $itk_component(3dview) configure -cursor ""
-            catch {unset _click}
+            catch {unset click_}
         }
         default {
@@ -1245 +1271 @@
     return
     # Experimental stuff
+    if { $option == "set" } {
+        set dx $x
+        set dy $y
+        set view_(x) [expr $view_(x) + $dx]
+        set view_(y) [expr $view_(y) + $dy]
+        _send "pan $dx $dy"
+        return
+    }
     if { $option == "click" } { 
         $itk_component(3dview) configure -cursor hand1
     }
     if { $option == "drag" || $option == "release" } {
-        set _view(x) [expr $_view(x) + $x]
-        set _view(y) [expr $_view(y) + $y]
-        _send "camera pan $_view(x) $_view(y) 0"
+        set view_(x) [expr $view_(x) + $x]
+        set view_(y) [expr $view_(y) + $y]
+        _send "camera pan $view_(x) $view_(y) 0"
     }
     if { $option == "release" } {
@@ -1301 +1335 @@
             set newpos [expr {0.01*$newval}]
 #            set newval [expr {0.01*($newval-50)
-#                *($_limits(${axis}max)-$_limits(${axis}min))
-#                  + 0.5*($_limits(${axis}max)+$_limits(${axis}min))}]
+#                *($limits_(${axis}max)-$limits_(${axis}min))
+#                  + 0.5*($limits_(${axis}max)+$limits_(${axis}min))}]
 
             # show the current value in the readout
@@ -1345 +1379 @@
     set val [$itk_component(${axis}slicer) get]
 #    set val [expr {0.01*($val-50)
-#        *($_limits(${axis}max)-$_limits(${axis}min))
-#          + 0.5*($_limits(${axis}max)+$_limits(${axis}min))}]
+#        *($limits_(${axis}max)-$limits_(${axis}min))
+#          + 0.5*($limits_(${axis}max)+$limits_(${axis}min))}]
     return "Move the [string toupper $axis] cut plane.\nCurrently:  $axis = $val%"
 }
@@ -1392 +1426 @@
         }
         opacity {
-            if {[isconnected] && $_activeId != "" } {
+            if {[isconnected] && $activeId_ != "" } {
                 set val [$inner.scales.opacity get]
                 set sval [expr { 0.01 * double($val) }]
-                set tf $_id2style($_activeId)
-                set _settings($this-$tf-opacity) $sval
+                set tf $_id2style($activeId_)
+                set settings_($this-$tf-opacity) $sval
                 UpdateTransferFunctions
             }
@@ -1402 +1436 @@
 
         thickness {
-            if {[isconnected] && $_activeId != "" } {
+            if {[isconnected] && $activeId_ != "" } {
                 set val [$inner.scales.thickness get]
                 # Scale values between 0.00001 and 0.01000
                 set sval [expr {0.0001*double($val)}]
-                set tf $_id2style($_activeId)
-                set _settings($this-$tf-thickness) $sval
+                set tf $_id2style($activeId_)
+                set settings_($this-$tf-thickness) $sval
                 UpdateTransferFunctions
             }
@@ -1413 +1447 @@
         "outline" {
             if {[isconnected]} {
-                _send "volume outline state $_settings($this-outline)"
+                _send "volume outline state $settings_($this-outline)"
             }
         }           
         "isosurface" {
             if {[isconnected]} {
-                _send "volume shading isosurface $_settings($this-isosurface)"
+                _send "volume shading isosurface $settings_($this-isosurface)"
             }
         }           
         "grid" {
             if { [isconnected] } {
-                _send "grid visible $_settings($this-grid)"
+                _send "grid visible $settings_($this-grid)"
             }
         }
         "axes" {
             if { [isconnected] } {
-                _send "axis visible $_settings($this-axes)"
+                _send "axis visible $settings_($this-axes)"
             }
         }
@@ -1448 +1482 @@
     set w [expr {[winfo width $itk_component(legend)]-20}]
     set h [expr {[winfo height $itk_component(legend)]-20-$lineht}]
-    set ivol $_activeId
+    set ivol $activeId_
     if {$w > 0 && $h > 0 && "" != $ivol} {
         _send "legend $ivol $w $h"
@@ -1522 +1556 @@
     #        barn on this one.
 
-    if { ![info exists _isomarkers($tf)] } {
+    if { ![info exists isomarkers_($tf)] } {
         # Have to defer creation of isomarkers until we have data limits
         if { [info exists style(-markers)] } {
@@ -1543 +1577 @@
 
     set tag $this-$tf
-    if { ![info exists _settings($tag-opacity)] } {
-        set _settings($tag-opacity) $style(-opacity)
-    }
-    set max $_settings($tag-opacity)
+    if { ![info exists settings_($tag-opacity)] } {
+        set settings_($tag-opacity) $style(-opacity)
+    }
+    set max $settings_($tag-opacity)
 
     set isovalues {}
-    foreach m $_isomarkers($tf) {
+    foreach m $isomarkers_($tf) {
         lappend isovalues [$m GetRelativeValue]
     }
@@ -1555 +1589 @@
     set isovalues [lsort -real $isovalues]
 
-    if { ![info exists _settings($tag-thickness)]} {
-        set _settings($tag-thickness) 0.05
-    }
-    set delta $_settings($tag-thickness)
+    if { ![info exists settings_($tag-thickness)]} {
+        set settings_($tag-thickness) 0.05
+    }
+    set delta $settings_($tag-thickness)
 
     set first [lindex $isovalues 0]
@@ -1657 +1691 @@
             set m [IsoMarker \#auto $c $this $ivol]
             $m SetRelativeValue $x
-            lappend _isomarkers($tf) $m 
+            lappend isomarkers_($tf) $m 
         }
     } else {
@@ -1663 +1697 @@
             set m [IsoMarker \#auto $c $this $ivol]
             $m SetRelativeValue $x
-            lappend _isomarkers($tf) $m 
+            lappend isomarkers_($tf) $m 
         }
     }
@@ -1690 +1724 @@
             set m [IsoMarker \#auto $c $this $ivol]
             $m SetRelativeValue $value
-            lappend _isomarkers($tf) $m
+            lappend isomarkers_($tf) $m
         } else {
             # ${n} : Set absolute value.
             set m [IsoMarker \#auto $c $this $ivol]
             $m SetAbsoluteValue $value
-            lappend _isomarkers($tf) $m
+            lappend isomarkers_($tf) $m
         }
     }
@@ -1715 +1749 @@
 
 itcl::body Rappture::NanovisViewer::_AddIsoMarker { x y } {
-    if { $_activeId == "" } {
+    if { $activeId_ == "" } {
         error "active volume isn't set"
     }
-    set tf $_id2style($_activeId)
+    set tf $_id2style($activeId_)
     set c $itk_component(legend)
-    set m [IsoMarker \#auto $c $this $_activeId]
+    set m [IsoMarker \#auto $c $this $activeId_]
     set w [winfo width $c]
     $m SetRelativeValue [expr {double($x-10)/($w-20)}]
-    lappend _isomarkers($tf) $m
+    lappend isomarkers_($tf) $m
     UpdateTransferFunctions
     return 1
@@ -1732 +1766 @@
     set tf $_id2style($ivol)
     set bool 0
-    if { [info exists _isomarkers($tf)] } {
+    if { [info exists isomarkers_($tf)] } {
         set list {}
         set marker [namespace tail $marker]
-        foreach m $_isomarkers($tf) {
+        foreach m $isomarkers_($tf) {
             set sx [$m GetScreenPosition]
             if { $m != $marker } {
@@ -1748 +1782 @@
             lappend list $m
         }
-        set _isomarkers($tf) $list
+        set isomarkers_($tf) $list
         UpdateTransferFunctions
     }
@@ -1756 +1790 @@
 itcl::body Rappture::NanovisViewer::OverIsoMarker { marker x } {
     set ivol [$marker GetVolume]
-    if { [info exists _isomarkers($ivol)] } {
+    if { [info exists isomarkers_($ivol)] } {
         set marker [namespace tail $marker]
-        foreach m $_isomarkers($ivol) {
+        foreach m $isomarkers_($ivol) {
             set sx [$m GetScreenPosition]
             if { $m != $marker } {
@@ -1774 +1808 @@
     }
     set tf $_id2style($ivol)
-    set _limits(min) ""
-    set _limits(max) ""
+    set limits_(min) ""
+    set limits_(max) ""
     foreach ivol $_style2ids($tf) {
-        if { ![info exists _limits($ivol-min)] } {
+        if { ![info exists limits_($ivol-min)] } {
             error "can't find $ivol limits"
         }
-        if { $_limits(min) == "" || $_limits(min) > $_limits($ivol-min) } {
-            set _limits(min) $_limits($ivol-min)
+        if { $limits_(min) == "" || $limits_(min) > $limits_($ivol-min) } {
+            set limits_(min) $limits_($ivol-min)
         }
-        if { $_limits(max) == "" || $_limits(max) < $_limits($ivol-max) } {
-            set _limits(max) $_limits($ivol-max)
+        if { $limits_(max) == "" || $limits_(max) < $limits_($ivol-max) } {
+            set limits_(max) $limits_($ivol-max)
         }
     }
-    return [array get _limits] 
-}
+    return [array get limits_] 
+}

trunk/gui/scripts/visviewer.tcl

@@ -23 +23 @@
 
     private common servers_         ;# array of visualization server lists
-    set servers_(nanovis) ""
-    set servers_(pymol)   ""
+    set servers_(nanovis) "bilby.hubzero.org:2000"
+    set servers_(pymol)   "bilby.hubzero.org:2020"
 
     private variable sid_ ""        ;# socket connection to server

trunk/lang/matlab/Makefile.in

@@ -68 +68 @@
                 rpUtilsProgress$(EXT) 
 
+# MEX can't be run in parallel since it generates temporary files
+# that collide with further compilations.
+.NOTPARALLEL:
+
 all: $(OBJS) 
 

trunk/packages/vizservers/nanovis/Makefile.in

@@ -169 +169 @@
 install: install-nanovis install-resources install-shaders
 
-mat_lib:
+mat_lib: $(MAT_LIB)
+r2_lib:  $(R2_LIB)
+img_lib: $(IMG_LIB)
+tf_lib:  $(TF_LIB)
+
+$(MAT_LIB):
         $(MAKE) -C $(MAT_DIR) all
 
-r2_lib: 
+$(R2_LIB): 
         $(MAKE) -C $(R2_DIR)/src all
 
-img_lib: 
+$(IMG_LIB): 
         $(MAKE) -C $(IMG_DIR) all
 
-tf_lib: 
+$(TF_LIB): 
         $(MAKE) -C $(TF_DIR) all
 

trunk/src/Makefile.in

@@ -36 +36 @@
 all:    core core2 objects 
 
-core:
+RAPPTURE_LIB = core/librappture.a
+
+core: $(RAPPTURE_LIB)
+
+$(RAPPTURE_LIB):
         $(MAKE) -C core all
-core2:
+
+core2: $(RAPPTURE_LIB)
         $(MAKE) -C core2 all
-objects:
+
+objects: $(RAPPTURE_LIB)
         $(MAKE) -C objects all
 
-install: 
+install: $(RAPPTURE_LIB)
         $(MAKE) -C core install
         $(MAKE) -C core2 install