Changeset 1120

Timestamp:

Aug 19, 2008 9:36:54 AM (14 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• gui/scripts/heightmapviewer.tcl (modified) (1 diff)
• gui/scripts/switch.tcl (modified) (4 diffs)
• packages/vizservers/configure.in (modified) (1 diff)
• packages/vizservers/nanovis/Makefile.in (modified) (1 diff)
• packages/vizservers/pymolproxy/pymolproxy.c (modified) (1 diff)

trunk/gui/scripts/heightmapviewer.tcl

@@ -217 +217 @@
     grid $inner.f.grid -row 0 -column 0 -sticky w
 
-    set ::Rappture::HeightmapViewer::_settings($this-axes) 1
+    set ::Rappture::HeightmapViewer::_settings($this-axes) 0
     ::checkbutton $inner.f.axes \
         -text "Axes" \

trunk/gui/scripts/switch.tcl

@@ -16 +16 @@
     inherit itk::Widget
 
-    itk_option define -oncolor onColor Color "green"
+    itk_option define -oncolor onColor Color "#00cc00"
     itk_option define -state state State "normal"
 
     constructor {args} { # defined below }
     public method value {args}
+    public method updateText {}
     private variable _value 0  ;# value for this widget
 }
@@ -34 +35 @@
 
     itk_component add value {
-        checkbutton $itk_interior.value  -variable [itcl::scope _value]
+        checkbutton $itk_interior.value \
+            -variable [itcl::scope _value] \
+            -command [itcl::code $this updateText]
     } {
-        rename -background -textbackground textBackground Background
+        #rename -background -textbackground textBackground Background
     }
     pack $itk_component(value) -side left -expand yes -fill both
@@ -70 +73 @@
         set _value $newval
         event generate $itk_component(hull) <<Value>>
-
+        updateText
     } elseif {[llength $args] != 0} {
         error "wrong # args: should be \"value ?-check? ?newval?\""
@@ -77 +80 @@
 }
 
+itcl::body Rappture::Switch::updateText {} {
+    set mesg [expr {($_value) ? "on" : "off"}]
+    $itk_component(value) configure -text $mesg
+}
+   
 
 # ----------------------------------------------------------------------

trunk/packages/vizservers/configure.in

@@ -150 +150 @@
 AC_CHECK_HEADER([glui.h])
 AC_CHECK_HEADER([GL/glut.h])
+AC_CHECK_HEADER([GL/glew.h])
 
 AC_CHECK_HEADERS([stdio.h unistd.h stdlib.h string.h sys/types.h])

trunk/packages/vizservers/nanovis/Makefile.in

@@ -218 +218 @@
 install-nanovis: nanovis
         $(INSTALL) -m 0555 nanovis $(bindir)
-        @if test "$(RP_DIR)/bin" != "$(bindir)" ; then \
-          $(MKDIR_P) $(bindir) ; \
-          $(INSTALL_PROGRAM) $(RP_DIR)/bin/voronoi $(bindir) ; \
-        fi
-        @if test "$(RP_DIR)/lib" != "$(libdir)" ; then \
-          $(MKDIR_P) $(libdir) ; \
-          $(INSTALL_DATA) $(RP_DIR)/lib/librappture2.so $(libdir) ; \
-          $(INSTALL_DATA) $(RP_DIR)/lib/libz.so $(libdir) ; \
-          $(INSTALL_DATA) $(RP_DIR)/lib/libb64.so $(libdir) ; \
-        fi
 
 clean:

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -1214 +1214 @@
     Tcl_CreateCommand(interp, "rotate",  RotateCmd,     &pymol, NULL);
     Tcl_CreateCommand(interp, "zoom",    ZoomCmd,       &pymol, NULL);
-    Tcl_CreateCommand(interp, "loadpdb", LoadPDBCmd,    &pymol, NULL);
-    Tcl_CreateCommand(interp, "loadpdb2", LoadPDB2Cmd,  &pymol, NULL);
+    Tcl_CreateCommand(interp, "loadpdb.old", LoadPDBCmd,    &pymol, NULL);
+    Tcl_CreateCommand(interp, "loadpdb", LoadPDB2Cmd,  &pymol, NULL);
     Tcl_CreateCommand(interp, "ballnstick",BallNStickCmd, &pymol, NULL);
     Tcl_CreateCommand(interp, "spheres", SpheresCmd,    &pymol, NULL);