Changeset 935

Timestamp:

Mar 10, 2008, 5:26:38 PM (17 years ago)

Author:

gah

Message:

add addition settings for nanovis and heightmap viewers

Location:

trunk/gui/scripts

Files:

• heightmapviewer.tcl (modified) (7 diffs)
• molvisviewer.tcl (modified) (2 diffs)
• nanovisviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/heightmapviewer.tcl

@@ -31 +31 @@
 proc HeightmapViewer_init_resources {} {
     Rappture::resources::register \
-        nanovis_server Rappture::VisViewer::SetNanovisServerList
+        nanovis_server Rappture::HeightmapViewer::SetServerList
 }
 
@@ -50 +50 @@
     }
 
+    public proc SetServerList { namelist } {
+        Rappture::VisViewer::SetServerList "nanovis" $namelist
+    }
     public method isconnected {}
     public method add {dataobj {settings ""}}
@@ -209 +212 @@
     set ::Rappture::HeightmapViewer::_settings($this-grid) 1
     ::checkbutton $inner.f.grid \
-        -text "Show Grid" \
+        -text "Grid" \
         -variable ::Rappture::HeightmapViewer::_settings($this-grid) \
         -command [itcl::code $this _fixSettings grid]
@@ -216 +219 @@
     set ::Rappture::HeightmapViewer::_settings($this-axes) 1
     ::checkbutton $inner.f.axes \
-        -text "Show Axes" \
+        -text "Axes" \
         -variable ::Rappture::HeightmapViewer::_settings($this-axes) \
         -command [itcl::code $this _fixSettings axes]
@@ -223 +226 @@
     set ::Rappture::HeightmapViewer::_settings($this-contourlines) 1
     ::checkbutton $inner.f.contour \
-        -text "Show Contour Lines" \
+        -text "Contour Lines" \
         -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"
+    ::checkbutton $inner.f.wireframe \
+        -text "Wireframe" \
+        -onvalue "wireframe" -offvalue "fill" \
+        -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"
+    ::checkbutton $inner.f.shading \
+        -text "Flat Shading" \
+        -onvalue "flat" -offvalue "smooth" \
+        -variable ::Rappture::HeightmapViewer::_settings($this-shading) \
+        -command [itcl::code $this _fixSettings shading]
+    grid $inner.f.shading -row 4 -column 0 -sticky w
 
     # Legend
@@ -716 +734 @@
          _send "grid linecolor [Color2RGB $itk_option(-plotoutline)]"
      }
+    _fixSettings shading
+    _fixSettings wireframe
     _fixSettings grid
     _fixSettings axes
@@ -881 +901 @@
             }
         }
+        "shading" {
+            if { [isconnected] } {
+                _send "heightmap shading $_settings($this-shading)"
+            }
+        }
+        "wireframe" {
+            if { [isconnected] } {
+                _send "heightmap polygon $_settings($this-wireframe)"
+            }
+        }
         "contourlines" {
             if {[isconnected]} {

trunk/gui/scripts/molvisviewer.tcl

@@ -27 +27 @@
 proc MolvisViewer_init_resources {} {
     Rappture::resources::register \
-        molvis_server Rappture::VisViewer::SetPymolServerList
+        molvis_server Rappture::MolvisViewer::SetServerList
 }
 
@@ -50 +50 @@
     destructor { 
         # defined below 
+    }
+    public proc SetServerList { namelist } {
+        Rappture::VisViewer::SetServerList "pymol" $namelist
     }
     public method Connect {}

trunk/gui/scripts/nanovisviewer.tcl

@@ -32 +32 @@
 proc NanovisViewer_init_resources {} {
     Rappture::resources::register \
-        nanovis_server Rappture::VisViewer::SetNanovisServerList
+        nanovis_server Rappture::NanovisViewer::SetServerList
 }
 
@@ -49 +49 @@
     destructor { 
         # defined below 
+    }
+    public proc SetServerList { namelist } {
+        Rappture::VisViewer::SetServerList "nanovis" $namelist
     }
     public method add {dataobj {settings ""}}
@@ -419 +422 @@
     set ::Rappture::NanovisViewer::_settings($this-axes) 1
     ::checkbutton $inner.scales.axes \
-        -text "Show Axes" \
+        -text "Axes" \
         -variable ::Rappture::NanovisViewer::_settings($this-axes) \
         -command [itcl::code $this _fixSettings axes]
@@ -426 +429 @@
     set ::Rappture::NanovisViewer::_settings($this-grid) 0
     ::checkbutton $inner.scales.grid \
-        -text "Show Grid" \
+        -text "Grid" \
         -variable ::Rappture::NanovisViewer::_settings($this-grid) \
         -command [itcl::code $this _fixSettings grid]
@@ -433 +436 @@
     set ::Rappture::NanovisViewer::_settings($this-outline) 1
     ::checkbutton $inner.scales.outline \
-        -text "Show Outline" \
+        -text "Outline" \
         -variable ::Rappture::NanovisViewer::_settings($this-outline) \
         -command [itcl::code $this _fixSettings outline]