Changeset 2730

Timestamp:

Dec 13, 2011 1:28:39 PM (11 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• gui/scripts/Makefile.in (modified) (1 diff)
• gui/scripts/field.tcl (modified) (3 diffs)
• gui/scripts/field3dresult.tcl (modified) (1 diff)
• gui/scripts/vtkvolumeviewer.tcl (modified) (6 diffs)
• gui/src/RpConvertDxToVtk.c (modified) (2 diffs)
• packages/vizservers/nanovis/Command.cpp (modified) (1 diff)

trunk/gui/scripts/Makefile.in

@@ -130 +130 @@
                 $(srcdir)/vtkstreamlinesviewer.tcl \
                 $(srcdir)/vtkvolumeviewer.tcl \
+                $(srcdir)/vtkheightmapviewer.tcl \
                 $(srcdir)/xylegend.tcl \
                 $(srcdir)/xyprint.tcl \

trunk/gui/scripts/field.tcl

@@ -587 +587 @@
     catch {unset _comp2dims}
     catch {unset _comp2style}
+    array unset _comp2volume
     array unset _comp2vtkstreamlines
     array unset _comp2unirect2d
@@ -821 +822 @@
             set data [Rappture::encoding::decode -as zb64 $data]
             if 1 {
-            set file "/tmp/junk.dx"
+            set file "/tmp/$cname.dx"
             set f [open $file "w"]
             puts $f $data
@@ -828 +829 @@
             set data [Rappture::ConvertDxToVtk $data]
             if 1 {
-            set file "/tmp/junk.vtk"
+            set file "/tmp/$cname.vtk"
             set f [open $file "w"]
             puts $f $data

trunk/gui/scripts/field3dresult.tcl

@@ -83 +83 @@
             }
             "vtkvolume" {
+                catch {
                 itk_component add renderer {
                     Rappture::VtkVolumeViewer $itk_interior.ren $servers
                 }
+                } errs
+                puts stderr errs=$errs
             }
             "vtkstreamlines" {

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -1025 +1025 @@
                 SendCmd "dataset visible 0 $tag"
             }
+            break
         }
     }
@@ -1073 +1074 @@
         }
         foreach { name title units } [$_first hints scalars] {
+            set _scalarFields($title) $name
+            $itk_component(field) choices insert end "$name" "$title"
+            $itk_component(fieldmenu) add radiobutton -label "$title" \
+                -value $title -variable [itcl::scope _currentField] \
+                -selectcolor red \
+                -activebackground black \
+                -activeforeground white \
+                -font "Arial 8" \
+                -command [itcl::code $this Combo invoke]
+            set _fields($name) [list $title $units]
+        }
+        foreach { name title units } { default Default ??? } {
             set _scalarFields($title) $name
             $itk_component(field) choices insert end "$name" "$title"
@@ -1459 +1472 @@
             }
             foreach dataset [CurrentDatasets -visible] {
-                puts stderr "volume colormode $_colorMode ${name} $dataset"
+                #puts stderr "volume colormode $_colorMode ${name} $dataset"
                 puts stderr "cutplane colormode $_colorMode ${name} $dataset"
-                SendCmd "volume colormode $_colorMode ${name} $dataset"
+                #SendCmd "volume colormode $_colorMode ${name} $dataset"
                 SendCmd "cutplane colormode $_colorMode ${name} $dataset"
             }
@@ -1757 +1770 @@
     }
     set cmap {}
-    for {set i 0} {$i < [llength $clist]} {incr i} {
-        set x [expr {double($i)/([llength $clist]-1)}]
-        set color [lindex $clist $i]
-        append cmap "$x [Color2RGB $color] "
+    set nColors [llength $clist]
+    if { $nColors == 1 } {
+        append cmap "0.0 [Color2RGB $colors] "
+        append cmap "1.0 [Color2RGB $colors] "
+    } else {
+        for {set i 0} {$i < [llength $clist]} {incr i} {
+            set x [expr {double($i)/([llength $clist]-1)}]
+            set color [lindex $clist $i]
+            append cmap "$x [Color2RGB $color] "
+        }
     }
     return $cmap
@@ -1780 +1799 @@
 
     set wmap "0.0 1.0 1.0 1.0"
+    set wmap "0.0 0.0 0.1 0.0 0.2 0.8 0.98 0.8 0.99 0.0 1.0 0.0"
     SendCmd "colormap add $name { $cmap } { $wmap }"
 }
@@ -1933 +1953 @@
         "orange-to-blue"     "orange-to-blue"   
 
-    $itk_component(palette) value "BCGYR"
+    $itk_component(palette) value "nanohub"
     bind $inner.palette <<Value>> \
         [itcl::code $this AdjustSetting volume-palette]

trunk/gui/src/RpConvertDxToVtk.c

@@ -88 +88 @@
     scale = 1.0 / (vmax - vmin);
     for (i = 0; i < nPoints; i++) {
+#ifdef notdef
         sprintf(mesg, "%g\n", (array[i] - vmin) * scale);
+#endif
+        sprintf(mesg, "%g\n", array[i]);
         Tcl_AppendToObj(objPtr, mesg, -1);
     }
@@ -192 +195 @@
             }
         } else if (sscanf(line, "object %*d class array type %*s rank 0"
-                " items %d data follows", &nPoints) == 1) {
+                " %*s %d data follows", &nPoints) == 1) {
 #ifdef notdef
             fprintf(stderr, "found class array type rank 0 nPoints=%d\n", 

trunk/packages/vizservers/nanovis/Command.cpp

@@ -1227 +1227 @@
         }
         Rappture::Outcome context;
-        sleep(30);
 #if ISO_TEST
         volPtr = load_volume_stream2(context, tag, fdata);