Changeset 3032 for trunk/gui

Timestamp:

Jun 12, 2012, 3:32:04 PM (12 years ago)

Author:

gah

Message:

intermediate updates for vtkcontourviewer

Location:

trunk/gui

Files:

• scripts/drawingentry.tcl (modified) (1 diff)
• scripts/nanovisviewer.tcl (modified) (4 diffs)
• scripts/tool.tcl (modified) (1 diff)
• scripts/vtkheightmapviewer.tcl (modified) (1 diff)
• src/RpCanvHotspot.c (added)

trunk/gui/scripts/drawingentry.tcl

@@ -910 +910 @@
 }
 
+#
+# Rewrite --
+#
+#       Rewrite string into list of text and substitution variables.
+#       Also break on new lines.
+#
+itcl::body Rappture::DrawingEntry::ApplySubstitutions { string } {
+    set cursor 0
+    set list {}
+    set lines [split $string \n]
+    foreach line $lines {
+        while 1 {
+            set index [string first \$ $line $cursor]
+            if { $index == -1 } {
+                # Take the rest of the line
+                lappend list "text" [string range $line $cursor end]
+                break
+            }
+            # Find the end of the variable 
+            incr cursor 
+            set c [string index $line $cursor]
+            if { $c != "{" } {
+                lappend list "text" "\$" 
+                continue
+            }
+            set index [string first "\}" $string $cursor]
+            if { $index == -1 } {
+                error "missing } character in variable substitution."
+            }
+            set varName [string range $string $cursor [expr $index - 1]]
+            set cursor [expr $index  + 1]
+            # Check that it's a substitution variable
+            if { ![info exists _name2path($varName)] } {
+                error "no substitution \"$varName\" found"
+            }
+            set path $_name2path($name)
+            set w [$_owner widgetfor $path]
+            if { $w != "" } {
+                set value [$w value]
+            } else {
+                set value ""
+            }
+            lappend list "subst" $value
+        }
+        lappend list "text" "\n"
+    }
+    return $list
+}

trunk/gui/scripts/nanovisviewer.tcl

@@ -117 +117 @@
     private method volume { tag name }
     private method GetVolumeInfo { w }
+    private method SetOrientation {}
 
     private variable _outbuf       ;# buffer for outgoing commands
@@ -1088 +1089 @@
                 set _settings($this-phi)   $_view(phi)
                 set _settings($this-psi)   $_view(psi)
-                SendCmd "camera angle $xyz"
+<                SendCmd "camera angle $xyz"
                 set _click(x) $x
                 set _click(y) $y
@@ -1873 +1874 @@
         incr row
     }
+
+    itk_component add orientation {
+        Rappture::Combobox $inner.orientation -width 10 -editable no
+    }
+    $inner.mode choices insert end \
+        "front"    "lines" \
+        "back"   "ribbons" \
+        "top"     "0 0 0"  \
+        "bottom"     "0 180 0"  \
+        "left"     "270 0 0 "  \
+        "right"     "90 0 0"  \
+        "default"  "45 45 0"
+    $itk_component(orientation) value "default"
+    bind $inner.mode <<Value>> [itcl::code $this SetOrientation]
+
     blt::table configure $inner c0 c1 -resize none
     blt::table configure $inner c2 -resize expand
@@ -2037 +2053 @@
 }
 
+
+itcl::body Rappture::NanovisViewer::SetOrientation {} {
+    set angles [$itk_component(orientation) value]
+    foreach name { theta phi psi } angle $angles {
+        set _view($name) $angle
+    }
+    set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
+    SendCmd "camera angle $xyz"
+}

trunk/gui/scripts/tool.tcl

@@ -212 +212 @@
 
             if { $status != 0 } {
+                # We're here because the exec-ed program failed 
                 if { $::Rappture::Tool::job(control) != "" } {
-                    set code [lindex $::Rappture::Tool::job(control) 0]
-                    set mesg [lindex $::Rappture::Tool::job(control) 2]
-                    if { $code == "EXITED" } {
-                        set result "Program returned exit code $status:\n\n"
+                    foreach { token pid code mesg } \
+                        $::Rappture::Tool::job(control) break
+                    if { $token == "EXITED" } {
+                        # This means that the program exited normally but
+                        # returned a non-zero exitcode.  Consider this an
+                        # invalid result from the program.  Append the stderr
+                        # from the program to the message.
+                        append result \
+                            "\nProgram exited normally: exit code is $code\n\n"
                         append result $::Rappture::Tool::job(error)
-                    } else  {
-                        set result \
-                            "Abnormal program termination \"$code\": $mesg"
+                    } elseif { $token == "abort" }  {
+                        # The user pressed the abort button.
+                        set result "Program terminated by user.\n\n"
+                        append result $::Rappture::Tool::job(output)
+                    } else {
+                        # Abnormal termination
+                        set result "Abnormal program termination: $mesg\n\n"
+                        append result $::Rappture::Tool::job(output)
                     }
                 }

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -1 @@
-
 # ----------------------------------------------------------------------
 #  COMPONENT: vtkheightmapviewer - Vtk heightmap viewer