Changeset 4088 for trunk/gui

Timestamp:

Dec 18, 2013 12:51:26 PM (10 years ago)

Author:

gah

Message:

fix editor to handle current component, add binding to delete key to remove markers

Location:

trunk/gui/scripts

Files:

• nanovisviewer.tcl (modified) (7 diffs)
• transferfunctioneditor.tcl (modified) (5 diffs)
• vtkvolumeviewer.tcl (modified) (6 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -105 +105 @@
     private method GetVolumeInfo { w }
     private method HideAllMarkers {} 
+    private method AddNewMarker { x y } 
     private method InitComponentSettings { cname } 
     private method InitSettings { args }
@@ -126 +127 @@
     private method Zoom {option}
     private method ToggleVolume { tag name }
+    private method RemoveMarker { x y }
 
     private variable _arcball ""
@@ -333 +335 @@
     bind $itk_component(legend) <Configure> \
         [itcl::code $this EventuallyRedrawLegend]
+    bind $itk_component(legend) <KeyPress-Delete> \
+        [itcl::code $this RemoveMarker %x %y]
+    bind $itk_component(legend) <Enter> \
+        [list focus $itk_component(legend)]
 
     # Hack around the Tk panewindow.  The problem is that the requested 
@@ -773 +779 @@
     set lx 10
     set ly [expr {$h - 1}]
-    if {"" == [$c find withtag transfunc]} {
+    if {"" == [$c find withtag colorbar]} {
         $c create image 10 10 -anchor nw \
-            -image $_image(legend) -tags transfunc
+            -image $_image(legend) -tags colorbar
         $c create text $lx $ly -anchor sw \
             -fill $itk_option(-plotforeground) -tags "limits text vmin"
@@ -782 +788 @@
         $c create text [expr {$w/2}] $ly -anchor s \
             -fill $itk_option(-plotforeground) -tags "limits text title"
-        $c lower transfunc
+        $c lower colorbar
+        $c bind colorbar <ButtonRelease-1> [itcl::code $this AddNewMarker %x %y]
     }
 
@@ -1469 +1476 @@
 }
 
+itcl::body Rappture::NanovisViewer::AddNewMarker { x y } {
+    if { ![info exists _transferFunctionEditors($_current)] } {
+        continue
+    }
+    # Add a new marker to the current transfer function
+    $_transferFunctionEditors($_current) newMarker $x $y normal
+}
+
+itcl::body Rappture::NanovisViewer::RemoveMarker { x y } {
+    if { ![info exists _transferFunctionEditors($_current)] } {
+        continue
+    }
+    # Add a new marker to the current transfer function
+    $_transferFunctionEditors($_current) deleteMarker $x $y 
+}
+
 # ----------------------------------------------------------------------
 # CONFIGURATION OPTION: -plotbackground
@@ -2513 +2536 @@
     return ""
 }
+
+

trunk/gui/scripts/transferfunctioneditor.tcl

@@ -41 +41 @@
     private method GetScreenPosition { name } 
     private method LeaveTick { name } 
-    private method NewMarker { x y state }
     private method SetRelativeValue  { name x }
     private method GetRelativeValue  { name }
@@ -62 +61 @@
     public method removeMarkers { list }
     public method addMarkers { values }
+    public method newMarker { x y state }
+    public method deleteMarker { x y }
     public method hideMarkers { {list {}} }
     public method showMarkers { {limits {}} }
@@ -70 +71 @@
     set _name $name
     set _limits [list 0.0 1.0] 
-    $c bind transfunc <ButtonRelease-1> \
-        [itcl::code $this NewMarker %x %y normal]
     eval configure $args
 }
@@ -99 +98 @@
 }
 
-itcl::body Rappture::TransferFunctionEditor::NewMarker { x y state } { 
+itcl::body Rappture::TransferFunctionEditor::deleteMarker { x y } { 
+    foreach marker [GetOverlappingMarkers $x $y] {
+        $_canvas delete $_ticks($marker)
+        $_canvas delete $_labels($marker)
+        array unset _ticks $marker
+        array unset _labels $marker
+        array unset _values $marker
+        bell
+        UpdateViewer
+    }
+}
+
+itcl::body Rappture::TransferFunctionEditor::newMarker { x y state } { 
     foreach id [$_canvas find overlapping \
                     [expr $x-5] [expr $y-5] [expr $x+5] [expr $y+5]] {
@@ -315 +326 @@
 itcl::body Rappture::TransferFunctionEditor::addMarkers { values } {
     foreach value $values {
-        set name [NewMarker 0 0 hidden]
+        set name [newMarker 0 0 hidden]
         SetRelativeValue $name $value
     }

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -70 +70 @@
     private method GetDatasetsWithComponent { cname } 
     private method HideAllMarkers {} 
+    private method AddNewMarker { x y } 
     private method InitComponentSettings { cname } 
     private method ParseLevelsOption { cname levels }
@@ -78 +79 @@
     private method SetOrientation { side }
     private method SwitchComponent { cname } 
+    private method RemoveMarker { x y }
 
     private variable _current "";       # Currently selected component 
@@ -382 +384 @@
         rename -background -plotbackground plotBackground Background
     }
+    bind $itk_component(legend) <KeyPress-Delete> \
+        [itcl::code $this RemoveMarker %x %y]
+    bind $itk_component(legend) <Enter> \
+        [list focus $itk_component(legend)]
 
     # Hack around the Tk panewindow.  The problem is that the requested 
@@ -2218 +2224 @@
     set lx 10
     set ly [expr {$h - 1}]
-    if {"" == [$c find withtag transfunc]} {
+    if {"" == [$c find withtag colorbar]} {
         $c create image 10 10 -anchor nw \
-            -image $_image(legend) -tags transfunc
+            -image $_image(legend) -tags colorbar
         $c create text $lx $ly -anchor sw \
             -fill $itk_option(-plotforeground) -tags "limits text vmin"
@@ -2227 +2233 @@
         $c create text [expr {$w/2}] $ly -anchor s \
             -fill $itk_option(-plotforeground) -tags "limits text title"
-        $c lower transfunc
+        $c lower colorbar
+        $c bind colorbar <ButtonRelease-1> [itcl::code $this AddNewMarker %x %y]
     }
 
@@ -2632 +2639 @@
 }
 
+itcl::body Rappture::VtkVolumeViewer::AddNewMarker { x y } {
+    if { ![info exists _transferFunctionEditors($_current)] } {
+        continue
+    }
+    # Add a new marker to the current transfer function
+    $_transferFunctionEditors($_current) newMarker $x $y normal
+}
+
+itcl::body Rappture::VtkVolumeViewer::RemoveMarker { x y } {
+    if { ![info exists _transferFunctionEditors($_current)] } {
+        continue
+    }
+    # Add a new marker to the current transfer function
+    $_transferFunctionEditors($_current) deleteMarker $x $y 
+}
+
 itcl::body Rappture::VtkVolumeViewer::SetOrientation { side } { 
     array set positions {